From 6b89496cbb6319bd9a4e57b48d7626b7edc89569 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:45:09 +0530 Subject: [PATCH] Bump tokio-tungstenite from 0.24.0 to 0.26.1 (#40) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vikrant Chaudhary --- Cargo.lock | 64 +++++++++++++++++++++++++++---- agent/Cargo.toml | 2 +- agent/src/models/agent_error.rs | 7 ++-- agent/src/models/send_payload.rs | 2 +- agent/src/models/socket_reader.rs | 8 ++-- agent/src/models/socket_writer.rs | 6 +-- 6 files changed, 70 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3811323..4c39161 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ dependencies = [ "sha1", "sync_wrapper 1.0.1", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower", "tower-layer", "tower-service", @@ -331,9 +331,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cfg-if" @@ -1576,7 +1576,16 @@ version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -1590,6 +1599,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -1648,7 +1668,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.24.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.26.1", ] [[package]] @@ -1784,7 +1816,25 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.68", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror 2.0.9", "utf-8", ] @@ -1879,7 +1929,7 @@ dependencies = [ "pty-process", "semver", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.26.1", "tracing", "tracing-subscriber", "url", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 4081bc5..a9f5884 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -10,7 +10,7 @@ flatbuffers = "24.3.25" futures = "0.3.31" pty-process = { version = "0.4.0", features = ["async"] } tokio = "1.42.0" -tokio-tungstenite = "0.24.0" +tokio-tungstenite = "0.26.1" tracing = "0.1.41" tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } webterm-core = { path = "../core" } diff --git a/agent/src/models/agent_error.rs b/agent/src/models/agent_error.rs index db15b56..5d4619d 100644 --- a/agent/src/models/agent_error.rs +++ b/agent/src/models/agent_error.rs @@ -3,6 +3,7 @@ use std::fmt; use tokio::sync::broadcast::error::RecvError; use tokio::sync::mpsc::error::SendError; use tokio_tungstenite::tungstenite; +use tokio_tungstenite::tungstenite::Bytes; use webterm_core::models::reader_socket_error::ReaderSocketError; use webterm_core::models::webterm_error::WebtermError; use webterm_core::types::{ActivityId, FrontendId, SessionId}; @@ -14,7 +15,7 @@ pub enum AgentError { FBParseError(String), SocketError(tungstenite::Error), SocketClosed, - SocketSendError(SendError>), + SocketSendError(SendError), SocketRecvError(RecvError), SocketReadError(ReaderSocketError), PtyProcessError(pty_process::Error), @@ -56,8 +57,8 @@ impl From for AgentError { } } -impl From>> for AgentError { - fn from(err: SendError>) -> Self { +impl From> for AgentError { + fn from(err: SendError) -> Self { AgentError::SocketSendError(err) } } diff --git a/agent/src/models/send_payload.rs b/agent/src/models/send_payload.rs index 838f480..7855c5c 100644 --- a/agent/src/models/send_payload.rs +++ b/agent/src/models/send_payload.rs @@ -27,7 +27,7 @@ impl SendPayload { pub async fn dispatch(self, relay_pub: &SocketPublisher) -> Result<(), AgentError> { if let Some(payload) = self.to_relay { // debug!("dispatching to relay"); - relay_pub.send(payload.0).await?; + relay_pub.send(payload.0.into()).await?; } if let Some((activity, data)) = self.to_activity { diff --git a/agent/src/models/socket_reader.rs b/agent/src/models/socket_reader.rs index c2fce23..0ba2fa8 100644 --- a/agent/src/models/socket_reader.rs +++ b/agent/src/models/socket_reader.rs @@ -5,15 +5,15 @@ use futures::StreamExt; use std::sync::Arc; use tokio::net::TcpStream; use tokio::sync::broadcast; -use tokio_tungstenite::tungstenite::Message; +use tokio_tungstenite::tungstenite::{Bytes, Message}; use tokio_tungstenite::{MaybeTlsStream, WebSocketStream}; use tracing::{error, info}; use webterm_core::models::reader_socket_error::ReaderSocketError; -pub type SocketSubscriber = broadcast::Receiver>, ReaderSocketError>>; +pub type SocketSubscriber = broadcast::Receiver, ReaderSocketError>>; pub struct SocketReader { - _tx: broadcast::Sender>, ReaderSocketError>>, + _tx: broadcast::Sender, ReaderSocketError>>, } impl SocketReader { @@ -21,7 +21,7 @@ impl SocketReader { mut reader_stream: SplitStream>>, rc: Arc, ) -> Self { - let (_tx, _rx) = broadcast::channel::>, ReaderSocketError>>(16); + let (_tx, _rx) = broadcast::channel::, ReaderSocketError>>(16); let tx = _tx.clone(); let rc_clone = rc.clone(); diff --git a/agent/src/models/socket_writer.rs b/agent/src/models/socket_writer.rs index 9905d4a..b07a9b2 100644 --- a/agent/src/models/socket_writer.rs +++ b/agent/src/models/socket_writer.rs @@ -5,11 +5,11 @@ use futures::SinkExt; use std::sync::Arc; use tokio::net::TcpStream; use tokio::sync::mpsc; -use tokio_tungstenite::tungstenite::Message; +use tokio_tungstenite::tungstenite::{Bytes, Message}; use tokio_tungstenite::{MaybeTlsStream, WebSocketStream}; use tracing::info; -pub type SocketPublisher = mpsc::Sender>; +pub type SocketPublisher = mpsc::Sender; pub struct SocketWriter { _tx: SocketPublisher, @@ -20,7 +20,7 @@ impl SocketWriter { mut writer_stream: SplitSink>, Message>, rc: Arc, ) -> Self { - let (_tx, mut rx) = mpsc::channel::>(16); + let (_tx, mut rx) = mpsc::channel::(16); let rc_clone = rc.clone(); tokio::spawn(async move {