From b31002831c42fb3942d7eb73cc4964febe1f2d75 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Mon, 2 Oct 2023 17:44:56 +0200 Subject: [PATCH] Updated tugstsenite (#4236) * Updated tugstsenite * Create a virtual-net crate v0.6.1 with updated tungstenite crates * Updated wasi-web Cargo.toml * Bumped wasmer-deploy-cli * Bumped wasmer-deploy-cli again --- Cargo.lock | 58 +++++++++++++++++++------------------- lib/cli/Cargo.toml | 4 +-- lib/virtual-net/Cargo.toml | 6 ++-- lib/wasi-web/Cargo.lock | 2 +- lib/wasi-web/Cargo.toml | 2 +- lib/wasix/Cargo.toml | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db47dfd8740..74fffd1fe47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2070,12 +2070,12 @@ dependencies = [ [[package]] name = "hyper-tungstenite" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226df6fd0aece319a325419d770aa9d947defa60463f142cd82b329121f906a3" +checksum = "7cc7dcb1ab67cd336f468a12491765672e61a3b6b148634dbfe2fe8acd3fe7d9" dependencies = [ "hyper", - "pin-project", + "pin-project-lite", "tokio", "tokio-tungstenite", "tungstenite", @@ -4594,9 +4594,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -4843,9 +4843,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes", @@ -5064,9 +5064,7 @@ dependencies = [ [[package]] name = "virtual-mio" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc63af761ebc294142a24d62795518b8ed4f722ae9a6666b9f93569a4df6447e" +version = "0.3.0" dependencies = [ "async-trait", "bytes", @@ -5082,6 +5080,8 @@ dependencies = [ [[package]] name = "virtual-mio" version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f38a379f14296f9fb93eda42ece4d57b568af417569102c3dcfeb88ab4800f" dependencies = [ "async-trait", "bytes", @@ -5096,9 +5096,7 @@ dependencies = [ [[package]] name = "virtual-net" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306bb6ff6ed62c44f50a72c7c89f95439bb0f56cce7c3963cd3ae6d292a04af5" +version = "0.6.1" dependencies = [ "anyhow", "async-trait", @@ -5120,12 +5118,15 @@ dependencies = [ "tokio-tungstenite", "tokio-util 0.6.10", "tracing", - "virtual-mio 0.2.0", + "tracing-test", + "virtual-mio 0.3.0", ] [[package]] name = "virtual-net" -version = "0.6.0" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "762dac9d5da7f609894b31f7fd03b19ee8959510847c98c1973acce32270b132" dependencies = [ "anyhow", "async-trait", @@ -5147,8 +5148,7 @@ dependencies = [ "tokio-tungstenite", "tokio-util 0.6.10", "tracing", - "tracing-test", - "virtual-mio 0.3.0", + "virtual-mio 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5554,9 +5554,9 @@ dependencies = [ [[package]] name = "wasmer-api" -version = "0.0.16" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e8e1c4dcacb5055cd584994bb04a43e107b1c23651b24ab4da8befc24793f6" +checksum = "9280054c3d646ba55c26cb67fbd7e818192c7c858a6148e37ee204a2e5f00e6f" dependencies = [ "anyhow", "cynic", @@ -5704,7 +5704,7 @@ dependencies = [ "unix_mode", "url", "virtual-fs", - "virtual-net 0.6.0", + "virtual-net 0.6.1", "walkdir", "wasm-coredump-builder", "wasmer", @@ -5838,9 +5838,9 @@ dependencies = [ [[package]] name = "wasmer-deploy-cli" -version = "0.1.25" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d9ccd93f117915eadf90c2f24213ad5f1725f5d3470cbd2ba8d58f79bd0b53" +checksum = "0a6cf47c5b80324b4693052a42cef8f7dd0edf2482037e6d6fb2168d6084c422" dependencies = [ "anyhow", "clap", @@ -5865,8 +5865,8 @@ dependencies = [ "tracing-subscriber", "url", "uuid", - "virtual-mio 0.2.0", - "virtual-net 0.5.0", + "virtual-mio 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtual-net 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-api", "wasmer-deploy-schema", "wasmer-deploy-util", @@ -5877,9 +5877,9 @@ dependencies = [ [[package]] name = "wasmer-deploy-schema" -version = "0.0.14" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0cef86a0ed94dfc32acb1c6f7938e6f2c0b63f35af0a112df8052ea10140612" +checksum = "4a2438bcb6db110e911ef8faf4d2896c682b36798b966d6afb7d4efef0afe65c" dependencies = [ "anyhow", "bytesize", @@ -5900,9 +5900,9 @@ dependencies = [ [[package]] name = "wasmer-deploy-util" -version = "0.0.14" +version = "0.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7595515fb1163de1f6ab6d4d070d59fe7f75176af99e3ec12beaed7169dc3e88" +checksum = "549a152f6369e2f0f21b4edcec5d6d4c349756067a90403f86e3229854d0bd8b" dependencies = [ "http", "serde", @@ -6243,7 +6243,7 @@ dependencies = [ "urlencoding", "virtual-fs", "virtual-mio 0.3.0", - "virtual-net 0.6.0", + "virtual-net 0.6.1", "wai-bindgen-wasmer", "waker-fn", "wasm-bindgen", diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index ce8c712b8af..e084b881bbd 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -60,11 +60,11 @@ wasmer-object = { version = "=4.2.1", path = "../object", optional = true } virtual-fs = { version = "0.9.0", path = "../virtual-fs", default-features = false, features = [ "host-fs", ] } -virtual-net = { version = "0.6.0", path = "../virtual-net" } +virtual-net = { version = "0.6.1", path = "../virtual-net" } # Wasmer-owned dependencies. webc = { workspace = true } -wasmer-deploy-cli = { version = "=0.1.25", default-features = false } +wasmer-deploy-cli = { version = "=0.1.28", default-features = false } # Third-party dependencies. diff --git a/lib/virtual-net/Cargo.toml b/lib/virtual-net/Cargo.toml index aa50b624ebd..e0d51b1fe22 100644 --- a/lib/virtual-net/Cargo.toml +++ b/lib/virtual-net/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "virtual-net" -version = "0.6.0" +version = "0.6.1" description = "Wasmer Virtual Networking" authors.workspace = true edition.workspace = true @@ -28,9 +28,9 @@ futures-util = { version = "0.3" } anyhow = "1.0" tokio-serde = { version = "0.8", features = [ "bincode" ], optional = true } tokio-util = { version = "0.6", features = ["codec"], optional = true } -hyper-tungstenite = { version = "0.10", optional = true } +hyper-tungstenite = { version = "0.11", optional = true } hyper = { version = "0.14", optional = true } -tokio-tungstenite = { version = "0.19", optional = true } +tokio-tungstenite = { version = "0.20", optional = true } [dev-dependencies] tokio = { version = "1", default_features = false, features = [ "macros" ] } diff --git a/lib/wasi-web/Cargo.lock b/lib/wasi-web/Cargo.lock index 1dc30b9aca5..fce6cf3a2a5 100644 --- a/lib/wasi-web/Cargo.lock +++ b/lib/wasi-web/Cargo.lock @@ -2168,7 +2168,7 @@ dependencies = [ [[package]] name = "virtual-net" -version = "0.6.0" +version = "0.6.1" dependencies = [ "anyhow", "async-trait", diff --git a/lib/wasi-web/Cargo.toml b/lib/wasi-web/Cargo.toml index 23531907781..d5d4346c3f7 100644 --- a/lib/wasi-web/Cargo.toml +++ b/lib/wasi-web/Cargo.toml @@ -18,7 +18,7 @@ rust-version = "1.70" [dependencies] wasmer = { path = "../api", default_features = false, features = [ "js-default" ] } wasmer-wasix = { path = "../wasix", version = "0.14.0", default-features = false, features = [ "js-default" ] } -virtual-net = { path = "../virtual-net", version = "0.6.0", default-features = false, features = [ "remote" ] } +virtual-net = { path = "../virtual-net", version = "0.6.1", default-features = false, features = [ "remote" ] } #wasm-bindgen = { version = "0.2", features = [ "nightly", "serde-serialize" ] } wasm-bindgen = { version = "0.2", features = [ "serde-serialize" ] } wasm-bindgen-futures = "0.4" diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index f26d8b60837..30ebe925e90 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -22,7 +22,7 @@ wasmer-types = { path = "../types", version = "=4.2.1", default-features = false wasmer = { path = "../api", version = "=4.2.1", default-features = false, features = ["wat", "js-serializable-module"] } virtual-mio = { path = "../virtual-io", version = "0.3.0", default-features = false } virtual-fs = { path = "../virtual-fs", version = "0.9.0", default-features = false, features = ["webc-fs"] } -virtual-net = { path = "../virtual-net", version = "0.6.0", default-features = false } +virtual-net = { path = "../virtual-net", version = "0.6.1", default-features = false } wasmer-emscripten = { path = "../emscripten", version = "=4.2.1", optional = true } typetag = { version = "0.1", optional = true } serde = { version = "1.0", default-features = false, features = ["derive"] }