diff --git a/Cargo.lock b/Cargo.lock index ac726081ba3..70b5b8ccb3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1869,6 +1869,26 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "handlebars" +version = "3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" +dependencies = [ + "log", + "pest", + "pest_derive", + "quick-error", + "serde", + "serde_json", +] + +[[package]] +name = "harsh" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6fce2283849822530a18d7d8eeb1719ac65a27cfb6649c0dc8dfd2d2cc5edfb" + [[package]] name = "hash32" version = "0.2.1" @@ -2256,6 +2276,22 @@ dependencies = [ "web-sys", ] +[[package]] +name = "interfaces" +version = "0.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6250a98af259a26fd5a4a6081fccea9ac116e4c3178acf4aeb86d32d2b7715" +dependencies = [ + "bitflags 2.3.3", + "cc", + "handlebars", + "lazy_static", + "libc", + "nix 0.26.2", + "serde", + "serde_derive", +] + [[package]] name = "inventory" version = "0.2.3" @@ -2527,6 +2563,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.8.0" @@ -2684,6 +2729,20 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", + "static_assertions", +] + [[package]] name = "nom" version = "5.1.3" @@ -3028,6 +3087,40 @@ dependencies = [ "ucd-trie", ] +[[package]] +name = "pest_derive" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "pest_meta" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "petgraph" version = "0.6.3" @@ -3261,6 +3354,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quote" version = "1.0.32" @@ -4189,6 +4288,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "sparx" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2257c28eacecfc38c658124ed239e7ecfc9b89082c0794b0672420b63b84c6" +dependencies = [ + "byteorder", +] + [[package]] name = "spin" version = "0.5.2" @@ -5051,6 +5159,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "virtual-mio" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc63af761ebc294142a24d62795518b8ed4f722ae9a6666b9f93569a4df6447e" +dependencies = [ + "async-trait", + "bytes", + "derivative", + "futures", + "mio", + "serde", + "socket2 0.4.9", + "thiserror", + "tracing", +] + [[package]] name = "virtual-net" version = "0.5.0" @@ -5076,7 +5201,36 @@ dependencies = [ "tokio-util 0.6.10", "tracing", "tracing-test", - "virtual-mio", + "virtual-mio 0.2.0", +] + +[[package]] +name = "virtual-net" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306bb6ff6ed62c44f50a72c7c89f95439bb0f56cce7c3963cd3ae6d292a04af5" +dependencies = [ + "anyhow", + "async-trait", + "base64", + "bincode", + "bytes", + "derivative", + "futures-util", + "hyper", + "hyper-tungstenite", + "libc", + "mio", + "pin-project-lite", + "serde", + "socket2 0.4.9", + "thiserror", + "tokio", + "tokio-serde", + "tokio-tungstenite", + "tokio-util 0.6.10", + "tracing", + "virtual-mio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5481,13 +5635,14 @@ dependencies = [ [[package]] name = "wasmer-api" -version = "0.0.12" +version = "0.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5c528b93fa430da1d4960759ded4f905bd7a82c68857f9eb01202a62650224" +checksum = "8c692f81bce9580250a57b20025175a5db99f4792ff8725a4fde0c5910c7ba81" dependencies = [ "anyhow", "cynic", "futures", + "harsh", "pin-project-lite", "reqwest", "serde", @@ -5630,7 +5785,7 @@ dependencies = [ "unix_mode", "url", "virtual-fs", - "virtual-net", + "virtual-net 0.5.0", "walkdir", "wasm-coredump-builder", "wasmer", @@ -5760,9 +5915,9 @@ dependencies = [ [[package]] name = "wasmer-deploy-cli" -version = "0.1.19" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622926606a0ec3d5d474485e2770e661445665e8e7a9e144c3e3732ebbf2c772" +checksum = "8390b4117c361b17ab27620a1bbd00bf031aae984b0199d47a9d6e4d8d79199f" dependencies = [ "anyhow", "clap", @@ -5771,6 +5926,7 @@ dependencies = [ "comfy-table", "dialoguer", "futures", + "interfaces", "is-terminal", "log", "once_cell", @@ -5787,6 +5943,8 @@ dependencies = [ "tracing-subscriber", "url", "uuid", + "virtual-mio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "virtual-net 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmer-api", "wasmer-deploy-schema", "wasmer-deploy-util", @@ -5797,17 +5955,21 @@ dependencies = [ [[package]] name = "wasmer-deploy-schema" -version = "0.0.10" +version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8c1b8e8c2e49f3c1a54bce561dbb79e81ced47818deddde8b32280e33ca2a6" +checksum = "8308664a51c1f56c27c9d11c545c8d1faa0c5b644dc9f71f98d5990a93c9bad9" dependencies = [ "anyhow", "bytesize", + "once_cell", + "rand_chacha", + "rand_core", "schemars", "serde", "serde_json", "serde_path_to_error", "serde_yaml 0.8.26", + "sparx", "time", "url", "uuid", @@ -5816,9 +5978,9 @@ dependencies = [ [[package]] name = "wasmer-deploy-util" -version = "0.0.10" +version = "0.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a1a67c2146f62b3e336f131404235f54e12fa80f0d8278b77fff56cdbe548f" +checksum = "6a8189d29c1ecaaeabd64b4e85c7d66b1cf42f355aae40612c20d5c5da83cf35" dependencies = [ "http", "serde", @@ -6157,8 +6319,8 @@ dependencies = [ "url", "urlencoding", "virtual-fs", - "virtual-mio", - "virtual-net", + "virtual-mio 0.2.0", + "virtual-net 0.5.0", "wai-bindgen-wasmer", "waker-fn", "wasm-bindgen", diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index 329bd9a23a5..dd38d637cc7 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -64,7 +64,7 @@ virtual-net = { version = "0.5.0", path = "../virtual-net" } # Wasmer-owned dependencies. webc = { workspace = true } -wasmer-deploy-cli = { version = "=0.1.19", default-features = false } +wasmer-deploy-cli = { version = "=0.1.23", default-features = false } # Third-party dependencies. diff --git a/lib/wasi-web/Cargo.lock b/lib/wasi-web/Cargo.lock index 9f225723fd1..bb6692ba266 100644 --- a/lib/wasi-web/Cargo.lock +++ b/lib/wasi-web/Cargo.lock @@ -2130,7 +2130,7 @@ dependencies = [ [[package]] name = "virtual-mio" -version = "0.1.0" +version = "0.2.0" dependencies = [ "async-trait", "bytes",