Update tokio-tungstenite to v0.26.1

Author: Cabbache

Cargo.toml

@@ -55,7 +55,7 @@ chrono = { version = "0.4.31", default-features = false, features = ["clock", "s
 flate2 = { version = "1.0.28", optional = true }
 zstd-safe = { version = "7.2.1", optional = true }
 reqwest = { version = "0.12.2", default-features = false, features = ["multipart", "stream", "json"], optional = true }
-tokio-tungstenite = { version = "0.24.0", features = ["url"], optional = true }
+tokio-tungstenite = { version = "0.26.1", features = ["url"], optional = true }
 percent-encoding = { version = "2.3.0", optional = true }
 mini-moka = { version = "0.10.2", optional = true }
 mime_guess = { version = "2.0.4", optional = true }

src/gateway/error.rs

@@ -13,7 +13,7 @@ pub enum Error {
     /// There was an error building a URL.
     BuildingUrl,
     /// The connection closed, potentially uncleanly.
-    Closed(Option<CloseFrame<'static>>),
+    Closed(Option<CloseFrame>),
     /// Expected a Hello during a handshake
     ExpectedHello,
     /// When there was an error sending a heartbeat.

src/gateway/sharding/mod.rs

@@ -383,7 +383,7 @@ impl Shard {
     }
 
     #[cfg_attr(feature = "tracing_instrument", instrument(skip(self)))]
-    fn handle_gateway_closed(&mut self, data: Option<&CloseFrame<'static>>) -> Result<()> {
+    fn handle_gateway_closed(&mut self, data: Option<&CloseFrame>) -> Result<()> {
         if let Some(code) = data.map(|d| d.code) {
             match CloseCode(code.into()) {
                 CloseCode::UnknownError => warn!("[{:?}] Unknown gateway error.", self.shard_info),

src/gateway/sharding/shard_runner.rs

@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::sync::Arc;
 
 use futures::channel::mpsc::{self, UnboundedReceiver as Receiver, UnboundedSender as Sender};
@@ -245,7 +244,7 @@ impl ShardRunner {
                 .client
                 .close(Some(CloseFrame {
                     code: close_code.into(),
-                    reason: Cow::from(""),
+                    reason: "".into(),
                 }))
                 .await,
         );
@@ -308,7 +307,7 @@ impl ShardRunner {
                 let reason = reason.unwrap_or_default();
                 let close = CloseFrame {
                     code: code.into(),
-                    reason: Cow::from(reason),
+                    reason: reason.into(),
                 };
                 self.shard.client.close(Some(close)).await.is_ok()
             },

src/gateway/ws.rs

@@ -228,11 +228,14 @@ const TIMEOUT: Duration = Duration::from_millis(500);
 
 impl WsClient {
     pub(crate) async fn connect(url: Url, compression: TransportCompression) -> Result<Self> {
-        let config = WebSocketConfig {
-            max_message_size: None,
-            max_frame_size: None,
-            ..Default::default()
+        let config = {
+            let mut config = WebSocketConfig::default();
+            config.max_message_size = None;
+            config.max_frame_size = None;
+
+            config
         };
+
         let (stream, _) = connect_async_with_config(url, Some(config), false).await?;
 
         Ok(Self {
@@ -249,7 +252,7 @@ impl WsClient {
         };
 
         let json_bytes = match message {
-            Message::Text(payload) => Cow::Owned(payload.into_bytes()),
+            Message::Text(payload) => Cow::Owned(payload.as_bytes().to_vec()),
             Message::Binary(bytes) => {
                 let Some(decompressed) = self.compression.inflate(&bytes)? else {
                     return Ok(None);
@@ -284,7 +287,7 @@ impl WsClient {
     }
 
     pub(crate) async fn send_json(&mut self, value: &impl serde::Serialize) -> Result<()> {
-        let message = serde_json::to_string(value).map(Message::Text)?;
+        let message = Message::Text(serde_json::to_string(value)?.into());
 
         self.stream.send(message).await?;
         Ok(())
@@ -302,7 +305,7 @@ impl WsClient {
     }
 
     /// Delegate to `WebSocketStream::close`
-    pub(crate) async fn close(&mut self, msg: Option<CloseFrame<'_>>) -> Result<()> {
+    pub(crate) async fn close(&mut self, msg: Option<CloseFrame>) -> Result<()> {
         self.stream.close(msg).await?;
         Ok(())
     }