diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 29903b801..997fc3aec 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -4200,9 +4200,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.24.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" dependencies = [ "futures-util", "log", @@ -4456,21 +4456,20 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.24.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" dependencies = [ - "byteorder", "bytes", "data-encoding", "http 1.3.1", "httparse", "log", - "rand 0.8.5", + "rand 0.9.0", "rustls", "rustls-pki-types", "sha1", - "thiserror 1.0.69", + "thiserror 2.0.12", "utf-8", ] diff --git a/rust/kcl-lib/Cargo.toml b/rust/kcl-lib/Cargo.toml index d3463bcb4..6bd2a19e1 100644 --- a/rust/kcl-lib/Cargo.toml +++ b/rust/kcl-lib/Cargo.toml @@ -107,7 +107,7 @@ web-sys = { version = "0.3.76", features = ["console"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] instant = "0.1.13" tokio = { workspace = true, features = ["full"] } -tokio-tungstenite = { version = "0.24.0", features = [ +tokio-tungstenite = { version = "0.26.2", features = [ "rustls-tls-native-roots", ] } tower-lsp = { workspace = true, features = ["proposed", "default"] } diff --git a/rust/kcl-lib/src/engine/conn.rs b/rust/kcl-lib/src/engine/conn.rs index 7ffbf9826..36c8e1339 100644 --- a/rust/kcl-lib/src/engine/conn.rs +++ b/rust/kcl-lib/src/engine/conn.rs @@ -206,7 +206,7 @@ impl EngineConnection { async fn inner_send_to_engine(request: WebSocketRequest, tcp_write: &mut WebSocketTcpWrite) -> Result<()> { let msg = serde_json::to_string(&request).map_err(|e| anyhow!("could not serialize json: {e}"))?; tcp_write - .send(WsMsg::Text(msg)) + .send(WsMsg::Text(msg.into())) .await .map_err(|e| anyhow!("could not send json over websocket: {e}"))?; Ok(()) @@ -216,19 +216,17 @@ impl EngineConnection { async fn inner_send_to_engine_binary(request: WebSocketRequest, tcp_write: &mut WebSocketTcpWrite) -> Result<()> { let msg = bson::to_vec(&request).map_err(|e| anyhow!("could not serialize bson: {e}"))?; tcp_write - .send(WsMsg::Binary(msg)) + .send(WsMsg::Binary(msg.into())) .await .map_err(|e| anyhow!("could not send json over websocket: {e}"))?; Ok(()) } pub async fn new(ws: reqwest::Upgraded) -> Result { - let wsconfig = tokio_tungstenite::tungstenite::protocol::WebSocketConfig { + let wsconfig = tokio_tungstenite::tungstenite::protocol::WebSocketConfig::default() // 4294967296 bytes, which is around 4.2 GB. - max_message_size: Some(usize::MAX), - max_frame_size: Some(usize::MAX), - ..Default::default() - }; + .max_message_size(Some(usize::MAX)) + .max_frame_size(Some(usize::MAX)); let ws_stream = tokio_tungstenite::WebSocketStream::from_raw_socket( ws,