diff --git a/Cargo.lock b/Cargo.lock index 5207fce6f..5539fd3f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ "sha1 0.10.7", "sync_wrapper 1.0.2", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.29.0", "tower 0.5.3", "tower-layer", "tower-service", @@ -1585,7 +1585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccc2776f0c61eca1ca32528f85548abd1a4be8fb53d1b21c013e4f18da1e7090" dependencies = [ "data-encoding", - "syn 1.0.109", + "syn 2.0.118", ] [[package]] @@ -1897,7 +1897,7 @@ dependencies = [ "tokio-retry", "tokio-rustls", "tokio-test", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tower 0.5.3", "tower-http 0.5.2", "tracing", @@ -1906,7 +1906,7 @@ dependencies = [ "traffic-audit", "traffic-audit-libsql", "transport", - "tungstenite", + "tungstenite 0.29.0", "typed-builder", "ulid", "url", @@ -2356,7 +2356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3179,12 +3179,12 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite 0.2.17", - "socket2 0.5.10", + "socket2 0.6.5", "system-configuration", "tokio 1.52.3", "tower-service", "tracing", - "windows-registry 0.5.3", + "windows-registry 0.6.1", ] [[package]] @@ -3718,7 +3718,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -3812,7 +3812,7 @@ dependencies = [ "sysinfo", "tinyjson", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tracing", "tracing-appender", "tracing-subscriber", @@ -4901,7 +4901,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6048,7 +6048,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.3", "rustls 0.23.43", - "socket2 0.5.10", + "socket2 0.6.5", "thiserror 2.0.20", "tokio 1.52.3", "tracing", @@ -6088,9 +6088,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.5", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6607,7 +6607,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6707,7 +6707,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7262,7 +7262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -7566,7 +7566,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix 1.1.4", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -7593,7 +7593,7 @@ dependencies = [ "portpicker", "proptest", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "transport", ] @@ -7639,7 +7639,7 @@ dependencies = [ "test-utils", "tokio 1.52.3", "tokio-rustls", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tokio-util", "typed-builder", "uuid", @@ -7933,6 +7933,18 @@ name = "tokio-tungstenite" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" +dependencies = [ + "futures-util", + "log", + "tokio 1.52.3", + "tungstenite 0.29.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17a073bfed563fa236697a068031408a93cd9522e08abf9933ead3e73411bd71" dependencies = [ "futures-util", "log", @@ -7943,7 +7955,7 @@ dependencies = [ "tokio 1.52.3", "tokio-native-tls", "tokio-rustls", - "tungstenite", + "tungstenite 0.30.0", ] [[package]] @@ -8475,11 +8487,27 @@ dependencies = [ "http 1.4.2", "httparse", "log", - "native-tls", "rand 0.9.5", + "sha1 0.10.7", + "thiserror 2.0.20", +] + +[[package]] +name = "tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22" +dependencies = [ + "bytes 1.12.1", + "data-encoding", + "http 1.4.2", + "httparse", + "log", + "native-tls", + "rand 0.10.2", "rustls 0.23.43", "rustls-pki-types", - "sha1 0.10.7", + "sha1 0.11.0", "thiserror 2.0.20", ] @@ -8731,7 +8759,7 @@ dependencies = [ "num_cpus", "thiserror 2.0.20", "tokio 1.52.3", - "tokio-tungstenite", + "tokio-tungstenite 0.30.0", "tokio-util", "tracing", "tracing-subscriber", @@ -9027,7 +9055,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/crates/test-utils/Cargo.toml b/crates/test-utils/Cargo.toml index 6371d0d3e..903994865 100644 --- a/crates/test-utils/Cargo.toml +++ b/crates/test-utils/Cargo.toml @@ -11,7 +11,7 @@ workspace = true [dependencies] transport = { path = "../transport" } tokio = { version = "1.52", features = ["io-util"] } -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" futures-util = "0.3" proptest = "1.7" anyhow = "1.0" diff --git a/crates/video-streamer/Cargo.toml b/crates/video-streamer/Cargo.toml index 857b3aecc..2e06b5d75 100644 --- a/crates/video-streamer/Cargo.toml +++ b/crates/video-streamer/Cargo.toml @@ -44,7 +44,7 @@ tokio = { version = "1.52", features = [ ] } axum = { version = "0.8", features = ["ws"] } futures = "0.3" -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" transport = { path = "../transport" } [lints] diff --git a/devolutions-gateway/Cargo.toml b/devolutions-gateway/Cargo.toml index 6d68ec6e8..341af79ed 100644 --- a/devolutions-gateway/Cargo.toml +++ b/devolutions-gateway/Cargo.toml @@ -105,7 +105,7 @@ axum = { version = "0.8", default-features = false, features = ["http1", "json", axum-extra = { version = "0.10", features = ["query", "async-read-body", "typed-header"] } tower-http = { version = "0.5", features = ["cors", "fs"] } tungstenite = "0.29" # Should be the same version as `axum` (we perform error downcasting for better error reporting) -tokio-tungstenite = { version = "0.29", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } # Should use the same version of tungstenite as `axum` http-body-util = "0.1" tokio-retry = "0.3" zip = { version = "2.4", default-features = false } diff --git a/jetsocat/Cargo.toml b/jetsocat/Cargo.toml index 3e7daa802..5f7fdf642 100644 --- a/jetsocat/Cargo.toml +++ b/jetsocat/Cargo.toml @@ -41,7 +41,7 @@ humantime = "2.2" # async tokio = { version = "1.52", features = ["io-std", "io-util", "net", "fs", "signal", "time", "rt", "sync", "process", "rt-multi-thread", "macros"] } -tokio-tungstenite = "0.29" +tokio-tungstenite = "0.30" futures-util = "0.3" transport = { path = "../crates/transport" } diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index 1cc45390a..d2ab5b6af 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -28,7 +28,7 @@ tempfile = "3" tokio = { version = "1", features = ["rt-multi-thread", "macros", "time", "net", "process"] } tokio-util = "0.7" typed-builder = "0.21" -tokio-tungstenite = { version = "0.29", features = ["rustls-tls-native-roots"] } +tokio-tungstenite = { version = "0.30", features = ["rustls-tls-native-roots"] } [dev-dependencies] agent-tunnel = { path = "../crates/agent-tunnel", features = ["test-utils"] }