diff --git a/Cargo.lock b/Cargo.lock index da844de59..c8a38b893 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -452,18 +452,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" +checksum = "ad5264b5d315c515e0845dcd2cc1697ea0018d739d58b47477f8455842583568" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +checksum = "6c2797648025a7b2e32ec49fb2f71655fed74453cd41e209c6e39fd3107654f8" dependencies = [ "serde", "serde_derive", @@ -471,9 +471,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" +checksum = "548a3af0d36a36bab5c6a3bb8684816d501fd012c3328beb0f57dbbcb364c479" dependencies = [ "bumpalo", "cranelift-bforest", @@ -484,43 +484,43 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.5", + "hashbrown", "log", "regalloc2", - "rustc-hash 1.1.0", + "rustc-hash", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" +checksum = "9001ad2a4893d3505be514d3b55acc6d7efecba4bcc9ab6a7c4d422765c84202" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" +checksum = "df4b34c22fdfd5d95287ae0cc766e962a976754f0cf7daa4bfa5c6af55c5fb6b" [[package]] name = "cranelift-control" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" +checksum = "a4d78c20a5ba56200e691e0a62d15ffd18ffc781064443acbadce1f7dc847917" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" +checksum = "67e9d6c799b0775d43211d983b5f9230ea604063003cb6d492daf8dcac51da9b" dependencies = [ "cranelift-bitset", "serde", @@ -529,9 +529,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" +checksum = "7c1bd2fdbe0c0c10fcee7826c00ea0e7b2a0c4e95e6a879d88e11c006587560f" dependencies = [ "cranelift-codegen", "log", @@ -541,15 +541,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" +checksum = "e12b357f51e34f8e271977a5f422940aa985943d14ee8d49f66c6459ef458511" [[package]] name = "cranelift-native" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" +checksum = "da80e271413343c8ca2ca3375360a8d486355063bf96547db9714f2ac4580629" dependencies = [ "cranelift-codegen", "libc", @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" +checksum = "aa9276bbb4bbf05ba98dba1d07a506acc9ac1e15a500530399ff8aee70860118" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -568,7 +568,7 @@ dependencies = [ "itertools", "log", "smallvec", - "wasmparser", + "wasmparser 0.217.0", "wasmtime-types", ] @@ -975,15 +975,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1166,7 +1157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1449,7 +1440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "crc32fast", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "memchr", ] @@ -1592,7 +1583,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash", "rustls", "socket2", "thiserror", @@ -1609,7 +1600,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash 2.0.0", + "rustc-hash", "rustls", "rustls-platform-verifier", "slab", @@ -1716,13 +1707,13 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.9.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" +checksum = "12908dbeb234370af84d0579b9f68258a0f67e201412dd9a2814e6f45b2fc0f0" dependencies = [ - "hashbrown 0.13.2", + "hashbrown", "log", - "rustc-hash 1.1.0", + "rustc-hash", "slice-group-by", "smallvec", ] @@ -1842,12 +1833,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -2346,7 +2331,7 @@ version = "0.0.0" dependencies = [ "codegen-macro", "wit-bindgen-core", - "wit-parser", + "wit-parser 0.215.0", ] [[package]] @@ -2798,9 +2783,9 @@ dependencies = [ [[package]] name = "wasi-preview1-component-adapter-provider" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e6cadfa74538edd5409b6f8c79628436529138e9618b7373bec7aae7805835" +checksum = "c98ddc58309bd00f5e3dd61e5c8e809f22cc8966dceea5337740bcf25840475d" [[package]] name = "wasm-bindgen" @@ -2876,16 +2861,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" dependencies = [ "leb128", - "wasmparser", + "wasmparser 0.215.0", ] [[package]] name = "wasm-encoder" -version = "0.216.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88" +checksum = "7b88b0814c9a2b323a9b46c687e726996c255ac8b64aa237dd11c81ed4854760" dependencies = [ "leb128", + "wasmparser 0.217.0", ] [[package]] @@ -2901,7 +2887,23 @@ dependencies = [ "serde_json", "spdx", "wasm-encoder 0.215.0", - "wasmparser", + "wasmparser 0.215.0", +] + +[[package]] +name = "wasm-metadata" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65a146bf9a60e9264f0548a2599aa9656dba9a641eff9ab88299dc2a637e483c" +dependencies = [ + "anyhow", + "indexmap", + "serde", + "serde_derive", + "serde_json", + "spdx", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", ] [[package]] @@ -2925,7 +2927,20 @@ checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" dependencies = [ "ahash", "bitflags 2.6.0", - "hashbrown 0.14.5", + "hashbrown", + "indexmap", + "semver", +] + +[[package]] +name = "wasmparser" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca917a21307d3adf2b9857b94dd05ebf8496bdcff4437a9b9fb3899d3e6c74e7" +dependencies = [ + "ahash", + "bitflags 2.6.0", + "hashbrown", "indexmap", "semver", "serde", @@ -2933,20 +2948,20 @@ dependencies = [ [[package]] name = "wasmprinter" -version = "0.215.0" +version = "0.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" +checksum = "50dc568b3e0d47e8f96ea547c90790cfa783f0205160c40de894a427114185ce" dependencies = [ "anyhow", "termcolor", - "wasmparser", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" +checksum = "9e025f6280f91611a59f38057e0a4e72fbc08a2a4e6ed753a0d1970ac634a997" dependencies = [ "addr2line", "anyhow", @@ -2957,7 +2972,7 @@ dependencies = [ "cfg-if", "encoding_rs", "gimli", - "hashbrown 0.14.5", + "hashbrown", "indexmap", "libc", "libm", @@ -2977,8 +2992,8 @@ dependencies = [ "smallvec", "sptr", "target-lexicon", - "wasm-encoder 0.215.0", - "wasmparser", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmtime-asm-macros", "wasmtime-cache", "wasmtime-component-macro", @@ -2996,18 +3011,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" +checksum = "2977f9d1d1228154598e8d1cc5d55c4aa744297e9a3523b258e20d6ba0cbc3c9" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a5b179f263a318e08c93281ea77cbb95e2a0c8c11e99a6188b53ead77233722" +checksum = "97d80a94087214484c427095fdb28448643f16d4b4223d98e21f48df87844125" dependencies = [ "anyhow", "base64 0.21.7", @@ -3025,9 +3040,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" +checksum = "65b4bc589d7839d8dbfc4f4a0ea3380b11062ae26ff77c3a133c202fc4b21a31" dependencies = [ "anyhow", "proc-macro2", @@ -3035,20 +3050,20 @@ dependencies = [ "syn", "wasmtime-component-util", "wasmtime-wit-bindgen", - "wit-parser", + "wit-parser 0.217.0", ] [[package]] name = "wasmtime-component-util" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" +checksum = "8553d3720625ad4e65a9c71e215566361fcefc4e4001f17e7c669c503c33e6f6" [[package]] name = "wasmtime-cranelift" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" +checksum = "1b1b81791925aa182f0816562b8b41b9546077ba3a789ca18454a3ffe083963a" dependencies = [ "anyhow", "cfg-if", @@ -3061,18 +3076,19 @@ dependencies = [ "gimli", "log", "object", + "smallvec", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.217.0", "wasmtime-environ", "wasmtime-versioned-export-macros", ] [[package]] name = "wasmtime-environ" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" +checksum = "fe742ef5ee9ce201e513ee8da472eaf198e760499a730853622fc85a61cfb1eb" dependencies = [ "anyhow", "cpp_demangle", @@ -3088,8 +3104,8 @@ dependencies = [ "serde", "serde_derive", "target-lexicon", - "wasm-encoder 0.215.0", - "wasmparser", + "wasm-encoder 0.217.0", + "wasmparser 0.217.0", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -3097,9 +3113,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" +checksum = "2be377649da32af7b3eadd3ab5c89d645bdf0f5af9fe4fc59da457fbe4a87cdd" dependencies = [ "anyhow", "cc", @@ -3112,9 +3128,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" +checksum = "a67e6379ff6f5eb316e4fe2baaf360c7871082006fc31addf3cf58011edb855c" dependencies = [ "anyhow", "cfg-if", @@ -3124,29 +3140,29 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" +checksum = "7e1daff42dc6660aa4aead9586a1c41e498a1c15674784589aeb5c5090d09930" [[package]] name = "wasmtime-types" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" +checksum = "24adc06abbf23bf9abbdc4b4a3bb743436a60a2a76dfabb2e49bf5237d0dadcc" dependencies = [ "anyhow", "cranelift-entity", "serde", "serde_derive", "smallvec", - "wasmparser", + "wasmparser 0.217.0", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" +checksum = "467bf568f44048477d865a7bb42a1876acd1e2d3de77b42307f5d8e0126fc241" dependencies = [ "proc-macro2", "quote", @@ -3155,9 +3171,9 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c" +checksum = "4f7155aadce49095eeced1a18634a443c8d8fdd2a23bb61f933774393a2c4acf" dependencies = [ "anyhow", "async-trait", @@ -3185,16 +3201,16 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" +checksum = "4e8fdcd0682324b16fac3f3dd12eb4325d175e849b771aeda6edcb3065c85a4a" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", "winch-codegen", @@ -3202,34 +3218,34 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "24.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" +checksum = "eb8a4c5f38371e9dc1718421b03bc8737696587af5e1b233ea515ba5a111d106" dependencies = [ "anyhow", "heck 0.4.1", "indexmap", - "wit-parser", + "wit-parser 0.217.0", ] [[package]] name = "wast" -version = "216.0.0" +version = "217.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08" +checksum = "79004ecebded92d3c710d4841383368c7f04b63d0992ddd6b0c7d5029b7629b7" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.216.0", + "wasm-encoder 0.217.0", ] [[package]] name = "wat" -version = "1.216.0" +version = "1.217.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a" +checksum = "c126271c3d92ca0f7c63e4e462e40c69cca52fd4245fcda730d1cf558fb55088" dependencies = [ "wast", ] @@ -3275,7 +3291,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3286,9 +3302,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" +checksum = "b160fca5249410873830548ba7b1d956d8bf2afe72ced5e78266622d07de1303" dependencies = [ "anyhow", "cranelift-codegen", @@ -3296,7 +3312,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser", + "wasmparser 0.217.0", "wasmtime-cranelift", "wasmtime-environ", ] @@ -3496,7 +3512,7 @@ checksum = "bb7e3df01cd43cfa1cb52602e4fc05cb2b62217655f6705639b6953eb0a3fed2" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser", + "wit-parser 0.215.0", ] [[package]] @@ -3519,9 +3535,9 @@ dependencies = [ "indexmap", "prettyplease", "syn", - "wasm-metadata", + "wasm-metadata 0.215.0", "wit-bindgen-core", - "wit-component", + "wit-component 0.215.0", ] [[package]] @@ -3612,9 +3628,28 @@ dependencies = [ "serde_derive", "serde_json", "wasm-encoder 0.215.0", - "wasm-metadata", - "wasmparser", - "wit-parser", + "wasm-metadata 0.215.0", + "wasmparser 0.215.0", + "wit-parser 0.215.0", +] + +[[package]] +name = "wit-component" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7117809905e49db716d81e794f79590c052bf2fdbbcda1731ca0fb28f6f3ddf" +dependencies = [ + "anyhow", + "bitflags 2.6.0", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder 0.217.0", + "wasm-metadata 0.217.0", + "wasmparser 0.217.0", + "wit-parser 0.217.0", ] [[package]] @@ -3632,12 +3667,30 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser", + "wasmparser 0.215.0", +] + +[[package]] +name = "wit-parser" +version = "0.217.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser 0.217.0", ] [[package]] name = "wrpc" -version = "0.10.1" +version = "0.11.0" dependencies = [ "anyhow", "async-nats", @@ -3678,7 +3731,7 @@ dependencies = [ name = "wrpc-introspect" version = "0.3.0" dependencies = [ - "wit-parser", + "wit-parser 0.215.0", ] [[package]] @@ -3694,7 +3747,7 @@ dependencies = [ [[package]] name = "wrpc-runtime-wasmtime" -version = "0.21.1" +version = "0.22.0" dependencies = [ "anyhow", "bytes", @@ -3706,7 +3759,7 @@ dependencies = [ "wasm-tokio", "wasmtime", "wasmtime-wasi", - "wit-parser", + "wit-parser 0.215.0", "wrpc-introspect", "wrpc-transport", ] @@ -3764,7 +3817,7 @@ dependencies = [ [[package]] name = "wrpc-wasmtime-nats-cli" -version = "0.7.1" +version = "0.8.0" dependencies = [ "anyhow", "async-nats", @@ -3779,12 +3832,12 @@ dependencies = [ "url", "wasi-preview1-component-adapter-provider", "wasm-tokio", - "wasmparser", + "wasmparser 0.217.0", "wasmtime", "wasmtime-wasi", "wit-bindgen-wrpc", - "wit-component", - "wit-parser", + "wit-component 0.217.0", + "wit-parser 0.215.0", "wrpc-cli", "wrpc-introspect", "wrpc-runtime-wasmtime", diff --git a/Cargo.toml b/Cargo.toml index 883cc7f7a..f756c8870 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "WebAssembly component-native RPC framework based on WIT" name = "wrpc" -version = "0.10.1" +version = "0.11.0" authors.workspace = true categories.workspace = true @@ -123,23 +123,23 @@ tracing = { version = "0.1", default-features = false } tracing-subscriber = { version = "0.3", default-features = false } url = { version = "2" } uuid = { version = "1", default-features = false } -wasi-preview1-component-adapter-provider = { version = "24", default-features = false } +wasi-preview1-component-adapter-provider = { version = "25", default-features = false } wasm-tokio = { version = "0.6", default-features = false } -wasmparser = { version = "0.215", default-features = false } -wasmtime = { version = "24", default-features = false } -wasmtime-wasi = { version = "24", default-features = false } +wasmparser = { version = "0.217", default-features = false } +wasmtime = { version = "25", default-features = false } +wasmtime-wasi = { version = "25", default-features = false } wit-bindgen = { version = "0.30", default-features = false } wit-bindgen-core = { version = "0.30", default-features = false } wit-bindgen-wrpc = { version = "0.6.5", default-features = false, path = "./crates/wit-bindgen" } wit-bindgen-wrpc-go = { version = "0.8.1", default-features = false, path = "./crates/wit-bindgen-go" } wit-bindgen-wrpc-rust = { version = "0.6.5", default-features = false, path = "./crates/wit-bindgen-rust" } wit-bindgen-wrpc-rust-macro = { version = "0.6.5", default-features = false, path = "./crates/wit-bindgen-rust-macro" } -wit-component = { version = "0.215", default-features = false } +wit-component = { version = "0.217", default-features = false } wit-parser = { version = "0.215", default-features = false } wrpc-cli = { version = "0.3", path = "./crates/cli", default-features = false } wrpc-introspect = { version = "0.3", default-features = false, path = "./crates/introspect" } -wrpc-runtime-wasmtime = { version = "0.21.1", path = "./crates/runtime-wasmtime", default-features = false } +wrpc-runtime-wasmtime = { version = "0.22", path = "./crates/runtime-wasmtime", default-features = false } wrpc-transport = { version = "0.26.8", path = "./crates/transport", default-features = false } wrpc-transport-nats = { version = "0.23.1", path = "./crates/transport-nats", default-features = false } wrpc-transport-quic = { version = "0.1.2", path = "./crates/transport-quic", default-features = false } -wrpc-wasmtime-nats-cli = { version = "0.7.1", path = "./crates/wasmtime-nats-cli", default-features = false } +wrpc-wasmtime-nats-cli = { version = "0.8", path = "./crates/wasmtime-nats-cli", default-features = false } diff --git a/crates/runtime-wasmtime/Cargo.toml b/crates/runtime-wasmtime/Cargo.toml index ace901c71..ef5e4b45c 100644 --- a/crates/runtime-wasmtime/Cargo.toml +++ b/crates/runtime-wasmtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wrpc-runtime-wasmtime" -version = "0.21.1" +version = "0.22.0" description = "wRPC wasmtime integration" authors.workspace = true diff --git a/crates/runtime-wasmtime/src/lib.rs b/crates/runtime-wasmtime/src/lib.rs index e9a691867..11e74628c 100644 --- a/crates/runtime-wasmtime/src/lib.rs +++ b/crates/runtime-wasmtime/src/lib.rs @@ -471,67 +471,35 @@ where .try_into_resource::(&mut self.store) .context("failed to downcast `wasi:io/input-stream`")?; if stream.owned() { - let stream = self + let mut stream = self .store .data_mut() .table() .delete(stream) .context("failed to delete input stream")?; - match stream { - InputStream::Host(mut stream) => { - self.deferred = Some(Box::new(|w| { - Box::pin(async move { - let mut w = pin!(w); - loop { - stream.ready().await; - match stream.read(8096) { - Ok(buf) => { - let mut chunk = BytesMut::with_capacity( - buf.len().saturating_add(5), - ); - CoreVecEncoderBytes - .encode(buf, &mut chunk) - .context( - "failed to encode input stream chunk", - )?; - w.write_all(&chunk).await?; - } - Err(StreamError::Closed) => { - w.write_all(&[0x00]).await?; - } - Err(err) => return Err(err.into()), - } + self.deferred = Some(Box::new(|w| { + Box::pin(async move { + let mut w = pin!(w); + loop { + stream.ready().await; + match stream.read(8096) { + Ok(buf) => { + let mut chunk = BytesMut::with_capacity( + buf.len().saturating_add(5), + ); + CoreVecEncoderBytes + .encode(buf, &mut chunk) + .context("failed to encode input stream chunk")?; + w.write_all(&chunk).await?; } - }) - })); - } - InputStream::File(mut stream) => { - self.deferred = Some(Box::new(|w| { - Box::pin(async move { - let mut w = pin!(w); - loop { - match stream.read(8096).await { - Ok(buf) => { - let mut chunk = BytesMut::with_capacity( - buf.len().saturating_add(5), - ); - CoreVecEncoderBytes - .encode(buf, &mut chunk) - .context( - "failed to encode input stream chunk", - )?; - w.write_all(&chunk).await?; - } - Err(StreamError::Closed) => { - w.write_all(&[0x00]).await?; - } - Err(err) => return Err(err.into()), - } + Err(StreamError::Closed) => { + w.write_all(&[0x00]).await?; } - }) - })); - } - } + Err(err) => return Err(err.into()), + } + } + }) + })); } else { self.store .data_mut() @@ -856,11 +824,11 @@ where let res = store .data_mut() .table() - .push(InputStream::Host(Box::new(AsyncReadStream::new( + .push(Box::new(AsyncReadStream::new( FramedRead::new(r, ListDecoderU8::default()) .into_async_read() .compat(), - )))) + ))) .map_err(|err| std::io::Error::new(std::io::ErrorKind::OutOfMemory, err))?; let v = res .try_into_resource_any(store) diff --git a/crates/wasmtime-nats-cli/Cargo.toml b/crates/wasmtime-nats-cli/Cargo.toml index e8ec5e69f..900adf7d9 100644 --- a/crates/wasmtime-nats-cli/Cargo.toml +++ b/crates/wasmtime-nats-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wrpc-wasmtime-nats-cli" -version = "0.7.1" +version = "0.8.0" description = "wRPC Wasmtime NATS CLI" authors.workspace = true