diff --git a/Cargo.lock b/Cargo.lock index 2a8330b1f..b0f28e8d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -355,7 +355,7 @@ dependencies = [ "sha1", "sync_wrapper 1.0.2", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tower 0.5.1", "tower-layer", "tower-service", @@ -524,9 +524,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 = "cache-padded" @@ -1323,9 +1323,9 @@ dependencies = [ "serde_json", "serde_with", "tar", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.25.0", "toml", "tracing", "tracing-subscriber", @@ -1451,10 +1451,10 @@ dependencies = [ "stretto", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", "time", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.25.0", "toml", "tower-http", "tracing", @@ -1487,7 +1487,7 @@ dependencies = [ "names", "serde_json", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.25.0", "tracing", "tracing-subscriber", ] @@ -1535,9 +1535,9 @@ dependencies = [ "serde_bytes", "serde_json", "serde_with", - "thiserror", + "thiserror 1.0.69", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.24.0", "tracing", "tracing-subscriber", "wasm-bindgen", @@ -1870,7 +1870,7 @@ dependencies = [ "rand", "rustls 0.21.12", "rustls-pemfile 1.0.4", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tokio-rustls 0.24.1", @@ -1895,7 +1895,7 @@ dependencies = [ "resolv-conf", "rustls 0.21.12", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls 0.24.1", "tracing", @@ -2967,7 +2967,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2981,7 +2981,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2995,7 +2995,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3042,7 +3042,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry_sdk 0.26.0", "prost", - "thiserror", + "thiserror 1.0.69", "tokio", "tonic", ] @@ -3081,7 +3081,7 @@ dependencies = [ "ordered-float 4.5.0", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -3101,7 +3101,7 @@ dependencies = [ "opentelemetry 0.25.0", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3120,7 +3120,7 @@ dependencies = [ "percent-encoding", "rand", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", ] @@ -3576,7 +3576,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4303,7 +4303,7 @@ dependencies = [ "sha2", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", @@ -4387,7 +4387,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -4425,7 +4425,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.69", "tracing", "whoami", ] @@ -4486,7 +4486,7 @@ dependencies = [ "parking_lot", "rand", "seahash", - "thiserror", + "thiserror 1.0.69", "tracing", "wg", "xxhash-rust", @@ -4637,7 +4637,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +dependencies = [ + "thiserror-impl 2.0.7", ] [[package]] @@ -4651,6 +4660,17 @@ dependencies = [ "syn 2.0.89", ] +[[package]] +name = "thiserror-impl" +version = "2.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -4819,7 +4839,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.24.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28562dd8aea311048ed1ab9372a6b9a59977e1b308afb87c985c1f2b3206938" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.25.0", ] [[package]] @@ -5093,7 +5125,25 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "326eb16466ed89221beef69dbc94f517ee888bae959895472133924a25f7070e" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", + "thiserror 2.0.7", "utf-8", ] @@ -5378,7 +5428,7 @@ dependencies = [ "serde-wasm-bindgen 0.4.5", "shared-buffer", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "tracing", "wasm-bindgen", "wasmer-compiler", @@ -5411,7 +5461,7 @@ dependencies = [ "self_cell", "shared-buffer", "smallvec", - "thiserror", + "thiserror 1.0.69", "wasmer-types", "wasmer-vm", "wasmparser", @@ -5466,7 +5516,7 @@ dependencies = [ "rkyv", "sha2", "target-lexicon", - "thiserror", + "thiserror 1.0.69", "xxhash-rust", ] @@ -5493,7 +5543,7 @@ dependencies = [ "more-asserts", "region", "scopeguard", - "thiserror", + "thiserror 1.0.69", "wasmer-types", "windows-sys 0.59.0", ] diff --git a/apps/freenet-ping/app/Cargo.toml b/apps/freenet-ping/app/Cargo.toml index 9271a9e0c..401c37203 100644 --- a/apps/freenet-ping/app/Cargo.toml +++ b/apps/freenet-ping/app/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" clap = { version = "4", features = ["derive"] } futures = "0.3" tokio = { version = "1", features = ["full"] } -tokio-tungstenite = "0.24" +tokio-tungstenite = "0.25" tracing = { version = "0.1", features = ["log"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] } freenet-stdlib = { workspace = true, features = ["net"] } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 5293234fc..edd3ae087 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -57,7 +57,7 @@ tar = { version = "0.4" } time = "0.3" thiserror = "1" tokio = { features = ["fs", "macros", "rt-multi-thread", "sync", "process"], version = "1" } -tokio-tungstenite = "0.24" +tokio-tungstenite = "0.25" tower-http = { features = ["fs", "trace"], version = "0.6" } ulid = { features = ["serde"], version = "1.1" } unsigned-varint = { version = "0.8", features = ["codec", "asynchronous_codec"] } diff --git a/crates/fdev/Cargo.toml b/crates/fdev/Cargo.toml index 18bce56f6..364dce66b 100644 --- a/crates/fdev/Cargo.toml +++ b/crates/fdev/Cargo.toml @@ -29,7 +29,7 @@ semver = { workspace = true } tar = "0.4" thiserror = "1" tokio = { version = "1", features = ["rt-multi-thread", "sync", "macros", "signal", "parking_lot", "process"] } -tokio-tungstenite = "0.24" +tokio-tungstenite = "0.25" toml = { version = "0.8", features = ["default", "preserve_order"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }