fix

.changes/ws-tungstenite-026.md

@@ -0,0 +1,7 @@
+---
+websocket: patch
+websocket-js: patch
+---
+
+**Breaking change:** Updated tokio_tungstenite to `0.26`. This may be a breaking change if you use the `tls_connector` Builder method in Rust.
+**Breaking change:** Removed the accidental `ConnectionConfig` struct re-export (in rust). This should not affect anyone since the Config was not used in any public API.

plugins/websocket/guest-js/index.ts

@@ -5,11 +5,37 @@
 import { invoke, Channel } from '@tauri-apps/api/core'
 
 export interface ConnectionConfig {
+  /**
+   * Read buffer capacity. The default value is 128 KiB.
+   */
+  readBufferSize?: number
+  /** The target minimum size of the write buffer to reach before writing the data to the underlying stream. The default value is 128 KiB.
+   *
+   * If set to 0 each message will be eagerly written to the underlying stream. It is often more optimal to allow them to buffer a little, hence the default value.
+   */
   writeBufferSize?: number
+  /** The max size of the write buffer in bytes. Setting this can provide backpressure in the case the write buffer is filling up due to write errors. The default value is unlimited.
+   *
+   * Note: The write buffer only builds up past write_buffer_size when writes to the underlying stream are failing. So the write buffer can not fill up if you are not observing write errors.
+   *
+   * Note: Should always be at least write_buffer_size + 1 message and probably a little more depending on error handling strategy.
+   */
   maxWriteBufferSize?: number
-  maxMessageSize?: number
-  maxFrameSize?: number
+  /**
+   * The maximum size of an incoming message. The string "none" means no size limit. The default value is 64 MiB which should be reasonably big for all normal use-cases but small enough to prevent memory eating by a malicious user.
+   */
+  maxMessageSize?: number | 'none'
+  /**
+   * The maximum size of a single incoming message frame. The string "none" means no size limit. The limit is for frame payload NOT including the frame header. The default value is 16 MiB which should be reasonably big for all normal use-cases but small enough to prevent memory eating by a malicious user.
+   */
+  maxFrameSize?: number | 'none'
+  /**
+   * When set to true, the server will accept and handle unmasked frames from the client. According to the RFC 6455, the server must close the connection to the client in such cases, however it seems like there are some popular libraries that are sending unmasked frames, ignoring the RFC. By default this option is set to false, i.e. according to RFC 6455.
+   */
   acceptUnmaskedFrames?: boolean
+  /**
+   * Additional connect request headers.
+   */
   headers?: HeadersInit
 }
 

plugins/websocket/src/lib.rs

@@ -66,13 +66,21 @@ struct ConnectionManager(Mutex<HashMap<Id, WebSocketWriter>>);
 #[cfg(any(feature = "rustls-tls", feature = "native-tls"))]
 struct TlsConnector(Mutex<Option<Connector>>);
 
+#[derive(Deserialize)]
+#[serde(untagged, rename_all = "camelCase")]
+enum Max {
+    None,
+    Number(usize),
+}
+
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ConnectionConfig {
+pub(crate) struct ConnectionConfig {
+    pub read_buffer_size: Option<usize>,
     pub write_buffer_size: Option<usize>,
     pub max_write_buffer_size: Option<usize>,
-    pub max_message_size: Option<usize>,
-    pub max_frame_size: Option<usize>,
+    pub max_message_size: Option<Max>,
+    pub max_frame_size: Option<Max>,
     #[serde(default)]
     pub accept_unmasked_frames: bool,
     pub headers: Option<Vec<(String, String)>>,
@@ -80,18 +88,38 @@ pub struct ConnectionConfig {
 
 impl From<ConnectionConfig> for WebSocketConfig {
     fn from(config: ConnectionConfig) -> Self {
-        // Disabling the warning on max_send_queue which we don't use anymore since it was deprecated.
-        #[allow(deprecated)]
-        Self {
-            max_send_queue: None,
-            write_buffer_size: config.write_buffer_size.unwrap_or(128 * 1024),
-            max_write_buffer_size: config.max_write_buffer_size.unwrap_or(usize::MAX),
-            // This may be harmful since if it's not provided from js we're overwriting the default value with None, meaning no size limit.
-            max_message_size: config.max_message_size,
-            // This may be harmful since if it's not provided from js we're overwriting the default value with None, meaning no size limit.
-            max_frame_size: config.max_frame_size,
-            accept_unmasked_frames: config.accept_unmasked_frames,
+        let mut builder =
+            WebSocketConfig::default().accept_unmasked_frames(config.accept_unmasked_frames);
+
+        if let Some(read_buffer_size) = config.read_buffer_size {
+            builder = builder.read_buffer_size(read_buffer_size)
+        }
+
+        if let Some(write_buffer_size) = config.write_buffer_size {
+            builder = builder.write_buffer_size(write_buffer_size)
         }
+
+        if let Some(max_write_buffer_size) = config.max_write_buffer_size {
+            builder = builder.max_write_buffer_size(max_write_buffer_size)
+        }
+
+        if let Some(max_message_size) = config.max_message_size {
+            let max_size = match max_message_size {
+                Max::None => Option::None,
+                Max::Number(n) => Some(n),
+            };
+            builder = builder.max_message_size(max_size);
+        }
+
+        if let Some(max_frame_size) = config.max_frame_size {
+            let max_size = match max_frame_size {
+                Max::None => Option::None,
+                Max::Number(n) => Some(n),
+            };
+            builder = builder.max_frame_size(max_size);
+        }
+
+        builder
     }
 }
 
@@ -157,21 +185,21 @@ async fn connect<R: Runtime>(
 
                 let response = match message {
                     Ok(Message::Text(t)) => {
-                        serde_json::to_value(WebSocketMessage::Text(t)).unwrap()
+                        serde_json::to_value(WebSocketMessage::Text(t.to_string())).unwrap()
                     }
                     Ok(Message::Binary(t)) => {
-                        serde_json::to_value(WebSocketMessage::Binary(t)).unwrap()
+                        serde_json::to_value(WebSocketMessage::Binary(t.to_vec())).unwrap()
                     }
                     Ok(Message::Ping(t)) => {
-                        serde_json::to_value(WebSocketMessage::Ping(t)).unwrap()
+                        serde_json::to_value(WebSocketMessage::Ping(t.to_vec())).unwrap()
                     }
                     Ok(Message::Pong(t)) => {
-                        serde_json::to_value(WebSocketMessage::Pong(t)).unwrap()
+                        serde_json::to_value(WebSocketMessage::Pong(t.to_vec())).unwrap()
                     }
                     Ok(Message::Close(t)) => {
                         serde_json::to_value(WebSocketMessage::Close(t.map(|v| CloseFrame {
                             code: v.code.into(),
-                            reason: v.reason.into_owned(),
+                            reason: v.reason.to_string(),
                         })))
                         .unwrap()
                     }
@@ -197,13 +225,13 @@ async fn send(
     if let Some(write) = manager.0.lock().await.get_mut(&id) {
         write
             .send(match message {
-                WebSocketMessage::Text(t) => Message::Text(t),
-                WebSocketMessage::Binary(t) => Message::Binary(t),
-                WebSocketMessage::Ping(t) => Message::Ping(t),
-                WebSocketMessage::Pong(t) => Message::Pong(t),
+                WebSocketMessage::Text(t) => Message::Text(t.into()),
+                WebSocketMessage::Binary(t) => Message::Binary(t.into()),
+                WebSocketMessage::Ping(t) => Message::Ping(t.into()),
+                WebSocketMessage::Pong(t) => Message::Pong(t.into()),
                 WebSocketMessage::Close(t) => Message::Close(t.map(|v| ProtocolCloseFrame {
                     code: v.code.into(),
-                    reason: std::borrow::Cow::Owned(v.reason),
+                    reason: v.reason.into(),
                 })),
             })
             .await?;