diff --git a/Cargo.lock b/Cargo.lock index 10d81c2a0..c2ac4c928 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1237,18 +1237,16 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7e56668d2263f92b691cb9e4a2fcb186ca0384941fe420484322fa559c3329" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9ff61938bf11615f55b80361288c68865318025632ea73c65c0b44fa16283c" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1267,33 +1265,29 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50656bf19e3d4a153b404ff835b8b59e924cfa3682ebe0d3df408994f37983f6" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388041deeb26109f1ea73c1812ea26bfd406c94cbce0bb5230aa44277e43b209" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "cranelift-control" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39b7c512ffac527e5b5df9beae3d67ab85d07dca6d88942c16195439fedd1d3" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb25f573701284fe2bcf88209d405342125df00764b396c923e11eafc94d892" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "serde", "serde_derive", @@ -1301,9 +1295,8 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57374fd11d72cf9ffb85ff64506ed831440818318f58d09f45b4185e5e9c376" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "log", @@ -1313,15 +1306,13 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae769b235f6ea2f86623a3ff157cc04a4ff131dc9fe782c2ebd35f272043581e" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "cranelift-native" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc7bfb8f13a0526fe20db338711d9354729b861c336978380bb10f7f17dd207" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "libc", @@ -1330,9 +1321,8 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.102.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c5f41a4af931b756be05af0dd374ce200aae2d52cea16b0beb07e8b52732c35" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1340,7 +1330,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-types", ] @@ -1749,7 +1739,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.11", "libflate", "log", "mime", @@ -1820,7 +1810,8 @@ dependencies = [ "anyhow", "async-trait", "derive_builder 0.12.0", - "hyper-tls", + "http 1.0.0", + "hyper-tls 0.6.0", "nix 0.26.4", "regex", "reqwest", @@ -2554,7 +2545,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util 0.7.10", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", "indexmap 2.1.0", "slab", "tokio", @@ -2683,6 +2693,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-auth" version = "0.1.8" @@ -2699,30 +2720,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0-rc.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http", + "http 1.0.0", ] [[package]] name = "http-body-util" -version = "0.1.0-rc.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92445bc9cc14bfa0a3ce56817dc3b5bcc227a168781a356b702410789cec0d10" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", "futures-util", - "http", - "http-body 1.0.0-rc.2", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -2774,8 +2795,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.11", "http-body 0.4.5", "httparse", "httpdate", @@ -2790,23 +2811,21 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.0-rc.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http", - "http-body 1.0.0-rc.2", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", "tokio", - "tracing", "want", ] @@ -2817,7 +2836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper 0.14.27", "log", "rustls 0.21.9", @@ -2840,6 +2859,42 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -3294,7 +3349,7 @@ dependencies = [ "bytes", "fallible-iterator 0.3.0", "futures", - "http", + "http 0.2.11", "hyper 0.14.27", "hyper-rustls", "libsql-sqlite3-parser", @@ -4020,7 +4075,7 @@ dependencies = [ "bytes", "chrono", "futures-util", - "http", + "http 0.2.11", "http-auth", "jwt", "lazy_static", @@ -4167,7 +4222,7 @@ name = "outbound-http" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", + "http 0.2.11", "reqwest", "spin-app", "spin-core", @@ -4940,12 +4995,12 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.11", "http-body 0.4.5", "hyper 0.14.27", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -5095,7 +5150,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "http", + "http 0.2.11", "reqwest", "rustify_derive", "serde", @@ -5689,7 +5744,8 @@ dependencies = [ "glob", "hex", "http-body-util", - "hyper 1.0.0-rc.3", + "hyper 1.1.0", + "hyper-util", "indicatif 0.17.7", "is-terminal", "itertools 0.11.0", @@ -5777,6 +5833,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", + "cap-primitives", "cap-std", "crossbeam-channel", "futures", @@ -5819,9 +5876,9 @@ name = "spin-http" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", + "http 1.0.0", "http-body-util", - "hyper 1.0.0-rc.3", + "hyper 1.1.0", "indexmap 1.9.3", "percent-encoding", "serde", @@ -5928,7 +5985,7 @@ name = "spin-llm-remote-http" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", + "http 0.2.11", "llm", "reqwest", "serde", @@ -5996,7 +6053,7 @@ version = "2.2.0-pre0" dependencies = [ "anyhow", "bytes", - "http", + "http 0.2.11", "proc-macro2", "quote", "syn 1.0.109", @@ -6111,7 +6168,7 @@ dependencies = [ "bytes", "form_urlencoded", "futures", - "http", + "http 0.2.11", "once_cell", "routefinder", "serde", @@ -6209,8 +6266,8 @@ name = "spin-testing" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", - "hyper 0.14.27", + "http 1.0.0", + "hyper 1.1.0", "serde", "serde_json", "spin-app", @@ -6282,9 +6339,10 @@ dependencies = [ "criterion", "futures", "futures-util", - "http", + "http 1.0.0", "http-body-util", - "hyper 1.0.0-rc.3", + "hyper 1.1.0", + "hyper-util", "indexmap 1.9.3", "num_cpus", "outbound-http", @@ -6988,6 +7046,7 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", + "tokio", "tower-layer", "tower-service", "tracing", @@ -7251,7 +7310,7 @@ dependencies = [ "async-trait", "bytes", "derive_builder 0.11.2", - "http", + "http 0.2.11", "reqwest", "rustify", "rustify_derive", @@ -7324,9 +7383,8 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4328de5cf2a0debfc48216fe9c2747badc64957837641f5836cd8b3d48d73f0" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -7342,14 +7400,13 @@ dependencies = [ "system-interface", "tracing", "wasi-common", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-common" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f6774ec9e464b7373f683bc57ff87fcca5fd26a7d6bdb7438fb2f56a545aa6" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -7362,14 +7419,13 @@ dependencies = [ "tracing", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-tokio" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "499ab8a1825b795a60cbfddc75a8f77dbfe9688575f8ade2e151f664869d5691" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cap-std", @@ -7546,9 +7602,8 @@ dependencies = [ [[package]] name = "wasmtime" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642e12d108e800215263e3b95972977f473957923103029d7d617db701d67ba4" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -7563,14 +7618,13 @@ dependencies = [ "object", "once_cell", "paste", - "psm", "rayon", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -7581,23 +7635,21 @@ dependencies = [ "wasmtime-runtime", "wasmtime-winch", "wat", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beada8bb15df52503de0a4c58de4357bfd2f96d9a44a6e547bad11efdd988b47" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba5bf44d044d25892c03fb3534373936ee204141ff92bac8297787ac7f22318" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "base64 0.21.5", @@ -7609,15 +7661,14 @@ dependencies = [ "serde_derive", "sha2", "toml 0.5.11", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-component-macro" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ccba556991465cca68d5a54769684bcf489fb532059da55105f851642d52c1" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "proc-macro2", @@ -7630,15 +7681,13 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05492a177a6006cb73f034d6e9a6fad6da55b23c4398835cb0012b5fa51ecf67" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "wasmtime-cranelift" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2e7532f1d6adbcc57e69bb6a7c503f0859076d07a9b4b6aabe8021ff8a05fd" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cfg-if", @@ -7653,7 +7702,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -7661,9 +7710,8 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c98d5378a856cbf058d36278627dfabf0ed68a888142958c7ae8e6af507dafa" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", @@ -7677,9 +7725,8 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d33a9f421da810a070cd56add9bc51f852bd66afbb8b920489d6242f15b70e" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-entity", @@ -7691,8 +7738,8 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -7700,9 +7747,8 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "404741f4c6d7f4e043be2e8b466406a2aee289ccdba22bf9eba6399921121b97" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cc", @@ -7710,14 +7756,13 @@ dependencies = [ "rustix 0.38.26", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d0994a86d6dca5f7d9740d7f2bd0568be06d2014a550361dc1c397d289d81ef" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "addr2line", "anyhow", @@ -7737,14 +7782,13 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-debug" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0c4b74e606d1462d648631d5bc328e3d5b14e7f9d3ff93bc6db062fb8c5cd8" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "object", "once_cell", @@ -7754,20 +7798,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3090a69ba1476979e090aa7ed4bc759178bafdb65b22f98b9ba24fc6e7e578d5" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b993ac8380385ed67bf71b51b9553edcf1ab0801b78a805a067de581b9a3e88a" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cc", @@ -7780,37 +7822,35 @@ dependencies = [ "memfd", "memoffset 0.9.0", "paste", - "rand 0.8.5", + "psm", "rustix 0.38.26", "sptr", - "wasm-encoder 0.36.2", + "wasm-encoder 0.38.1", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-types" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5778112fcab2dc3d4371f4203ab8facf0c453dd94312b0a88dd662955e64e0" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50f51f8d79bfd2aa8e9d9a0ae7c2d02b45fe412e62ff1b87c0c81b07c738231" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "proc-macro2", "quote", @@ -7819,9 +7859,8 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff3f4ad191a5e6d002bb5bffa3e2931a58984da9b30e57b48f353848748cf80" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -7850,23 +7889,22 @@ dependencies = [ "wasi-tokio", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-wasi-http" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08d975aba706a2c7813361a3cf15f5d1dac6e2f3478adfd8d69d040580733db" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", "bytes", "futures", - "http", - "http-body 1.0.0-rc.2", + "http 1.0.0", + "http-body 1.0.0", "http-body-util", - "hyper 1.0.0-rc.3", + "hyper 1.1.0", "rustls 0.21.9", "tokio", "tokio-rustls 0.24.1", @@ -7878,16 +7916,15 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d638e7c72447253485fe131523e7465ca318c0455c826eb4f5f612fb67b7de90" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", "gimli", "object", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -7895,9 +7932,8 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b804dfd3d0c0d6d37aa21026fe7772ba1a769c89ee4f5c4f13b82d91d75216f" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "heck 0.4.1", @@ -7907,9 +7943,8 @@ dependencies = [ [[package]] name = "wasmtime-wmemcheck" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6060bc082cc32d9a45587c7640e29e3c7b89ada82677ac25d87850aaccb368" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "wast" @@ -8060,9 +8095,8 @@ dependencies = [ [[package]] name = "wiggle" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91028b241e692fdf30627ac10ba9d5ac378353ea4119b4f904ac95177057a44" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -8075,9 +8109,8 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e8b3d76531994513671b2ec3b29fd342bf041e2282945bb6c52eebe6aa9e7da" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "heck 0.4.1", @@ -8090,9 +8123,8 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "15.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c189fe00c67f61bb330827f2abab1af9b5925c7929535cd13a68d265ec20b02d" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "proc-macro2", "quote", @@ -8133,9 +8165,8 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c792487f4dc42733d182a72e75d718b1a563cedcc1599ff0a9ed683c33e8bb7" +version = "0.15.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", @@ -8143,7 +8174,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-environ", ] @@ -8541,8 +8572,7 @@ dependencies = [ [[package]] name = "witx" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "log", diff --git a/Cargo.toml b/Cargo.toml index 180ef6856..91b5b097f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" license = "Apache-2.0 WITH LLVM-exception" homepage = "https://developer.fermyon.com/spin" repository = "https://github.com/fermyon/spin" -rust-version = "1.71" +rust-version = "1.73" [dependencies] anyhow = { workspace = true } @@ -91,6 +91,7 @@ which = "4.2.5" e2e-testing = { path = "crates/e2e-testing" } http-body-util = { workspace = true } testing-framework = { path = "tests/testing-framework" } +hyper-util = { version = "0.1.2", features = ["tokio"] } runtime-tests = { path = "tests/runtime-tests" } test-components = { path = "tests/test-components" } test-codegen-macro = { path = "crates/test-codegen-macro" } @@ -125,15 +126,16 @@ members = [ [workspace.dependencies] anyhow = "1.0.75" -http-body-util = "=0.1.0-rc.2" -hyper = { version = "=1.0.0-rc.3", features = ["full"] } +http-body-util = "0.1.0" +hyper = { version = "1.0.0", features = ["full"] } reqwest = { version = "0.11", features = ["stream", "blocking"] } tracing = { version = "0.1", features = ["log"] } -wasi-common-preview1 = { version = "15.0.0", package = "wasi-common" } -wasmtime = { version = "15.0.0", features = ["component-model"] } -wasmtime-wasi = { version = "15.0.0", features = ["tokio"] } -wasmtime-wasi-http = "15.0.0" +# TODO: update to final 17.0.0 release once it's available +wasi-common-preview1 = { git = "https://github.com/bytecodealliance/wasmtime", branch = "release-17.0.0", package = "wasi-common" } +wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", branch = "release-17.0.0", features = ["component-model"] } +wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", branch = "release-17.0.0", features = ["tokio"] } +wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", branch = "release-17.0.0" } spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" } diff --git a/build.rs b/build.rs index 69924f5e0..d459faf37 100644 --- a/build.rs +++ b/build.rs @@ -12,6 +12,7 @@ const TIMER_TRIGGER_INTEGRATION_TEST: &str = "examples/spin-timer/app-example"; const WASI_HTTP_INTEGRATION_TEST: &str = "examples/wasi-http-rust-streaming-outgoing-body"; const OUTBOUND_HTTP_POST_INTEGRATION_TEST: &str = "examples/http-rust-outbound-post"; const WASI_HTTP_RC_11_10_INTEGRATION_TEST: &str = "tests/http/wasi-http-rust-0.2.0-rc-2023-11-10"; +const WASI_HTTP_RC_12_05_INTEGRATION_TEST: &str = "tests/http/wasi-http-rust-0.2.0-rc-2023-12-05"; fn main() { // Extract environment information to be passed to plugins. @@ -116,6 +117,34 @@ error: the `wasm32-wasi` target is not installed .unwrap(), ) .unwrap(); + + cargo_build(WASI_HTTP_RC_12_05_INTEGRATION_TEST); + + // Rather than let `spin-componentize` turn the `WASI_HTTP_RC_12_05_INTEGRATION_TEST` module into a component, + // we use Wasmtime 16.0.0's adapter to ensure it uses the WASI 0.2.0-rc-2023-12-05 snapshot for everything. + let wasi_http_rc_12_05_module = format!( + "{WASI_HTTP_RC_12_05_INTEGRATION_TEST}/target/wasm32-wasi/release/wasi_http_rust_rc_2023_12_05.wasm" + ); + let wasi_http_rc_12_05_adapter = + format!("{WASI_HTTP_RC_12_05_INTEGRATION_TEST}/wasi_snapshot_preview1.reactor.wasm"); + let wasi_http_rc_12_05_component = format!( + "{WASI_HTTP_RC_12_05_INTEGRATION_TEST}/target/wasm32-wasi/release/wasi_http_rust_rc_2023_12_05.component.wasm" + ); + std::fs::write( + wasi_http_rc_12_05_component, + wit_component::ComponentEncoder::default() + .validate(true) + .module(&std::fs::read(wasi_http_rc_12_05_module).unwrap()) + .unwrap() + .adapter( + "wasi_snapshot_preview1", + &std::fs::read(wasi_http_rc_12_05_adapter).unwrap(), + ) + .unwrap() + .encode() + .unwrap(), + ) + .unwrap(); } fn build_wasm_test_program(name: &'static str, root: &'static str) { diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 4b5d722c9..a76b84c8a 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -15,6 +15,7 @@ wasmtime-wasi-http = { workspace = true } wasi-common-preview1 = { workspace = true } system-interface = { version = "0.26.0", features = ["cap_std_impls"] } cap-std = "2.0.0" +cap-primitives = "2.0.0" tokio = "1.0" bytes = "1.0" diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index a12ab8c04..230f48c7d 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -13,6 +13,7 @@ mod limits; mod preview1; mod store; pub mod wasi_2023_10_18; +pub mod wasi_2023_11_10; use std::{path::PathBuf, sync::Arc, time::Duration}; @@ -20,7 +21,7 @@ use anyhow::Result; use crossbeam_channel::Sender; use tracing::instrument; use wasmtime::{InstanceAllocationStrategy, PoolingAllocationConfig}; -use wasmtime_wasi::preview2::Table; +use wasmtime_wasi::preview2::ResourceTable; use wasmtime_wasi_http::types::{default_send_request, WasiHttpCtx, WasiHttpView}; use self::host_component::{HostComponents, HostComponentsBuilder}; @@ -146,7 +147,7 @@ pub struct Data { wasi: Wasi, host_components_data: HostComponentsData, store_limits: limits::StoreLimitsAsync, - table: Table, + table: ResourceTable, } impl Data { @@ -169,11 +170,11 @@ impl AsMut for Data { } impl wasmtime_wasi::preview2::WasiView for Data { - fn table(&self) -> &wasmtime_wasi::preview2::Table { + fn table(&self) -> &ResourceTable { &self.table } - fn table_mut(&mut self) -> &mut wasmtime_wasi::preview2::Table { + fn table_mut(&mut self) -> &mut ResourceTable { &mut self.table } @@ -200,7 +201,7 @@ impl WasiHttpView for Data { } } - fn table(&mut self) -> &mut Table { + fn table(&mut self) -> &mut ResourceTable { &mut self.table } diff --git a/crates/core/src/store.rs b/crates/core/src/store.rs index 1001aa488..5b3d81277 100644 --- a/crates/core/src/store.rs +++ b/crates/core/src/store.rs @@ -1,8 +1,10 @@ use anyhow::{anyhow, Result}; use bytes::Bytes; +use cap_primitives::net::Pool; use cap_std::ipnet::IpNet; use std::{ io::{Read, Write}, + mem, path::{Path, PathBuf}, sync::{Arc, Mutex}, time::{Duration, Instant}, @@ -137,6 +139,7 @@ pub struct StoreBuilder { wasi: std::result::Result, host_components_data: HostComponentsData, store_limits: StoreLimitsAsync, + net_pool: Pool, } impl StoreBuilder { @@ -153,6 +156,7 @@ impl StoreBuilder { wasi: Ok(wasi.into()), host_components_data: host_components.new_data(), store_limits: StoreLimitsAsync::default(), + net_pool: Pool::default(), } } @@ -187,10 +191,15 @@ impl StoreBuilder { WasiCtxBuilder::Preview1(_) => { panic!("Enabling network only allowed in preview2") } - WasiCtxBuilder::Preview2(ctx) => { - ctx.insert_ip_net_port_range(ip_net, ports_start, ports_end); - } + WasiCtxBuilder::Preview2(_) => {} }); + + self.net_pool.insert_ip_net_port_range( + ip_net, + ports_start, + ports_end, + cap_primitives::ambient_authority(), + ); } /// Inherit the host network with a few hardcoded caveats @@ -201,7 +210,7 @@ impl StoreBuilder { } WasiCtxBuilder::Preview2(ctx) => { // TODO: ctx.allow_udp(false); - ctx.inherit_network(cap_std::ambient_authority()); + ctx.inherit_network(); } }); } @@ -398,7 +407,15 @@ impl StoreBuilder { /// Builds a [`Store`] from this builder with given host state data. /// /// If `T: Default`, it may be preferable to use [`Store::build`]. - pub fn build_with_data(self, inner_data: T) -> Result> { + pub fn build_with_data(mut self, inner_data: T) -> Result> { + let net_pool = mem::take(&mut self.net_pool); + self.with_wasi(move |wasi| match wasi { + WasiCtxBuilder::Preview1(_) => {} + WasiCtxBuilder::Preview2(ctx) => { + ctx.socket_addr_check(move |addr, _| net_pool.check_addr(addr).is_ok()); + } + }); + let wasi = self.wasi.map_err(anyhow::Error::msg)?.build(); let mut inner = wasmtime::Store::new( @@ -408,7 +425,7 @@ impl StoreBuilder { wasi, host_components_data: self.host_components_data, store_limits: self.store_limits, - table: wasi_preview2::Table::new(), + table: wasi_preview2::ResourceTable::new(), }, ); diff --git a/crates/core/src/wasi_2023_10_18.rs b/crates/core/src/wasi_2023_10_18.rs index 62189e02d..6382f2b82 100644 --- a/crates/core/src/wasi_2023_10_18.rs +++ b/crates/core/src/wasi_2023_10_18.rs @@ -199,7 +199,7 @@ where { fn filesystem_error_code( &mut self, - err: Resource, + err: Resource, ) -> wasmtime::Result> { Ok( ::filesystem_error_code(self, err)? @@ -2033,11 +2033,12 @@ where self_: wasmtime::component::Resource, ) -> wasmtime::Result, HttpError>>> { match ::get(self, self_)? { - Some(Ok(Some(trailers))) => Ok(Some(Ok(trailers))), + Some(Ok(Ok(Some(trailers)))) => Ok(Some(Ok(trailers))), // Return an empty trailers if no trailers popped out since this // version of WASI couldn't represent the lack of trailers. - Some(Ok(None)) => Ok(Some(Ok(::new(self)?))), - Some(Err(e)) => Ok(Some(Err(e.into()))), + Some(Ok(Ok(None))) => Ok(Some(Ok(::new(self)?))), + Some(Ok(Err(e))) => Ok(Some(Err(e.into()))), + Some(Err(())) => Err(anyhow::anyhow!("trailers have already been retrieved")), None => Ok(None), } } @@ -2101,7 +2102,7 @@ where if let Some(ms) = connect_timeout_ms { if let Err(()) = - ::set_connect_timeout_ms( + ::set_connect_timeout( self, borrow(), Some(ms.into()), @@ -2114,7 +2115,7 @@ where if let Some(ms) = first_byte_timeout_ms { if let Err(()) = - ::set_first_byte_timeout_ms( + ::set_first_byte_timeout( self, borrow(), Some(ms.into()), @@ -2127,7 +2128,7 @@ where if let Some(ms) = between_bytes_timeout_ms { if let Err(()) = - ::set_between_bytes_timeout_ms( + ::set_between_bytes_timeout( self, borrow(), Some(ms.into()), @@ -2234,6 +2235,8 @@ macro_rules! convert { }; } +pub(crate) use convert; + convert! { struct latest::clocks::wall_clock::Datetime [<=>] Datetime { seconds, diff --git a/crates/core/src/wasi_2023_11_10.rs b/crates/core/src/wasi_2023_11_10.rs new file mode 100644 index 000000000..7b846925c --- /dev/null +++ b/crates/core/src/wasi_2023_11_10.rs @@ -0,0 +1,912 @@ +#![doc(hidden)] // internal implementation detail used in tests and spin-trigger + +use super::wasi_2023_10_18::convert; +use anyhow::Result; +use wasmtime::component::{Linker, Resource}; +use wasmtime_wasi::preview2::WasiView; +use wasmtime_wasi_http::WasiHttpView; + +mod latest { + pub use wasmtime_wasi::preview2::bindings::wasi::*; + pub mod http { + pub use wasmtime_wasi_http::bindings::wasi::http::*; + } +} + +wasmtime::component::bindgen!({ + path: "../../wit-2023-11-10", + interfaces: r#" + include wasi:http/proxy@0.2.0-rc-2023-11-10; + + // NB: this is handling the historical behavior where Spin supported + // more than "just" this snaphsot of the proxy world but additionally + // other CLI-related interfaces. + import wasi:cli/environment@0.2.0-rc-2023-11-10; + import wasi:cli/exit@0.2.0-rc-2023-11-10; + import wasi:cli/stdin@0.2.0-rc-2023-11-10; + import wasi:cli/stdout@0.2.0-rc-2023-11-10; + import wasi:cli/stderr@0.2.0-rc-2023-11-10; + import wasi:cli/terminal-input@0.2.0-rc-2023-11-10; + import wasi:cli/terminal-output@0.2.0-rc-2023-11-10; + import wasi:cli/terminal-stdin@0.2.0-rc-2023-11-10; + import wasi:cli/terminal-stdout@0.2.0-rc-2023-11-10; + import wasi:cli/terminal-stderr@0.2.0-rc-2023-11-10; + "#, + async: { + only_imports: [] + }, + with: { + "wasi:io/poll/pollable": latest::io::poll::Pollable, + "wasi:io/streams/input-stream": latest::io::streams::InputStream, + "wasi:io/streams/output-stream": latest::io::streams::OutputStream, + "wasi:io/error/error": latest::io::error::Error, + "wasi:cli/terminal-input/terminal-input": latest::cli::terminal_input::TerminalInput, + "wasi:cli/terminal-output/terminal-output": latest::cli::terminal_output::TerminalOutput, + "wasi:http/types/incoming-response": latest::http::types::IncomingResponse, + "wasi:http/types/incoming-request": latest::http::types::IncomingRequest, + "wasi:http/types/incoming-body": latest::http::types::IncomingBody, + "wasi:http/types/outgoing-response": latest::http::types::OutgoingResponse, + "wasi:http/types/outgoing-request": latest::http::types::OutgoingRequest, + "wasi:http/types/outgoing-body": latest::http::types::OutgoingBody, + "wasi:http/types/fields": latest::http::types::Fields, + "wasi:http/types/response-outparam": latest::http::types::ResponseOutparam, + "wasi:http/types/future-incoming-response": latest::http::types::FutureIncomingResponse, + "wasi:http/types/future-trailers": latest::http::types::FutureTrailers, + "wasi:http/types/request-options": latest::http::types::RequestOptions, + }, +}); + +use wasi::cli::terminal_input::TerminalInput; +use wasi::cli::terminal_output::TerminalOutput; +use wasi::clocks::wall_clock::Datetime; +use wasi::http::types::{ + DnsErrorPayload, ErrorCode as HttpErrorCode, FieldSizePayload, Fields, FutureIncomingResponse, + FutureTrailers, HeaderError, Headers, IncomingBody, IncomingRequest, IncomingResponse, Method, + OutgoingBody, OutgoingRequest, OutgoingResponse, RequestOptions, ResponseOutparam, Scheme, + StatusCode, TlsAlertReceivedPayload, Trailers, +}; +use wasi::io::poll::Pollable; +use wasi::io::streams::{Error, InputStream, OutputStream}; + +pub fn add_to_linker(linker: &mut Linker) -> Result<()> +where + T: WasiView + WasiHttpView, +{ + // interfaces from the "command" world + wasi::cli::exit::add_to_linker(linker, |t| t)?; + wasi::cli::environment::add_to_linker(linker, |t| t)?; + wasi::cli::stdin::add_to_linker(linker, |t| t)?; + wasi::cli::stdout::add_to_linker(linker, |t| t)?; + wasi::cli::stderr::add_to_linker(linker, |t| t)?; + wasi::cli::terminal_input::add_to_linker(linker, |t| t)?; + wasi::cli::terminal_output::add_to_linker(linker, |t| t)?; + wasi::cli::terminal_stdin::add_to_linker(linker, |t| t)?; + wasi::cli::terminal_stdout::add_to_linker(linker, |t| t)?; + wasi::cli::terminal_stderr::add_to_linker(linker, |t| t)?; + + wasi::http::types::add_to_linker(linker, |t| t)?; + wasi::http::outgoing_handler::add_to_linker(linker, |t| t)?; + Ok(()) +} + +impl wasi::cli::exit::Host for T +where + T: WasiView, +{ + fn exit(&mut self, status: Result<(), ()>) -> wasmtime::Result<()> { + ::exit(self, status) + } +} + +impl wasi::cli::environment::Host for T +where + T: WasiView, +{ + fn get_environment(&mut self) -> wasmtime::Result> { + ::get_environment(self) + } + + fn get_arguments(&mut self) -> wasmtime::Result> { + ::get_arguments(self) + } + + fn initial_cwd(&mut self) -> wasmtime::Result> { + ::initial_cwd(self) + } +} + +impl wasi::cli::stdin::Host for T +where + T: WasiView, +{ + fn get_stdin(&mut self) -> wasmtime::Result> { + ::get_stdin(self) + } +} + +impl wasi::cli::stdout::Host for T +where + T: WasiView, +{ + fn get_stdout(&mut self) -> wasmtime::Result> { + ::get_stdout(self) + } +} + +impl wasi::cli::stderr::Host for T +where + T: WasiView, +{ + fn get_stderr(&mut self) -> wasmtime::Result> { + ::get_stderr(self) + } +} + +impl wasi::cli::terminal_stdin::Host for T +where + T: WasiView, +{ + fn get_terminal_stdin(&mut self) -> wasmtime::Result>> { + ::get_terminal_stdin(self) + } +} + +impl wasi::cli::terminal_stdout::Host for T +where + T: WasiView, +{ + fn get_terminal_stdout(&mut self) -> wasmtime::Result>> { + ::get_terminal_stdout(self) + } +} + +impl wasi::cli::terminal_stderr::Host for T +where + T: WasiView, +{ + fn get_terminal_stderr(&mut self) -> wasmtime::Result>> { + ::get_terminal_stderr(self) + } +} + +impl wasi::cli::terminal_input::Host for T where T: WasiView {} + +impl wasi::cli::terminal_input::HostTerminalInput for T +where + T: WasiView, +{ + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::cli::terminal_output::Host for T where T: WasiView {} + +impl wasi::cli::terminal_output::HostTerminalOutput for T +where + T: WasiView, +{ + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::Host for T +where + T: WasiHttpView, +{ + fn http_error_code( + &mut self, + error: Resource, + ) -> wasmtime::Result> { + ::http_error_code(self, error).map(|e| e.map(|e| e.into())) + } +} + +impl wasi::http::types::HostRequestOptions for T +where + T: WasiHttpView, +{ + fn new(&mut self) -> wasmtime::Result> { + ::new(self) + } + + fn connect_timeout_ms( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::connect_timeout(self, self_) + } + + fn set_connect_timeout_ms( + &mut self, + self_: Resource, + duration: Option, + ) -> wasmtime::Result> { + ::set_connect_timeout(self, self_, duration) + } + + fn first_byte_timeout_ms( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::first_byte_timeout(self, self_) + } + + fn set_first_byte_timeout_ms( + &mut self, + self_: Resource, + duration: Option, + ) -> wasmtime::Result> { + ::set_first_byte_timeout( + self, self_, duration, + ) + } + + fn between_bytes_timeout_ms( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::between_bytes_timeout(self, self_) + } + + fn set_between_bytes_timeout_ms( + &mut self, + self_: Resource, + duration: Option, + ) -> wasmtime::Result> { + ::set_between_bytes_timeout( + self, self_, duration, + ) + } + + fn drop(&mut self, self_: Resource) -> wasmtime::Result<()> { + ::drop(self, self_) + } +} + +impl wasi::http::types::HostFields for T +where + T: WasiHttpView, +{ + fn new(&mut self) -> wasmtime::Result> { + ::new(self) + } + + fn from_list( + &mut self, + entries: Vec<(String, Vec)>, + ) -> wasmtime::Result, HeaderError>> { + ::from_list(self, entries) + .map(|r| r.map_err(|e| e.into())) + } + + fn get(&mut self, self_: Resource, name: String) -> wasmtime::Result>> { + ::get(self, self_, name) + } + + fn set( + &mut self, + self_: Resource, + name: String, + value: Vec>, + ) -> wasmtime::Result> { + ::set(self, self_, name, value) + .map(|r| r.map_err(|e| e.into())) + } + + fn delete( + &mut self, + self_: Resource, + name: String, + ) -> wasmtime::Result> { + ::delete(self, self_, name) + .map(|r| r.map_err(|e| e.into())) + } + + fn append( + &mut self, + self_: Resource, + name: String, + value: Vec, + ) -> wasmtime::Result> { + ::append(self, self_, name, value) + .map(|r| r.map_err(|e| e.into())) + } + + fn entries(&mut self, self_: Resource) -> wasmtime::Result)>> { + ::entries(self, self_) + } + + fn clone(&mut self, self_: Resource) -> wasmtime::Result> { + ::clone(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostIncomingRequest for T +where + T: WasiHttpView, +{ + fn method(&mut self, self_: Resource) -> wasmtime::Result { + ::method(self, self_).map(|e| e.into()) + } + + fn path_with_query( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::path_with_query(self, self_) + } + + fn scheme(&mut self, self_: Resource) -> wasmtime::Result> { + ::scheme(self, self_) + .map(|e| e.map(|e| e.into())) + } + + fn authority(&mut self, self_: Resource) -> wasmtime::Result> { + ::authority(self, self_) + } + + fn headers(&mut self, self_: Resource) -> wasmtime::Result> { + ::headers(self, self_) + } + + fn consume( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::consume(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostIncomingResponse for T +where + T: WasiHttpView, +{ + fn status(&mut self, self_: Resource) -> wasmtime::Result { + ::status(self, self_) + } + + fn headers( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::headers(self, self_) + } + + fn consume( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::consume(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostIncomingBody for T +where + T: WasiHttpView, +{ + fn stream( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::stream(self, self_) + } + + fn finish( + &mut self, + this: Resource, + ) -> wasmtime::Result> { + ::finish(self, this) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostOutgoingRequest for T +where + T: WasiHttpView, +{ + fn new(&mut self, headers: Resource) -> wasmtime::Result> { + ::new(self, headers) + } + + fn method(&mut self, self_: Resource) -> wasmtime::Result { + ::method(self, self_).map(|m| m.into()) + } + + fn set_method( + &mut self, + self_: Resource, + method: Method, + ) -> wasmtime::Result> { + ::set_method(self, self_, method.into()) + } + + fn path_with_query( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::path_with_query(self, self_) + } + + fn set_path_with_query( + &mut self, + self_: Resource, + path_with_query: Option, + ) -> wasmtime::Result> { + ::set_path_with_query( + self, + self_, + path_with_query, + ) + } + + fn scheme(&mut self, self_: Resource) -> wasmtime::Result> { + ::scheme(self, self_) + .map(|s| s.map(|s| s.into())) + } + + fn set_scheme( + &mut self, + self_: Resource, + scheme: Option, + ) -> wasmtime::Result> { + ::set_scheme( + self, + self_, + scheme.map(|s| s.into()), + ) + } + + fn authority(&mut self, self_: Resource) -> wasmtime::Result> { + ::authority(self, self_) + } + + fn set_authority( + &mut self, + self_: Resource, + authority: Option, + ) -> wasmtime::Result> { + ::set_authority(self, self_, authority) + } + + fn headers(&mut self, self_: Resource) -> wasmtime::Result> { + ::headers(self, self_) + } + + fn body( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::body(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostOutgoingResponse for T +where + T: WasiHttpView, +{ + fn new(&mut self, headers: Resource) -> wasmtime::Result> { + let headers = ::clone(self, headers)?; + ::new(self, headers) + } + + fn status_code(&mut self, self_: Resource) -> wasmtime::Result { + ::status_code(self, self_) + } + + fn set_status_code( + &mut self, + self_: Resource, + status_code: StatusCode, + ) -> wasmtime::Result> { + ::set_status_code(self, self_, status_code) + } + + fn headers( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::headers(self, self_) + } + + fn body( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::body(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostOutgoingBody for T +where + T: WasiHttpView, +{ + fn write( + &mut self, + self_: Resource, + ) -> wasmtime::Result, ()>> { + ::write(self, self_) + } + + fn finish( + &mut self, + this: Resource, + trailers: Option>, + ) -> wasmtime::Result> { + ::finish(self, this, trailers) + .map(|r| r.map_err(|e| e.into())) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostResponseOutparam for T +where + T: WasiHttpView, +{ + fn set( + &mut self, + param: Resource, + response: Result, HttpErrorCode>, + ) -> wasmtime::Result<()> { + ::set( + self, + param, + response.map_err(|e| e.into()), + ) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostFutureTrailers for T +where + T: WasiHttpView, +{ + fn subscribe( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::subscribe(self, self_) + } + + fn get( + &mut self, + self_: Resource, + ) -> wasmtime::Result>, HttpErrorCode>>> { + match ::get(self, self_)? { + Some(Ok(Ok(trailers))) => Ok(Some(Ok(trailers))), + Some(Ok(Err(e))) => Ok(Some(Err(e.into()))), + Some(Err(())) => Err(anyhow::anyhow!("trailers have already been retrieved")), + None => Ok(None), + } + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::types::HostFutureIncomingResponse for T +where + T: WasiHttpView, +{ + fn get( + &mut self, + self_: Resource, + ) -> wasmtime::Result, HttpErrorCode>, ()>>> + { + match ::get(self, self_)? { + None => Ok(None), + Some(Ok(Ok(response))) => Ok(Some(Ok(Ok(response)))), + Some(Ok(Err(e))) => Ok(Some(Ok(Err(e.into())))), + Some(Err(())) => Ok(Some(Err(()))), + } + } + + fn subscribe( + &mut self, + self_: Resource, + ) -> wasmtime::Result> { + ::subscribe(self, self_) + } + + fn drop(&mut self, rep: Resource) -> wasmtime::Result<()> { + ::drop(self, rep) + } +} + +impl wasi::http::outgoing_handler::Host for T +where + T: WasiHttpView, +{ + fn handle( + &mut self, + request: Resource, + options: Option>, + ) -> wasmtime::Result, HttpErrorCode>> { + match ::handle(self, request, options)? { + Ok(resp) => Ok(Ok(resp)), + Err(e) => Ok(Err(e.into())), + } + } +} + +convert! { + struct latest::clocks::wall_clock::Datetime [<=>] Datetime { + seconds, + nanoseconds, + } + + enum latest::http::types::Method [<=>] Method { + Get, + Head, + Post, + Put, + Delete, + Connect, + Options, + Trace, + Patch, + Other(e), + } + + enum latest::http::types::Scheme [<=>] Scheme { + Http, + Https, + Other(e), + } + + enum latest::http::types::HeaderError => HeaderError { + InvalidSyntax, + Forbidden, + Immutable, + } + + struct latest::http::types::DnsErrorPayload [<=>] DnsErrorPayload { + rcode, + info_code, + } + + struct latest::http::types::TlsAlertReceivedPayload [<=>] TlsAlertReceivedPayload { + alert_id, + alert_message, + } + + struct latest::http::types::FieldSizePayload [<=>] FieldSizePayload { + field_name, + field_size, + } +} + +impl From for HttpErrorCode { + fn from(e: latest::http::types::ErrorCode) -> Self { + match e { + latest::http::types::ErrorCode::DnsTimeout => HttpErrorCode::DnsTimeout, + latest::http::types::ErrorCode::DnsError(e) => HttpErrorCode::DnsError(e.into()), + latest::http::types::ErrorCode::DestinationNotFound => { + HttpErrorCode::DestinationNotFound + } + latest::http::types::ErrorCode::DestinationUnavailable => { + HttpErrorCode::DestinationUnavailable + } + latest::http::types::ErrorCode::DestinationIpProhibited => { + HttpErrorCode::DestinationIpProhibited + } + latest::http::types::ErrorCode::DestinationIpUnroutable => { + HttpErrorCode::DestinationIpUnroutable + } + latest::http::types::ErrorCode::ConnectionRefused => HttpErrorCode::ConnectionRefused, + latest::http::types::ErrorCode::ConnectionTerminated => { + HttpErrorCode::ConnectionTerminated + } + latest::http::types::ErrorCode::ConnectionTimeout => HttpErrorCode::ConnectionTimeout, + latest::http::types::ErrorCode::ConnectionReadTimeout => { + HttpErrorCode::ConnectionReadTimeout + } + latest::http::types::ErrorCode::ConnectionWriteTimeout => { + HttpErrorCode::ConnectionWriteTimeout + } + latest::http::types::ErrorCode::ConnectionLimitReached => { + HttpErrorCode::ConnectionLimitReached + } + latest::http::types::ErrorCode::TlsProtocolError => HttpErrorCode::TlsProtocolError, + latest::http::types::ErrorCode::TlsCertificateError => { + HttpErrorCode::TlsCertificateError + } + latest::http::types::ErrorCode::TlsAlertReceived(e) => { + HttpErrorCode::TlsAlertReceived(e.into()) + } + latest::http::types::ErrorCode::HttpRequestDenied => HttpErrorCode::HttpRequestDenied, + latest::http::types::ErrorCode::HttpRequestLengthRequired => { + HttpErrorCode::HttpRequestLengthRequired + } + latest::http::types::ErrorCode::HttpRequestBodySize(e) => { + HttpErrorCode::HttpRequestBodySize(e) + } + latest::http::types::ErrorCode::HttpRequestMethodInvalid => { + HttpErrorCode::HttpRequestMethodInvalid + } + latest::http::types::ErrorCode::HttpRequestUriInvalid => { + HttpErrorCode::HttpRequestUriInvalid + } + latest::http::types::ErrorCode::HttpRequestUriTooLong => { + HttpErrorCode::HttpRequestUriTooLong + } + latest::http::types::ErrorCode::HttpRequestHeaderSectionSize(e) => { + HttpErrorCode::HttpRequestHeaderSectionSize(e) + } + latest::http::types::ErrorCode::HttpRequestHeaderSize(e) => { + HttpErrorCode::HttpRequestHeaderSize(e.map(|e| e.into())) + } + latest::http::types::ErrorCode::HttpRequestTrailerSectionSize(e) => { + HttpErrorCode::HttpRequestTrailerSectionSize(e) + } + latest::http::types::ErrorCode::HttpRequestTrailerSize(e) => { + HttpErrorCode::HttpRequestTrailerSize(e.into()) + } + latest::http::types::ErrorCode::HttpResponseIncomplete => { + HttpErrorCode::HttpResponseIncomplete + } + latest::http::types::ErrorCode::HttpResponseHeaderSectionSize(e) => { + HttpErrorCode::HttpResponseHeaderSectionSize(e) + } + latest::http::types::ErrorCode::HttpResponseHeaderSize(e) => { + HttpErrorCode::HttpResponseHeaderSize(e.into()) + } + latest::http::types::ErrorCode::HttpResponseBodySize(e) => { + HttpErrorCode::HttpResponseBodySize(e) + } + latest::http::types::ErrorCode::HttpResponseTrailerSectionSize(e) => { + HttpErrorCode::HttpResponseTrailerSectionSize(e) + } + latest::http::types::ErrorCode::HttpResponseTrailerSize(e) => { + HttpErrorCode::HttpResponseTrailerSize(e.into()) + } + latest::http::types::ErrorCode::HttpResponseTransferCoding(e) => { + HttpErrorCode::HttpResponseTransferCoding(e) + } + latest::http::types::ErrorCode::HttpResponseContentCoding(e) => { + HttpErrorCode::HttpResponseContentCoding(e) + } + latest::http::types::ErrorCode::HttpResponseTimeout => { + HttpErrorCode::HttpResponseTimeout + } + latest::http::types::ErrorCode::HttpUpgradeFailed => HttpErrorCode::HttpUpgradeFailed, + latest::http::types::ErrorCode::HttpProtocolError => HttpErrorCode::HttpProtocolError, + latest::http::types::ErrorCode::LoopDetected => HttpErrorCode::LoopDetected, + latest::http::types::ErrorCode::ConfigurationError => HttpErrorCode::ConfigurationError, + latest::http::types::ErrorCode::InternalError(e) => HttpErrorCode::InternalError(e), + } + } +} + +impl From for latest::http::types::ErrorCode { + fn from(e: HttpErrorCode) -> Self { + match e { + HttpErrorCode::DnsTimeout => latest::http::types::ErrorCode::DnsTimeout, + HttpErrorCode::DnsError(e) => latest::http::types::ErrorCode::DnsError(e.into()), + HttpErrorCode::DestinationNotFound => { + latest::http::types::ErrorCode::DestinationNotFound + } + HttpErrorCode::DestinationUnavailable => { + latest::http::types::ErrorCode::DestinationUnavailable + } + HttpErrorCode::DestinationIpProhibited => { + latest::http::types::ErrorCode::DestinationIpProhibited + } + HttpErrorCode::DestinationIpUnroutable => { + latest::http::types::ErrorCode::DestinationIpUnroutable + } + HttpErrorCode::ConnectionRefused => latest::http::types::ErrorCode::ConnectionRefused, + HttpErrorCode::ConnectionTerminated => { + latest::http::types::ErrorCode::ConnectionTerminated + } + HttpErrorCode::ConnectionTimeout => latest::http::types::ErrorCode::ConnectionTimeout, + HttpErrorCode::ConnectionReadTimeout => { + latest::http::types::ErrorCode::ConnectionReadTimeout + } + HttpErrorCode::ConnectionWriteTimeout => { + latest::http::types::ErrorCode::ConnectionWriteTimeout + } + HttpErrorCode::ConnectionLimitReached => { + latest::http::types::ErrorCode::ConnectionLimitReached + } + HttpErrorCode::TlsProtocolError => latest::http::types::ErrorCode::TlsProtocolError, + HttpErrorCode::TlsCertificateError => { + latest::http::types::ErrorCode::TlsCertificateError + } + HttpErrorCode::TlsAlertReceived(e) => { + latest::http::types::ErrorCode::TlsAlertReceived(e.into()) + } + HttpErrorCode::HttpRequestDenied => latest::http::types::ErrorCode::HttpRequestDenied, + HttpErrorCode::HttpRequestLengthRequired => { + latest::http::types::ErrorCode::HttpRequestLengthRequired + } + HttpErrorCode::HttpRequestBodySize(e) => { + latest::http::types::ErrorCode::HttpRequestBodySize(e) + } + HttpErrorCode::HttpRequestMethodInvalid => { + latest::http::types::ErrorCode::HttpRequestMethodInvalid + } + HttpErrorCode::HttpRequestUriInvalid => { + latest::http::types::ErrorCode::HttpRequestUriInvalid + } + HttpErrorCode::HttpRequestUriTooLong => { + latest::http::types::ErrorCode::HttpRequestUriTooLong + } + HttpErrorCode::HttpRequestHeaderSectionSize(e) => { + latest::http::types::ErrorCode::HttpRequestHeaderSectionSize(e) + } + HttpErrorCode::HttpRequestHeaderSize(e) => { + latest::http::types::ErrorCode::HttpRequestHeaderSize(e.map(|e| e.into())) + } + HttpErrorCode::HttpRequestTrailerSectionSize(e) => { + latest::http::types::ErrorCode::HttpRequestTrailerSectionSize(e) + } + HttpErrorCode::HttpRequestTrailerSize(e) => { + latest::http::types::ErrorCode::HttpRequestTrailerSize(e.into()) + } + HttpErrorCode::HttpResponseIncomplete => { + latest::http::types::ErrorCode::HttpResponseIncomplete + } + HttpErrorCode::HttpResponseHeaderSectionSize(e) => { + latest::http::types::ErrorCode::HttpResponseHeaderSectionSize(e) + } + HttpErrorCode::HttpResponseHeaderSize(e) => { + latest::http::types::ErrorCode::HttpResponseHeaderSize(e.into()) + } + HttpErrorCode::HttpResponseBodySize(e) => { + latest::http::types::ErrorCode::HttpResponseBodySize(e) + } + HttpErrorCode::HttpResponseTrailerSectionSize(e) => { + latest::http::types::ErrorCode::HttpResponseTrailerSectionSize(e) + } + HttpErrorCode::HttpResponseTrailerSize(e) => { + latest::http::types::ErrorCode::HttpResponseTrailerSize(e.into()) + } + HttpErrorCode::HttpResponseTransferCoding(e) => { + latest::http::types::ErrorCode::HttpResponseTransferCoding(e) + } + HttpErrorCode::HttpResponseContentCoding(e) => { + latest::http::types::ErrorCode::HttpResponseContentCoding(e) + } + HttpErrorCode::HttpResponseTimeout => { + latest::http::types::ErrorCode::HttpResponseTimeout + } + HttpErrorCode::HttpUpgradeFailed => latest::http::types::ErrorCode::HttpUpgradeFailed, + HttpErrorCode::HttpProtocolError => latest::http::types::ErrorCode::HttpProtocolError, + HttpErrorCode::LoopDetected => latest::http::types::ErrorCode::LoopDetected, + HttpErrorCode::ConfigurationError => latest::http::types::ErrorCode::ConfigurationError, + HttpErrorCode::InternalError(e) => latest::http::types::ErrorCode::InternalError(e), + } + } +} diff --git a/crates/e2e-testing/Cargo.toml b/crates/e2e-testing/Cargo.toml index de23d7f78..eeabd56b5 100644 --- a/crates/e2e-testing/Cargo.toml +++ b/crates/e2e-testing/Cargo.toml @@ -16,5 +16,6 @@ reqwest = { version = "0.11", features = ["blocking"] } nix = "0.26.1" url = "2.2.2" derive_builder = "0.12.0" -hyper-tls = "0.5.0" +hyper-tls = "0.6.0" tempfile = "3.3.0" +http = "1.0.0" diff --git a/crates/e2e-testing/src/http_asserts.rs b/crates/e2e-testing/src/http_asserts.rs index 0ca62636c..707e003e5 100644 --- a/crates/e2e-testing/src/http_asserts.rs +++ b/crates/e2e-testing/src/http_asserts.rs @@ -1,6 +1,7 @@ use crate::ensure_eq; use anyhow::Result; -use reqwest::{Method, Request, Response}; +use http::Method; +use reqwest::{Request, Response}; use std::str; use std::thread::sleep; use std::time::Duration; @@ -99,7 +100,14 @@ pub async fn assert_http_response_once( } pub async fn create_request(method: Method, url: &str, body: &str) -> Result { - let mut req = reqwest::Request::new(method, url.try_into()?); + let mut req = reqwest::Request::new( + match method { + Method::GET => reqwest::Method::GET, + Method::POST => reqwest::Method::POST, + _ => todo!("handle {method}"), + }, + url.try_into()?, + ); *req.body_mut() = Some(body.to_owned().into()); Ok(req) diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 3d43417c0..1a3256561 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -6,7 +6,7 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" -http = "0.2" +http = "1.0.0" hyper = { workspace = true } http-body-util = { workspace = true } wasmtime-wasi-http = { workspace = true, optional = true } diff --git a/crates/testing/Cargo.toml b/crates/testing/Cargo.toml index 6717ceb67..e6ba33bac 100644 --- a/crates/testing/Cargo.toml +++ b/crates/testing/Cargo.toml @@ -6,8 +6,8 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" -http = "0.2" -hyper = "0.14" +http = "1.0.0" +hyper = "1.0.0" serde = "1.0.188" serde_json = "1" spin-app = { path = "../app" } diff --git a/crates/trigger-http/Cargo.toml b/crates/trigger-http/Cargo.toml index b97181c57..a5c79301a 100644 --- a/crates/trigger-http/Cargo.toml +++ b/crates/trigger-http/Cargo.toml @@ -13,8 +13,9 @@ async-trait = "0.1" clap = "3" futures = "0.3" futures-util = "0.3.8" -http = "0.2" +http = "1.0.0" hyper = { workspace = true } +hyper-util = { version = "0.1.2", features = ["tokio"] } http-body-util = { workspace = true } indexmap = "1" outbound-http = { path = "../outbound-http" } diff --git a/crates/trigger-http/src/handler.rs b/crates/trigger-http/src/handler.rs index b0667d733..08fc6ce98 100644 --- a/crates/trigger-http/src/handler.rs +++ b/crates/trigger-http/src/handler.rs @@ -10,6 +10,7 @@ use hyper::{Request, Response}; use outbound_http::OutboundHttpComponent; use spin_core::async_trait; use spin_core::wasi_2023_10_18::exports::wasi::http::incoming_handler::IncomingHandler as IncomingHandler2023_10_18; +use spin_core::wasi_2023_11_10::exports::wasi::http::incoming_handler::IncomingHandler as IncomingHandler2023_11_10; use spin_core::Instance; use spin_http::body; use spin_trigger::{EitherInstance, TriggerAppEngine}; @@ -45,7 +46,9 @@ impl HttpExecutor for HttpHandlerExecutor { set_http_origin_from_request(&mut store, engine, &req); let resp = match HandlerType::from_exports(instance.exports(&mut store)) { - Some(HandlerType::Wasi) => Self::execute_wasi(store, instance, base, raw_route, req, client_addr).await?, + Some(HandlerType::Wasi) => { + Self::execute_wasi(store, instance, base, raw_route, req, client_addr).await? + } Some(HandlerType::Spin) => { Self::execute_spin(store, instance, base, raw_route, req, client_addr) .await @@ -53,8 +56,9 @@ impl HttpExecutor for HttpHandlerExecutor { } None => bail!( "Expected component to either export `{WASI_HTTP_EXPORT_2023_10_18}`, \ - `{WASI_HTTP_EXPORT_2023_11_10}`, or `fermyon:spin/inbound-http` but it exported neither" - ) + `{WASI_HTTP_EXPORT_2023_11_10}`, `{WASI_HTTP_EXPORT_2023_12_05}`, \ + or `fermyon:spin/inbound-http` but it exported none of those" + ), }; tracing::info!( @@ -176,6 +180,7 @@ impl HttpHandlerExecutor { enum Handler { Latest(Proxy), + Handler2023_11_10(IncomingHandler2023_11_10), Handler2023_10_18(IncomingHandler2023_10_18), } @@ -188,6 +193,18 @@ impl HttpHandlerExecutor { )?)), None => None, }; + let handler = match handler { + Some(handler) => Some(handler), + None => match instance + .exports(&mut store) + .instance("wasi:http/incoming-handler@0.2.0-rc-2023-11-10") + { + Some(mut instance) => Some(Handler::Handler2023_11_10( + IncomingHandler2023_11_10::new(&mut instance)?, + )), + None => None, + }, + }; let handler = match handler { Some(handler) => handler, None => Handler::Latest(Proxy::new(&mut store, &instance)?), @@ -204,6 +221,9 @@ impl HttpHandlerExecutor { Handler::Handler2023_10_18(proxy) => { proxy.call_handle(&mut store, request, response).await } + Handler::Handler2023_11_10(proxy) => { + proxy.call_handle(&mut store, request, response).await + } }; tracing::trace!( @@ -307,12 +327,14 @@ enum HandlerType { const WASI_HTTP_EXPORT_2023_10_18: &str = "wasi:http/incoming-handler@0.2.0-rc-2023-10-18"; const WASI_HTTP_EXPORT_2023_11_10: &str = "wasi:http/incoming-handler@0.2.0-rc-2023-11-10"; +const WASI_HTTP_EXPORT_2023_12_05: &str = "wasi:http/incoming-handler@0.2.0-rc-2023-12-05"; impl HandlerType { /// Determine the handler type from the exports fn from_exports(mut exports: wasmtime::component::Exports<'_>) -> Option { if exports.instance(WASI_HTTP_EXPORT_2023_10_18).is_some() || exports.instance(WASI_HTTP_EXPORT_2023_11_10).is_some() + || exports.instance(WASI_HTTP_EXPORT_2023_12_05).is_some() { return Some(HandlerType::Wasi); } diff --git a/crates/trigger-http/src/lib.rs b/crates/trigger-http/src/lib.rs index f898d40a8..ddabf57af 100644 --- a/crates/trigger-http/src/lib.rs +++ b/crates/trigger-http/src/lib.rs @@ -22,6 +22,7 @@ use hyper::{ service::service_fn, Request, Response, }; +use hyper_util::rt::tokio::TokioIo; use spin_app::{AppComponent, APP_DESCRIPTION_KEY}; use spin_core::{Engine, OutboundWasiHttpHandler}; use spin_http::{ @@ -295,7 +296,7 @@ impl HttpTrigger { if let Err(e) = http1::Builder::new() .keep_alive(true) .serve_connection( - stream, + TokioIo::new(stream), service_fn(move |request| { let self_ = self_.clone(); async move { diff --git a/crates/trigger/src/lib.rs b/crates/trigger/src/lib.rs index 989e7541a..83897e16b 100644 --- a/crates/trigger/src/lib.rs +++ b/crates/trigger/src/lib.rs @@ -111,8 +111,14 @@ impl TriggerExecutorBuilder { let mut builder = Engine::builder(&self.config)?; if !self.disable_default_host_components { + // Wasmtime 16 and 17: WASI@0.2.0-rc-2023-12-05 AKA WASI@0.2.0 + builder.link_import(|l, _| { + wasmtime_wasi::preview2::command::add_to_linker(l)?; + wasmtime_wasi_http::proxy::add_only_http_to_linker(l) + })?; + // Wasmtime 15: WASI@0.2.0-rc-2023-11-10 - builder.link_import(|l, _| wasmtime_wasi_http::proxy::add_to_linker(l))?; + builder.link_import(|l, _| spin_core::wasi_2023_11_10::add_to_linker(l))?; // Wasmtime 14: WASI@0.2.0-rc-2023-10-18 builder.link_import(|l, _| spin_core::wasi_2023_10_18::add_to_linker(l))?; diff --git a/e2e-tests-aarch64.Dockerfile b/e2e-tests-aarch64.Dockerfile index c59946f40..4c2fc7134 100644 --- a/e2e-tests-aarch64.Dockerfile +++ b/e2e-tests-aarch64.Dockerfile @@ -36,7 +36,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN url="https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init"; \ wget "$url"; \ chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --default-toolchain 1.71 --default-host aarch64-unknown-linux-gnu; \ + ./rustup-init -y --no-modify-path --default-toolchain 1.73 --default-host aarch64-unknown-linux-gnu; \ rm rustup-init; \ chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ rustup --version; \ diff --git a/e2e-tests.Dockerfile b/e2e-tests.Dockerfile index 3825d45d8..ba9d86350 100644 --- a/e2e-tests.Dockerfile +++ b/e2e-tests.Dockerfile @@ -38,7 +38,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \ wget "$url"; \ chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --default-toolchain 1.71 --default-host x86_64-unknown-linux-gnu; \ + ./rustup-init -y --no-modify-path --default-toolchain 1.73 --default-host x86_64-unknown-linux-gnu; \ rm rustup-init; \ chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ rustup --version; \ diff --git a/examples/spin-timer/Cargo.lock b/examples/spin-timer/Cargo.lock index 3641edf92..c4569eeeb 100644 --- a/examples/spin-timer/Cargo.lock +++ b/examples/spin-timer/Cargo.lock @@ -618,18 +618,16 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb38f2af690b5a4411d9a8782b6d77dabff3ca939e0518453ab9f9a4392d41" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39526c036b92912417e8931f52c1e235796688068d3efdbbd8b164f299d19156" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "bumpalo", "cranelift-bforest", @@ -648,33 +646,29 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb0deedc9fccf2db53a5a3c9c9d0163e44143b0d004dca9bf6ab6a0024cd79a" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea2d1b274e45aa8e61e9103efa1ba82d4b5a19d12bd1fd10744c3b7380ba3ff" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "cranelift-control" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea5977559a71e63db79a263f0e81a89b996e8a38212c4281e37dd1dbaa8b65c" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f871ada808b58158d84dfc43a6a2e2d2756baaf4ed1c51fd969ca8330e6ca5c" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "serde", "serde_derive", @@ -682,9 +676,8 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e6890f587ef59824b3debe577e68fdf9b307b3808c54b8d93a18fd0b70941b" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "log", @@ -694,15 +687,13 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5fc6d5d3b52d1917002b17a8ecce448c2621b5bf394bb4e77e2f676893537" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "cranelift-native" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e10c2e7faa65d4ae7de9a83b44f2c31aca7dc638e17d0a79572fdf8103d720b" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "libc", @@ -711,9 +702,8 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2755807efc7ec80d1cc0b6815e70f10cedf968889f0469091dbff9c5c0741c48" +version = "0.104.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -721,7 +711,7 @@ dependencies = [ "itertools 0.10.5", "log", "smallvec", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-types", ] @@ -1423,7 +1413,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util 0.7.9", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "991910e35c615d8cab86b5ab04be67e6ad24d2bf5f4f11fdbbed26da999bbeab" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", "indexmap 2.1.0", "slab", "tokio", @@ -1519,6 +1528,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1526,30 +1546,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0-rc.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951dfc2e32ac02d67c90c0d65bd27009a635dc9b381a2cc7d284ab01e3a0150d" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http", + "http 1.0.0", ] [[package]] name = "http-body-util" -version = "0.1.0-rc.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92445bc9cc14bfa0a3ce56817dc3b5bcc227a168781a356b702410789cec0d10" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", "futures-util", - "http", - "http-body 1.0.0-rc.2", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1595,8 +1615,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body 0.4.5", "httparse", "httpdate", @@ -1611,23 +1631,21 @@ dependencies = [ [[package]] name = "hyper" -version = "1.0.0-rc.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75264b2003a3913f118d35c586e535293b3e22e41f074930762929d071e092" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http", - "http-body 1.0.0-rc.2", + "h2 0.4.1", + "http 1.0.0", + "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", "tokio", - "tracing", "want", ] @@ -1638,7 +1656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper 0.14.27", "log", "rustls", @@ -1909,7 +1927,7 @@ dependencies = [ "bytes", "fallible-iterator 0.3.0", "futures", - "http", + "http 0.2.9", "hyper 0.14.27", "hyper-rustls", "libsql-sqlite3-parser", @@ -2529,7 +2547,7 @@ name = "outbound-http" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", + "http 0.2.9", "reqwest", "spin-app", "spin-core", @@ -3086,8 +3104,8 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body 0.4.5", "hyper 0.14.27", "hyper-rustls", @@ -3178,7 +3196,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "http", + "http 0.2.9", "reqwest", "rustify_derive", "serde", @@ -3620,6 +3638,7 @@ dependencies = [ "anyhow", "async-trait", "bytes", + "cap-primitives", "cap-std", "crossbeam-channel", "io-extras", @@ -3704,7 +3723,7 @@ name = "spin-llm-remote-http" version = "2.2.0-pre0" dependencies = [ "anyhow", - "http", + "http 0.2.9", "llm", "reqwest", "serde", @@ -4572,7 +4591,7 @@ dependencies = [ "async-trait", "bytes", "derive_builder 0.11.2", - "http", + "http 0.2.9", "reqwest", "rustify", "rustify_derive", @@ -4634,9 +4653,8 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasi-cap-std-sync" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3542b8d238a3de6c9986218af842f1e8f950ca7c4707aee9d0dd83002577a759" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -4652,14 +4670,13 @@ dependencies = [ "system-interface", "tracing", "wasi-common", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-common" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a362c9dbdc5eb0809ce9db09e7b76805fea3ddaf2b8ff41a0e5c805935736205" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "bitflags 2.4.1", @@ -4672,14 +4689,13 @@ dependencies = [ "tracing", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasi-tokio" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385503c0e4502dc5cbd7fdfe25f2d87a5dd19dd1cdd7e3bc5184146713bba554" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cap-std", @@ -4769,18 +4785,18 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.36.2" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822b645bf4f2446b949776ffca47e2af60b167209ffb70814ef8779d299cd421" +checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" dependencies = [ "leb128", ] [[package]] name = "wasm-encoder" -version = "0.38.1" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" +checksum = "111495d6204760238512f57a9af162f45086504da332af210f2f75dd80b34f1d" dependencies = [ "leb128", ] @@ -4826,9 +4842,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.116.1" +version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ "indexmap 2.1.0", "semver", @@ -4836,29 +4852,29 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.118.1" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" +checksum = "8c35daf77afb4f9b14016625144a391085ec2ca99ca9cc53ed291bb53ab5278d" dependencies = [ + "bitflags 2.4.1", "indexmap 2.1.0", "semver", ] [[package]] name = "wasmprinter" -version = "0.2.74" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a7a046e6636d25c06a5df00bdc34e02f9e6e0e8a356d738299b961a6126114" +checksum = "cac2a7745372074e5573e365e17100f5a26058740576313784ef03fb900ea8d2" dependencies = [ "anyhow", - "wasmparser 0.118.1", + "wasmparser 0.119.0", ] [[package]] name = "wasmtime" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4b1702ef55144d6f594085f4989dc71fb71a791be1c8354ecc8e489b81199b" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -4873,14 +4889,13 @@ dependencies = [ "object 0.32.1", "once_cell", "paste", - "psm", "rayon", "serde", "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmtime-cache", "wasmtime-component-macro", "wasmtime-component-util", @@ -4891,23 +4906,21 @@ dependencies = [ "wasmtime-runtime", "wasmtime-winch", "wat", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-asm-macros" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c981d0e87bb3e98e08e76644e7ae5dfdef7f1d4105145853f3d677bb4535d65f" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7ba8adaa84fdb9dd659275edcf7fc5282c44b9c9f829986c71d44fd52ea80a" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "base64 0.21.4", @@ -4919,15 +4932,14 @@ dependencies = [ "serde_derive", "sha2", "toml 0.5.11", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "wasmtime-component-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91dcbbd0e1f094351d1ae0e53463c63ba53ec8f8e0e21d17567c1979a8c3758" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "proc-macro2", @@ -4940,15 +4952,13 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e85f1319a7ed36aa59446ab7e967d0c2fb0cd179bf56913633190b44572023e" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "wasmtime-cranelift" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1453665878e16245b9a25405e550c4a36c6731c6e34ea804edc002a38c3e6741" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cfg-if", @@ -4963,7 +4973,7 @@ dependencies = [ "object 0.32.1", "target-lexicon", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "wasmtime-versioned-export-macros", @@ -4971,9 +4981,8 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dface3d9b72b4670781ff72675eabb291e2836b5dded6bb312b577d2bb561f" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", @@ -4987,9 +4996,8 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0116108e7d231cce15fe7dd642c66c3abb14dbcf169b0130e11f223ce8d1ad7" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-entity", @@ -5001,8 +5009,8 @@ dependencies = [ "serde_derive", "target-lexicon", "thiserror", - "wasm-encoder 0.36.2", - "wasmparser 0.116.1", + "wasm-encoder 0.38.1", + "wasmparser 0.118.1", "wasmprinter", "wasmtime-component-util", "wasmtime-types", @@ -5010,9 +5018,8 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a5896355c37bf0f9feb4f1299142ef4bed8c92576aa3a41d150fed0cafa056" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cc", @@ -5020,14 +5027,13 @@ dependencies = [ "rustix 0.38.25", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32b210767452f6b20157bb7c7d98295b92cc47aaad2a8aa31652f4469813a5d" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "addr2line 0.21.0", "anyhow", @@ -5047,14 +5053,13 @@ dependencies = [ "wasmtime-jit-debug", "wasmtime-jit-icache-coherence", "wasmtime-runtime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-jit-debug" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffd2785a16c55ac77565613ebda625f5850d4014af0499df750e8de97c04547" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "object 0.32.1", "once_cell", @@ -5064,20 +5069,18 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73ad1395eda136baec5ece7e079e0536a82ef73488e345456cc9b89858ad0ec" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cfg-if", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-runtime" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b50f7f3c1a8dabb2607f32a81242917bd77cee75f3dec66e04b02ccbb8ba07" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cc", @@ -5090,37 +5093,35 @@ dependencies = [ "memfd", "memoffset", "paste", - "rand 0.8.5", + "psm", "rustix 0.38.25", "sptr", - "wasm-encoder 0.36.2", + "wasm-encoder 0.38.1", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-fiber", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", "wasmtime-wmemcheck", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-types" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447973db3dc5c24db14130ab0922795c58790aec296d198ad9d253b82ec67471" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "cranelift-entity", "serde", "serde_derive", "thiserror", - "wasmparser 0.116.1", + "wasmparser 0.118.1", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a347bb8ecf12275fb180afb1b1c85c9e186553c43109737bffed4f54c2aa365" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "proc-macro2", "quote", @@ -5129,9 +5130,8 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f94342fc932695027cdfa0500a62a680879bdad495b36490887b1564124e53" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -5160,23 +5160,22 @@ dependencies = [ "wasi-tokio", "wasmtime", "wiggle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "wasmtime-wasi-http" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531b30bd168aa46cca77a678daaab99ed9bda5e70750aa6f638f3b05188d2047" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", "bytes", "futures", - "http", - "http-body 1.0.0-rc.2", + "http 1.0.0", + "http-body 1.0.0", "http-body-util", - "hyper 1.0.0-rc.3", + "hyper 1.1.0", "rustls", "tokio", "tokio-rustls", @@ -5188,16 +5187,15 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8c602f026526d754c33b750f67d754234c6ec29595865916693c3306ca6a3b" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", "gimli 0.28.0", "object 0.32.1", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-cranelift-shared", "wasmtime-environ", "winch-codegen", @@ -5205,9 +5203,8 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41786c7bbbf250c0e685b291323b50c6bb65f0505a2c0b4f0b598c740f13f185" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "heck", @@ -5217,9 +5214,8 @@ dependencies = [ [[package]] name = "wasmtime-wmemcheck" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47907bdd67500c66fa308acbce7387c7bfb63b5505ef81be7fc897709afcca60" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" [[package]] name = "wast" @@ -5232,23 +5228,23 @@ dependencies = [ [[package]] name = "wast" -version = "69.0.0" +version = "70.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa51b5ad1391943d1bfad537e50f28fe938199ee76b115be6bae83802cd5185" +checksum = "2ee4bc54bbe1c6924160b9f75e374a1d07532e7580eb632c0ee6cdd109bb217e" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.38.1", + "wasm-encoder 0.39.0", ] [[package]] name = "wat" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4c2488d058326466e086a43f5d4ea448241a8d0975e3eb0642c0828be1eb3" +checksum = "9f0dce8cdc288c717cf01e461a1e451a7b8445d53451123536ba576e423a101a" dependencies = [ - "wast 69.0.0", + "wast 70.0.0", ] [[package]] @@ -5288,9 +5284,8 @@ dependencies = [ [[package]] name = "wiggle" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b5a36af7e0a7d68fd6c080e78803b34c3105caa3f743dff2fc8db2fac4ab71" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "async-trait", @@ -5303,9 +5298,8 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f5a763e4801e83c438e7fa6abdd5c38d735194c2a94e2f2ccdcc66456cefee" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "heck", @@ -5318,9 +5312,8 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58262f5ac3a8ea686d4b940aa9f976f26c7e4e980aa8ac378f29274cb8638e33" +version = "17.0.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "proc-macro2", "quote", @@ -5361,9 +5354,8 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9057ea325cac1ec02b28418da975a9f3a3634611812dc6150401347f1774844e" +version = "0.15.0" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "cranelift-codegen", @@ -5371,7 +5363,7 @@ dependencies = [ "regalloc2", "smallvec", "target-lexicon", - "wasmparser 0.116.1", + "wasmparser 0.118.1", "wasmtime-environ", ] @@ -5408,6 +5400,15 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -5438,6 +5439,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -5450,6 +5466,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -5462,6 +5484,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -5474,6 +5502,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5486,6 +5520,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5498,6 +5538,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -5510,6 +5556,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -5522,6 +5574,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winnow" version = "0.5.16" @@ -5607,8 +5665,7 @@ dependencies = [ [[package]] name = "witx" version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e366f27a5cabcddb2706a78296a40b8fcc451e1a6aba2fc1d94b4a01bdaaef4b" +source = "git+https://github.com/bytecodealliance/wasmtime?branch=release-17.0.0#2c9160acc0d4aa4456d2cd32e46f9058ebbeaf71" dependencies = [ "anyhow", "log", diff --git a/examples/spin-timer/Cargo.toml b/examples/spin-timer/Cargo.toml index 8c272a886..437566fc5 100644 --- a/examples/spin-timer/Cargo.toml +++ b/examples/spin-timer/Cargo.toml @@ -14,6 +14,6 @@ spin-core = { path = "../../crates/core" } spin-trigger = { path = "../../crates/trigger" } tokio = { version = "1.11", features = ["full"] } tokio-scoped = "0.2.0" -wasmtime = { version = "15.0.0", features = ["component-model"] } +wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", branch = "release-17.0.0", features = ["component-model"] } [workspace] diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/src/lib.rs b/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/src/lib.rs index 12066a59f..19e248e23 100644 --- a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/src/lib.rs +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/src/lib.rs @@ -1,5 +1,5 @@ wit_bindgen::generate!({ - path: "wit", + path: "../../../wit-2023-11-10", world: "wasi:http/proxy@0.2.0-rc-2023-11-10", exports: { "wasi:http/incoming-handler": Component @@ -61,7 +61,7 @@ impl incoming_handler::Guest for Component { let incoming_body = response.consume().unwrap(); let incoming_stream = incoming_body.stream().unwrap(); let status = response.status(); - let response = OutgoingResponse::new(response.headers()); + let response = OutgoingResponse::new(response.headers().clone()); response.set_status_code(status).unwrap(); let outgoing_body = response.body().unwrap(); { diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/.cargo/config.toml b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/.cargo/config.toml new file mode 100644 index 000000000..6b77899cb --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/.cargo/config.toml @@ -0,0 +1,2 @@ +[build] +target = "wasm32-wasi" diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.lock b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.lock new file mode 100644 index 000000000..f40527e13 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.lock @@ -0,0 +1,370 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "hashbrown" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "id-arena" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown", + "serde", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "serde" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.189" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "spdx" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19b32ed6d899ab23174302ff105c1577e45a06b08d4fe0a9dd13ce804bbbf71" +dependencies = [ + "smallvec", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "wasi-http-rust-rc-2023-12-05" +version = "0.1.0" +dependencies = [ + "url", + "wit-bindgen", +] + +[[package]] +name = "wasm-encoder" +version = "0.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-metadata" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d835d67708f6374937c550ad8dd1d17c616ae009e3f00d7a0ac9f7825e78c36a" +dependencies = [ + "anyhow", + "indexmap", + "serde", + "serde_derive", + "serde_json", + "spdx", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.118.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" +dependencies = [ + "indexmap", + "semver", +] + +[[package]] +name = "wit-bindgen" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b76f1d099678b4f69402a421e888bbe71bf20320c2f3f3565d0e7484dbe5bc20" +dependencies = [ + "bitflags", + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75d55e1a488af2981fb0edac80d8d20a51ac36897a1bdef4abde33c29c1b6d0d" +dependencies = [ + "anyhow", + "wit-component", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01ff9cae7bf5736750d94d91eb8a49f5e3a04aff1d1a3218287d9b2964510f8" +dependencies = [ + "anyhow", + "heck", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804a98e2538393d47aa7da65a7348116d6ff403b426665152b70a168c0146d49" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", + "wit-component", +] + +[[package]] +name = "wit-component" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a35a2a9992898c9d27f1664001860595a4bc99d32dd3599d547412e17d7e2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15df6b7b28ce94b8be39d8df5cb21a08a4f3b9f33b631aedb4aa5776f785ead3" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", +] diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.toml b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.toml new file mode 100644 index 000000000..be3fd90a8 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "wasi-http-rust-rc-2023-12-05" +version = "0.1.0" +edition = "2021" + +[lib] +crate-type = ["cdylib"] + +[dependencies] +url = "2.4.0" +wit-bindgen = "0.16.0" + +[workspace] diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/README.md b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/README.md new file mode 100644 index 000000000..ed0eb58a9 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/README.md @@ -0,0 +1,8 @@ +The `wasi_snapshot_preview1.reactor.wasm` file in this directory was retrieved +using: + +``` +curl -LO https://github.com/bytecodealliance/wasmtime/releases/download/v15.0.1/wasi_snapshot_preview1.reactor.wasm +``` + +The `wit` directory was copied from https://github.com/bytecodealliance/wasmtime/tree/v15.0.1/crates/wasi/wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/spin.toml b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/spin.toml new file mode 100644 index 000000000..041642ba1 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/spin.toml @@ -0,0 +1,18 @@ +spin_manifest_version = 2 + +[application] +authors = ["Fermyon Engineering "] +description = "Test using wasi:http/incoming-handler@0.2.0-rc-2023-12-05." +name = "wasi-http" +version = "1.0.0" + +[[trigger.http]] +route = "/..." +component = "wasi-http" + +[component.wasi-http] +source = "target/wasm32-wasi/release/wasi_http_rust_rc_2023_12_05.component.wasm" +allowed_outbound_hosts = ["http://*:*", "https://*:*"] +[component.wasi-http.build] +command = "cargo build --target wasm32-wasi --release && wasm-tools component new --adapt wasi_snapshot_preview1.reactor.wasm target/wasm32-wasi/release/wasi_http_rust_rc_2023_12_05.wasm -o target/wasm32-wasi/release/wasi_http_rust_rc_2023_12_05.component.wasm" +watch = ["src/**/*.rs", "Cargo.toml"] diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/src/lib.rs b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/src/lib.rs new file mode 100644 index 000000000..37406e286 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/src/lib.rs @@ -0,0 +1,99 @@ +wit_bindgen::generate!({ + path: "wit", + world: "wasi:http/proxy@0.2.0-rc-2023-12-05", + exports: { + "wasi:http/incoming-handler": Component + } +}); + +use { + exports::wasi::http::incoming_handler, + url::Url, + wasi::{ + http::{ + outgoing_handler, + types::{ + Headers, IncomingRequest, Method, OutgoingBody, OutgoingRequest, OutgoingResponse, + ResponseOutparam, Scheme, + }, + }, + io::streams::StreamError, + }, +}; + +struct Component; + +impl incoming_handler::Guest for Component { + fn handle(request: IncomingRequest, outparam: ResponseOutparam) { + let headers = request.headers().entries(); + + if let Some(url) = headers.iter().find_map(|(k, v)| { + (k == "url") + .then_some(v) + .and_then(|v| std::str::from_utf8(v).ok()) + .and_then(|v| Url::parse(v).ok()) + }) { + let outgoing_request = OutgoingRequest::new(Headers::new()); + outgoing_request.set_method(&Method::Get).unwrap(); + outgoing_request + .set_path_with_query(Some(url.path())) + .unwrap(); + outgoing_request + .set_scheme(Some(&match url.scheme() { + "http" => Scheme::Http, + "https" => Scheme::Https, + scheme => Scheme::Other(scheme.into()), + })) + .unwrap(); + outgoing_request + .set_authority(Some(url.authority())) + .unwrap(); + + let response = outgoing_handler::handle(outgoing_request, None).unwrap(); + let response = loop { + if let Some(response) = response.get() { + break response.unwrap().unwrap(); + } else { + response.subscribe().block() + } + }; + + let incoming_body = response.consume().unwrap(); + let incoming_stream = incoming_body.stream().unwrap(); + let status = response.status(); + let response = OutgoingResponse::new(response.headers().clone()); + response.set_status_code(status).unwrap(); + let outgoing_body = response.body().unwrap(); + { + let outgoing_stream = outgoing_body.write().unwrap(); + ResponseOutparam::set(outparam, Ok(response)); + + loop { + match incoming_stream.read(1024) { + Ok(buffer) => { + if buffer.is_empty() { + incoming_stream.subscribe().block(); + } else { + outgoing_stream.blocking_write_and_flush(&buffer).unwrap(); + } + } + Err(StreamError::Closed) => break, + Err(StreamError::LastOperationFailed(error)) => { + panic!("{}", error.to_debug_string()) + } + } + } + } + + OutgoingBody::finish(outgoing_body, None).unwrap(); + } else { + let response = OutgoingResponse::new(Headers::new()); + response.set_status_code(400).unwrap(); + let body = response.body().unwrap(); + + ResponseOutparam::set(outparam, Ok(response)); + + OutgoingBody::finish(body, None).unwrap(); + } + } +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wasi_snapshot_preview1.reactor.wasm b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wasi_snapshot_preview1.reactor.wasm new file mode 100644 index 000000000..7147590ee Binary files /dev/null and b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wasi_snapshot_preview1.reactor.wasm differ diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/command-extended.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/command-extended.wit new file mode 100644 index 000000000..16f01bc23 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/command-extended.wit @@ -0,0 +1,6 @@ +// All of the same imports and exports available in the wasi:cli/command world +// with addition of HTTP proxy related imports: +world command-extended { + include wasi:cli/command@0.2.0-rc-2023-12-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-12-05; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/command.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/command.wit new file mode 100644 index 000000000..cc82ae5dc --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/command.wit @@ -0,0 +1,7 @@ +package wasi:cli@0.2.0-rc-2023-12-05; + +world command { + include imports; + + export run; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/environment.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/environment.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/environment.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/environment.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/exit.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/exit.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/exit.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/exit.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/imports.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/imports.wit new file mode 100644 index 000000000..9965ea35e --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/imports.wit @@ -0,0 +1,20 @@ +package wasi:cli@0.2.0-rc-2023-12-05; + +world imports { + include wasi:clocks/imports@0.2.0-rc-2023-11-10; + include wasi:filesystem/imports@0.2.0-rc-2023-11-10; + include wasi:sockets/imports@0.2.0-rc-2023-11-10; + include wasi:random/imports@0.2.0-rc-2023-11-10; + include wasi:io/imports@0.2.0-rc-2023-11-10; + + import environment; + import exit; + import stdin; + import stdout; + import stderr; + import terminal-input; + import terminal-output; + import terminal-stdin; + import terminal-stdout; + import terminal-stderr; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/run.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/run.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/run.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/run.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/stdio.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/stdio.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/stdio.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/stdio.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/terminal.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/terminal.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/terminal.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/cli/terminal.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/monotonic-clock.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/monotonic-clock.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/monotonic-clock.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/monotonic-clock.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/wall-clock.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/wall-clock.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/wall-clock.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/wall-clock.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/world.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/world.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/clocks/world.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/clocks/world.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/preopens.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/preopens.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/preopens.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/preopens.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/types.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/types.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/types.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/types.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/world.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/world.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/filesystem/world.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/filesystem/world.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/handler.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/handler.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/handler.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/handler.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/proxy.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/proxy.wit new file mode 100644 index 000000000..0f466c93c --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/proxy.wit @@ -0,0 +1,32 @@ +package wasi:http@0.2.0-rc-2023-12-05; + +/// The `wasi:http/proxy` world captures a widely-implementable intersection of +/// hosts that includes HTTP forward and reverse proxies. Components targeting +/// this world may concurrently stream in and out any number of incoming and +/// outgoing HTTP requests. +world proxy { + /// HTTP proxies have access to time and randomness. + include wasi:clocks/imports@0.2.0-rc-2023-11-10; + import wasi:random/random@0.2.0-rc-2023-11-10; + + /// Proxies have standard output and error streams which are expected to + /// terminate in a developer-facing console provided by the host. + import wasi:cli/stdout@0.2.0-rc-2023-12-05; + import wasi:cli/stderr@0.2.0-rc-2023-12-05; + + /// TODO: this is a temporary workaround until component tooling is able to + /// gracefully handle the absence of stdin. Hosts must return an eof stream + /// for this import, which is what wasi-libc + tooling will do automatically + /// when this import is properly removed. + import wasi:cli/stdin@0.2.0-rc-2023-12-05; + + /// This is the default handler to use when user code simply wants to make an + /// HTTP request (e.g., via `fetch()`). + import outgoing-handler; + + /// The host delivers incoming HTTP requests to a component by calling the + /// `handle` function of this exported interface. A host may arbitrarily reuse + /// or not reuse component instance when delivering incoming HTTP requests and + /// thus a component must be able to handle 0..N calls to `handle`. + export incoming-handler; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/types.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/types.wit new file mode 100644 index 000000000..0f698e769 --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/http/types.wit @@ -0,0 +1,570 @@ +/// This interface defines all of the types and methods for implementing +/// HTTP Requests and Responses, both incoming and outgoing, as well as +/// their headers, trailers, and bodies. +interface types { + use wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10.{duration}; + use wasi:io/streams@0.2.0-rc-2023-11-10.{input-stream, output-stream}; + use wasi:io/error@0.2.0-rc-2023-11-10.{error as io-error}; + use wasi:io/poll@0.2.0-rc-2023-11-10.{pollable}; + + /// This type corresponds to HTTP standard Methods. + variant method { + get, + head, + post, + put, + delete, + connect, + options, + trace, + patch, + other(string) + } + + /// This type corresponds to HTTP standard Related Schemes. + variant scheme { + HTTP, + HTTPS, + other(string) + } + + /// These cases are inspired by the IANA HTTP Proxy Error Types: + /// https://www.iana.org/assignments/http-proxy-status/http-proxy-status.xhtml#table-http-proxy-error-types + variant error-code { + DNS-timeout, + DNS-error(DNS-error-payload), + destination-not-found, + destination-unavailable, + destination-IP-prohibited, + destination-IP-unroutable, + connection-refused, + connection-terminated, + connection-timeout, + connection-read-timeout, + connection-write-timeout, + connection-limit-reached, + TLS-protocol-error, + TLS-certificate-error, + TLS-alert-received(TLS-alert-received-payload), + HTTP-request-denied, + HTTP-request-length-required, + HTTP-request-body-size(option), + HTTP-request-method-invalid, + HTTP-request-URI-invalid, + HTTP-request-URI-too-long, + HTTP-request-header-section-size(option), + HTTP-request-header-size(option), + HTTP-request-trailer-section-size(option), + HTTP-request-trailer-size(field-size-payload), + HTTP-response-incomplete, + HTTP-response-header-section-size(option), + HTTP-response-header-size(field-size-payload), + HTTP-response-body-size(option), + HTTP-response-trailer-section-size(option), + HTTP-response-trailer-size(field-size-payload), + HTTP-response-transfer-coding(option), + HTTP-response-content-coding(option), + HTTP-response-timeout, + HTTP-upgrade-failed, + HTTP-protocol-error, + loop-detected, + configuration-error, + /// This is a catch-all error for anything that doesn't fit cleanly into a + /// more specific case. It also includes an optional string for an + /// unstructured description of the error. Users should not depend on the + /// string for diagnosing errors, as it's not required to be consistent + /// between implementations. + internal-error(option) + } + + /// Defines the case payload type for `DNS-error` above: + record DNS-error-payload { + rcode: option, + info-code: option + } + + /// Defines the case payload type for `TLS-alert-received` above: + record TLS-alert-received-payload { + alert-id: option, + alert-message: option + } + + /// Defines the case payload type for `HTTP-response-{header,trailer}-size` above: + record field-size-payload { + field-name: option, + field-size: option + } + + /// Attempts to extract a http-related `error` from the wasi:io `error` + /// provided. + /// + /// Stream operations which return + /// `wasi:io/stream/stream-error::last-operation-failed` have a payload of + /// type `wasi:io/error/error` with more information about the operation + /// that failed. This payload can be passed through to this function to see + /// if there's http-related information about the error to return. + /// + /// Note that this function is fallible because not all io-errors are + /// http-related errors. + http-error-code: func(err: borrow) -> option; + + /// This type enumerates the different kinds of errors that may occur when + /// setting or appending to a `fields` resource. + variant header-error { + /// This error indicates that a `field-key` or `field-value` was + /// syntactically invalid when used with an operation that sets headers in a + /// `fields`. + invalid-syntax, + + /// This error indicates that a forbidden `field-key` was used when trying + /// to set a header in a `fields`. + forbidden, + + /// This error indicates that the operation on the `fields` was not + /// permitted because the fields are immutable. + immutable, + } + + /// Field keys are always strings. + type field-key = string; + + /// Field values should always be ASCII strings. However, in + /// reality, HTTP implementations often have to interpret malformed values, + /// so they are provided as a list of bytes. + type field-value = list; + + /// This following block defines the `fields` resource which corresponds to + /// HTTP standard Fields. Fields are a common representation used for both + /// Headers and Trailers. + /// + /// A `fields` may be mutable or immutable. A `fields` created using the + /// constructor, `from-list`, or `clone` will be mutable, but a `fields` + /// resource given by other means (including, but not limited to, + /// `incoming-request.headers`, `outgoing-request.headers`) might be be + /// immutable. In an immutable fields, the `set`, `append`, and `delete` + /// operations will fail with `header-error.immutable`. + resource fields { + + /// Construct an empty HTTP Fields. + /// + /// The resulting `fields` is mutable. + constructor(); + + /// Construct an HTTP Fields. + /// + /// The resulting `fields` is mutable. + /// + /// The list represents each key-value pair in the Fields. Keys + /// which have multiple values are represented by multiple entries in this + /// list with the same key. + /// + /// The tuple is a pair of the field key, represented as a string, and + /// Value, represented as a list of bytes. In a valid Fields, all keys + /// and values are valid UTF-8 strings. However, values are not always + /// well-formed, so they are represented as a raw list of bytes. + /// + /// An error result will be returned if any header or value was + /// syntactically invalid, or if a header was forbidden. + from-list: static func( + entries: list> + ) -> result; + + /// Get all of the values corresponding to a key. If the key is not present + /// in this `fields`, an empty list is returned. However, if the key is + /// present but empty, this is represented by a list with one or more + /// empty field-values present. + get: func(name: field-key) -> list; + + /// Returns `true` when the key is present in this `fields`. If the key is + /// syntactically invalid, `false` is returned. + has: func(name: field-key) -> bool; + + /// Set all of the values for a key. Clears any existing values for that + /// key, if they have been set. + /// + /// Fails with `header-error.immutable` if the `fields` are immutable. + set: func(name: field-key, value: list) -> result<_, header-error>; + + /// Delete all values for a key. Does nothing if no values for the key + /// exist. + /// + /// Fails with `header-error.immutable` if the `fields` are immutable. + delete: func(name: field-key) -> result<_, header-error>; + + /// Append a value for a key. Does not change or delete any existing + /// values for that key. + /// + /// Fails with `header-error.immutable` if the `fields` are immutable. + append: func(name: field-key, value: field-value) -> result<_, header-error>; + + /// Retrieve the full set of keys and values in the Fields. Like the + /// constructor, the list represents each key-value pair. + /// + /// The outer list represents each key-value pair in the Fields. Keys + /// which have multiple values are represented by multiple entries in this + /// list with the same key. + entries: func() -> list>; + + /// Make a deep copy of the Fields. Equivelant in behavior to calling the + /// `fields` constructor on the return value of `entries`. The resulting + /// `fields` is mutable. + clone: func() -> fields; + } + + /// Headers is an alias for Fields. + type headers = fields; + + /// Trailers is an alias for Fields. + type trailers = fields; + + /// Represents an incoming HTTP Request. + resource incoming-request { + + /// Returns the method of the incoming request. + method: func() -> method; + + /// Returns the path with query parameters from the request, as a string. + path-with-query: func() -> option; + + /// Returns the protocol scheme from the request. + scheme: func() -> option; + + /// Returns the authority from the request, if it was present. + authority: func() -> option; + + /// Get the `headers` associated with the request. + /// + /// The returned `headers` resource is immutable: `set`, `append`, and + /// `delete` operations will fail with `header-error.immutable`. + /// + /// The `headers` returned are a child resource: it must be dropped before + /// the parent `incoming-request` is dropped. Dropping this + /// `incoming-request` before all children are dropped will trap. + headers: func() -> headers; + + /// Gives the `incoming-body` associated with this request. Will only + /// return success at most once, and subsequent calls will return error. + consume: func() -> result; + } + + /// Represents an outgoing HTTP Request. + resource outgoing-request { + + /// Construct a new `outgoing-request` with a default `method` of `GET`, and + /// `none` values for `path-with-query`, `scheme`, and `authority`. + /// + /// * `headers` is the HTTP Headers for the Request. + /// + /// It is possible to construct, or manipulate with the accessor functions + /// below, an `outgoing-request` with an invalid combination of `scheme` + /// and `authority`, or `headers` which are not permitted to be sent. + /// It is the obligation of the `outgoing-handler.handle` implementation + /// to reject invalid constructions of `outgoing-request`. + constructor( + headers: headers + ); + + /// Returns the resource corresponding to the outgoing Body for this + /// Request. + /// + /// Returns success on the first call: the `outgoing-body` resource for + /// this `outgoing-request` can be retrieved at most once. Subsequent + /// calls will return error. + body: func() -> result; + + /// Get the Method for the Request. + method: func() -> method; + /// Set the Method for the Request. Fails if the string present in a + /// `method.other` argument is not a syntactically valid method. + set-method: func(method: method) -> result; + + /// Get the combination of the HTTP Path and Query for the Request. + /// When `none`, this represents an empty Path and empty Query. + path-with-query: func() -> option; + /// Set the combination of the HTTP Path and Query for the Request. + /// When `none`, this represents an empty Path and empty Query. Fails is the + /// string given is not a syntactically valid path and query uri component. + set-path-with-query: func(path-with-query: option) -> result; + + /// Get the HTTP Related Scheme for the Request. When `none`, the + /// implementation may choose an appropriate default scheme. + scheme: func() -> option; + /// Set the HTTP Related Scheme for the Request. When `none`, the + /// implementation may choose an appropriate default scheme. Fails if the + /// string given is not a syntactically valid uri scheme. + set-scheme: func(scheme: option) -> result; + + /// Get the HTTP Authority for the Request. A value of `none` may be used + /// with Related Schemes which do not require an Authority. The HTTP and + /// HTTPS schemes always require an authority. + authority: func() -> option; + /// Set the HTTP Authority for the Request. A value of `none` may be used + /// with Related Schemes which do not require an Authority. The HTTP and + /// HTTPS schemes always require an authority. Fails if the string given is + /// not a syntactically valid uri authority. + set-authority: func(authority: option) -> result; + + /// Get the headers associated with the Request. + /// + /// The returned `headers` resource is immutable: `set`, `append`, and + /// `delete` operations will fail with `header-error.immutable`. + /// + /// This headers resource is a child: it must be dropped before the parent + /// `outgoing-request` is dropped, or its ownership is transfered to + /// another component by e.g. `outgoing-handler.handle`. + headers: func() -> headers; + } + + /// Parameters for making an HTTP Request. Each of these parameters is + /// currently an optional timeout applicable to the transport layer of the + /// HTTP protocol. + /// + /// These timeouts are separate from any the user may use to bound a + /// blocking call to `wasi:io/poll.poll`. + resource request-options { + /// Construct a default `request-options` value. + constructor(); + + /// The timeout for the initial connect to the HTTP Server. + connect-timeout: func() -> option; + + /// Set the timeout for the initial connect to the HTTP Server. An error + /// return value indicates that this timeout is not supported. + set-connect-timeout: func(duration: option) -> result; + + /// The timeout for receiving the first byte of the Response body. + first-byte-timeout: func() -> option; + + /// Set the timeout for receiving the first byte of the Response body. An + /// error return value indicates that this timeout is not supported. + set-first-byte-timeout: func(duration: option) -> result; + + /// The timeout for receiving subsequent chunks of bytes in the Response + /// body stream. + between-bytes-timeout: func() -> option; + + /// Set the timeout for receiving subsequent chunks of bytes in the Response + /// body stream. An error return value indicates that this timeout is not + /// supported. + set-between-bytes-timeout: func(duration: option) -> result; + } + + /// Represents the ability to send an HTTP Response. + /// + /// This resource is used by the `wasi:http/incoming-handler` interface to + /// allow a Response to be sent corresponding to the Request provided as the + /// other argument to `incoming-handler.handle`. + resource response-outparam { + + /// Set the value of the `response-outparam` to either send a response, + /// or indicate an error. + /// + /// This method consumes the `response-outparam` to ensure that it is + /// called at most once. If it is never called, the implementation + /// will respond with an error. + /// + /// The user may provide an `error` to `response` to allow the + /// implementation determine how to respond with an HTTP error response. + set: static func( + param: response-outparam, + response: result, + ); + } + + /// This type corresponds to the HTTP standard Status Code. + type status-code = u16; + + /// Represents an incoming HTTP Response. + resource incoming-response { + + /// Returns the status code from the incoming response. + status: func() -> status-code; + + /// Returns the headers from the incoming response. + /// + /// The returned `headers` resource is immutable: `set`, `append`, and + /// `delete` operations will fail with `header-error.immutable`. + /// + /// This headers resource is a child: it must be dropped before the parent + /// `incoming-response` is dropped. + headers: func() -> headers; + + /// Returns the incoming body. May be called at most once. Returns error + /// if called additional times. + consume: func() -> result; + } + + /// Represents an incoming HTTP Request or Response's Body. + /// + /// A body has both its contents - a stream of bytes - and a (possibly + /// empty) set of trailers, indicating that the full contents of the + /// body have been received. This resource represents the contents as + /// an `input-stream` and the delivery of trailers as a `future-trailers`, + /// and ensures that the user of this interface may only be consuming either + /// the body contents or waiting on trailers at any given time. + resource incoming-body { + + /// Returns the contents of the body, as a stream of bytes. + /// + /// Returns success on first call: the stream representing the contents + /// can be retrieved at most once. Subsequent calls will return error. + /// + /// The returned `input-stream` resource is a child: it must be dropped + /// before the parent `incoming-body` is dropped, or consumed by + /// `incoming-body.finish`. + /// + /// This invariant ensures that the implementation can determine whether + /// the user is consuming the contents of the body, waiting on the + /// `future-trailers` to be ready, or neither. This allows for network + /// backpressure is to be applied when the user is consuming the body, + /// and for that backpressure to not inhibit delivery of the trailers if + /// the user does not read the entire body. + %stream: func() -> result; + + /// Takes ownership of `incoming-body`, and returns a `future-trailers`. + /// This function will trap if the `input-stream` child is still alive. + finish: static func(this: incoming-body) -> future-trailers; + } + + /// Represents a future which may eventaully return trailers, or an error. + /// + /// In the case that the incoming HTTP Request or Response did not have any + /// trailers, this future will resolve to the empty set of trailers once the + /// complete Request or Response body has been received. + resource future-trailers { + + /// Returns a pollable which becomes ready when either the trailers have + /// been received, or an error has occured. When this pollable is ready, + /// the `get` method will return `some`. + subscribe: func() -> pollable; + + /// Returns the contents of the trailers, or an error which occured, + /// once the future is ready. + /// + /// The outer `option` represents future readiness. Users can wait on this + /// `option` to become `some` using the `subscribe` method. + /// + /// The outer `result` is used to retrieve the trailers or error at most + /// once. It will be success on the first call in which the outer option + /// is `some`, and error on subsequent calls. + /// + /// The inner `result` represents that either the HTTP Request or Response + /// body, as well as any trailers, were received successfully, or that an + /// error occured receiving them. The optional `trailers` indicates whether + /// or not trailers were present in the body. + /// + /// When some `trailers` are returned by this method, the `trailers` + /// resource is immutable, and a child. Use of the `set`, `append`, or + /// `delete` methods will return an error, and the resource must be + /// dropped before the parent `future-trailers` is dropped. + get: func() -> option, error-code>>>; + } + + /// Represents an outgoing HTTP Response. + resource outgoing-response { + + /// Construct an `outgoing-response`, with a default `status-code` of `200`. + /// If a different `status-code` is needed, it must be set via the + /// `set-status-code` method. + /// + /// * `headers` is the HTTP Headers for the Response. + constructor(headers: headers); + + /// Get the HTTP Status Code for the Response. + status-code: func() -> status-code; + + /// Set the HTTP Status Code for the Response. Fails if the status-code + /// given is not a valid http status code. + set-status-code: func(status-code: status-code) -> result; + + /// Get the headers associated with the Request. + /// + /// The returned `headers` resource is immutable: `set`, `append`, and + /// `delete` operations will fail with `header-error.immutable`. + /// + /// This headers resource is a child: it must be dropped before the parent + /// `outgoing-request` is dropped, or its ownership is transfered to + /// another component by e.g. `outgoing-handler.handle`. + headers: func() -> headers; + + /// Returns the resource corresponding to the outgoing Body for this Response. + /// + /// Returns success on the first call: the `outgoing-body` resource for + /// this `outgoing-response` can be retrieved at most once. Subsequent + /// calls will return error. + body: func() -> result; + } + + /// Represents an outgoing HTTP Request or Response's Body. + /// + /// A body has both its contents - a stream of bytes - and a (possibly + /// empty) set of trailers, inducating the full contents of the body + /// have been sent. This resource represents the contents as an + /// `output-stream` child resource, and the completion of the body (with + /// optional trailers) with a static function that consumes the + /// `outgoing-body` resource, and ensures that the user of this interface + /// may not write to the body contents after the body has been finished. + /// + /// If the user code drops this resource, as opposed to calling the static + /// method `finish`, the implementation should treat the body as incomplete, + /// and that an error has occured. The implementation should propogate this + /// error to the HTTP protocol by whatever means it has available, + /// including: corrupting the body on the wire, aborting the associated + /// Request, or sending a late status code for the Response. + resource outgoing-body { + + /// Returns a stream for writing the body contents. + /// + /// The returned `output-stream` is a child resource: it must be dropped + /// before the parent `outgoing-body` resource is dropped (or finished), + /// otherwise the `outgoing-body` drop or `finish` will trap. + /// + /// Returns success on the first call: the `output-stream` resource for + /// this `outgoing-body` may be retrieved at most once. Subsequent calls + /// will return error. + write: func() -> result; + + /// Finalize an outgoing body, optionally providing trailers. This must be + /// called to signal that the response is complete. If the `outgoing-body` + /// is dropped without calling `outgoing-body.finalize`, the implementation + /// should treat the body as corrupted. + /// + /// Fails if the body's `outgoing-request` or `outgoing-response` was + /// constructed with a Content-Length header, and the contents written + /// to the body (via `write`) does not match the value given in the + /// Content-Length. + finish: static func( + this: outgoing-body, + trailers: option + ) -> result<_, error-code>; + } + + /// Represents a future which may eventaully return an incoming HTTP + /// Response, or an error. + /// + /// This resource is returned by the `wasi:http/outgoing-handler` interface to + /// provide the HTTP Response corresponding to the sent Request. + resource future-incoming-response { + /// Returns a pollable which becomes ready when either the Response has + /// been received, or an error has occured. When this pollable is ready, + /// the `get` method will return `some`. + subscribe: func() -> pollable; + + /// Returns the incoming HTTP Response, or an error, once one is ready. + /// + /// The outer `option` represents future readiness. Users can wait on this + /// `option` to become `some` using the `subscribe` method. + /// + /// The outer `result` is used to retrieve the response or error at most + /// once. It will be success on the first call in which the outer option + /// is `some`, and error on subsequent calls. + /// + /// The inner `result` represents that either the incoming HTTP Response + /// status and headers have recieved successfully, or that an error + /// occured. Errors may also occur while consuming the response body, + /// but those will be reported by the `incoming-body` and its + /// `output-stream` child. + get: func() -> option>>; + + } +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/error.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/error.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/error.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/error.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/poll.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/poll.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/poll.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/poll.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/streams.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/streams.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/streams.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/streams.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/world.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/world.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/io/world.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/io/world.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/insecure-seed.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/insecure-seed.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/insecure-seed.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/insecure-seed.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/insecure.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/insecure.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/insecure.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/insecure.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/random.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/random.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/random.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/random.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/world.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/world.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/random/world.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/random/world.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/instance-network.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/instance-network.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/instance-network.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/instance-network.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/ip-name-lookup.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/ip-name-lookup.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/ip-name-lookup.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/ip-name-lookup.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/network.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/network.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/network.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/network.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/tcp-create-socket.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/tcp-create-socket.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/tcp-create-socket.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/tcp-create-socket.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/tcp.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/tcp.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/tcp.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/tcp.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/udp-create-socket.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/udp-create-socket.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/udp-create-socket.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/udp-create-socket.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/udp.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/udp.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/udp.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/udp.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/world.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/world.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/sockets/world.wit rename to tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/deps/sockets/world.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/test.wit b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/test.wit new file mode 100644 index 000000000..f3cc6151b --- /dev/null +++ b/tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/wit/test.wit @@ -0,0 +1,22 @@ +package wasmtime:wasi; + +// only used as part of `test-programs` +world test-reactor { + include wasi:cli/imports@0.2.0-rc-2023-12-05; + + export add-strings: func(s: list) -> u32; + export get-strings: func() -> list; + + use wasi:io/streams@0.2.0-rc-2023-11-10.{output-stream}; + + export write-strings-to: func(o: output-stream) -> result; + + use wasi:filesystem/types@0.2.0-rc-2023-11-10.{descriptor-stat}; + export pass-an-imported-record: func(d: descriptor-stat) -> string; +} + +world test-command { + include wasi:cli/imports@0.2.0-rc-2023-12-05; + import wasi:http/types@0.2.0-rc-2023-12-05; + import wasi:http/outgoing-handler@0.2.0-rc-2023-12-05; +} diff --git a/tests/integration.rs b/tests/integration.rs index 6c3fc20e0..69955f62f 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -4,6 +4,7 @@ mod integration_tests { use futures::{channel::oneshot, future, stream, FutureExt}; use http_body_util::BodyExt; use hyper::{body::Bytes, server::conn::http1, service::service_fn, Method, StatusCode}; + use hyper_util::rt::tokio::TokioIo; use reqwest::Client; use sha2::{Digest, Sha256}; use spin_http::body; @@ -712,7 +713,7 @@ route = "/..." if let Err(e) = http1::Builder::new() .keep_alive(true) .serve_connection( - stream, + TokioIo::new(stream), service_fn( move |request: hyper::Request| { let body = body.clone(); @@ -803,7 +804,7 @@ route = "/..." if let Err(e) = http1::Builder::new() .keep_alive(true) .serve_connection( - stream, + TokioIo::new(stream), service_fn(move |request| { let bodies = bodies.clone(); async move { @@ -947,8 +948,7 @@ route = "/..." Ok(()) } - #[tokio::test] - async fn test_wasi_http_rc_11_10() -> Result<()> { + async fn test_wasi_http_rc(manifest_path: &str) -> Result<()> { let body = b"So rested he by the Tumtum tree"; let listener = tokio::net::TcpListener::bind((Ipv4Addr::new(127, 0, 0, 1), 0)).await?; @@ -963,7 +963,7 @@ route = "/..." if let Err(e) = http1::Builder::new() .keep_alive(true) .serve_connection( - stream, + TokioIo::new(stream), service_fn(move |request| async move { if let &Method::GET = request.method() { Ok::<_, Error>(hyper::Response::new(body::full( @@ -1003,12 +1003,7 @@ route = "/..." drop(future::select(server, rx).await); }); - let controller = SpinTestController::with_manifest( - "tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/spin.toml", - &[], - &[], - ) - .await?; + let controller = SpinTestController::with_manifest(manifest_path, &[], &[]).await?; let response = Client::new() .get(format!("http://{}/", controller.url)) @@ -1022,6 +1017,16 @@ route = "/..." Ok(()) } + #[tokio::test] + async fn test_wasi_http_rc_11_10() -> Result<()> { + test_wasi_http_rc("tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/spin.toml").await + } + + #[tokio::test] + async fn test_wasi_http_rc_12_05() -> Result<()> { + test_wasi_http_rc("tests/http/wasi-http-rust-0.2.0-rc-2023-12-05/spin.toml").await + } + /// Build an app whose component `workdir` is a subdirectory. #[tokio::test] #[cfg(not(tarpaulin))] diff --git a/tests/testing-framework/src/spin.rs b/tests/testing-framework/src/spin.rs index a94aec186..3b6eaa91e 100644 --- a/tests/testing-framework/src/spin.rs +++ b/tests/testing-framework/src/spin.rs @@ -55,13 +55,13 @@ impl Spin { ); } - if start.elapsed() > std::time::Duration::from_secs(20) { + if start.elapsed() > std::time::Duration::from_secs(2 * 60) { break; } std::thread::sleep(std::time::Duration::from_millis(50)); } anyhow::bail!( - "`spin up` did not start server or error after 20 seconds. stderr:\n\t{}", + "`spin up` did not start server or error after two minutes. stderr:\n\t{}", spin.stderr.output_as_str().unwrap_or("") ) } diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/command-extended.wit b/wit-2023-11-10/command-extended.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/command-extended.wit rename to wit-2023-11-10/command-extended.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/command.wit b/wit-2023-11-10/deps/cli/command.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/command.wit rename to wit-2023-11-10/deps/cli/command.wit diff --git a/wit-2023-11-10/deps/cli/environment.wit b/wit-2023-11-10/deps/cli/environment.wit new file mode 100644 index 000000000..70065233e --- /dev/null +++ b/wit-2023-11-10/deps/cli/environment.wit @@ -0,0 +1,18 @@ +interface environment { + /// Get the POSIX-style environment variables. + /// + /// Each environment variable is provided as a pair of string variable names + /// and string value. + /// + /// Morally, these are a value import, but until value imports are available + /// in the component model, this import function should return the same + /// values each time it is called. + get-environment: func() -> list>; + + /// Get the POSIX-style arguments to the program. + get-arguments: func() -> list; + + /// Return a path that programs should use as their initial current working + /// directory, interpreting `.` as shorthand for this. + initial-cwd: func() -> option; +} diff --git a/wit-2023-11-10/deps/cli/exit.wit b/wit-2023-11-10/deps/cli/exit.wit new file mode 100644 index 000000000..d0c2b82ae --- /dev/null +++ b/wit-2023-11-10/deps/cli/exit.wit @@ -0,0 +1,4 @@ +interface exit { + /// Exit the current instance and any linked instances. + exit: func(status: result); +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/reactor.wit b/wit-2023-11-10/deps/cli/reactor.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/cli/reactor.wit rename to wit-2023-11-10/deps/cli/reactor.wit diff --git a/wit-2023-11-10/deps/cli/run.wit b/wit-2023-11-10/deps/cli/run.wit new file mode 100644 index 000000000..a70ee8c03 --- /dev/null +++ b/wit-2023-11-10/deps/cli/run.wit @@ -0,0 +1,4 @@ +interface run { + /// Run the program. + run: func() -> result; +} diff --git a/wit-2023-11-10/deps/cli/stdio.wit b/wit-2023-11-10/deps/cli/stdio.wit new file mode 100644 index 000000000..1b653b6e2 --- /dev/null +++ b/wit-2023-11-10/deps/cli/stdio.wit @@ -0,0 +1,17 @@ +interface stdin { + use wasi:io/streams@0.2.0-rc-2023-11-10.{input-stream}; + + get-stdin: func() -> input-stream; +} + +interface stdout { + use wasi:io/streams@0.2.0-rc-2023-11-10.{output-stream}; + + get-stdout: func() -> output-stream; +} + +interface stderr { + use wasi:io/streams@0.2.0-rc-2023-11-10.{output-stream}; + + get-stderr: func() -> output-stream; +} diff --git a/wit-2023-11-10/deps/cli/terminal.wit b/wit-2023-11-10/deps/cli/terminal.wit new file mode 100644 index 000000000..47495769b --- /dev/null +++ b/wit-2023-11-10/deps/cli/terminal.wit @@ -0,0 +1,47 @@ +interface terminal-input { + /// The input side of a terminal. + resource terminal-input; + + // In the future, this may include functions for disabling echoing, + // disabling input buffering so that keyboard events are sent through + // immediately, querying supported features, and so on. +} + +interface terminal-output { + /// The output side of a terminal. + resource terminal-output; + + // In the future, this may include functions for querying the terminal + // size, being notified of terminal size changes, querying supported + // features, and so on. +} + +/// An interface providing an optional `terminal-input` for stdin as a +/// link-time authority. +interface terminal-stdin { + use terminal-input.{terminal-input}; + + /// If stdin is connected to a terminal, return a `terminal-input` handle + /// allowing further interaction with it. + get-terminal-stdin: func() -> option; +} + +/// An interface providing an optional `terminal-output` for stdout as a +/// link-time authority. +interface terminal-stdout { + use terminal-output.{terminal-output}; + + /// If stdout is connected to a terminal, return a `terminal-output` handle + /// allowing further interaction with it. + get-terminal-stdout: func() -> option; +} + +/// An interface providing an optional `terminal-output` for stderr as a +/// link-time authority. +interface terminal-stderr { + use terminal-output.{terminal-output}; + + /// If stderr is connected to a terminal, return a `terminal-output` handle + /// allowing further interaction with it. + get-terminal-stderr: func() -> option; +} diff --git a/wit-2023-11-10/deps/clocks/monotonic-clock.wit b/wit-2023-11-10/deps/clocks/monotonic-clock.wit new file mode 100644 index 000000000..09ef32c36 --- /dev/null +++ b/wit-2023-11-10/deps/clocks/monotonic-clock.wit @@ -0,0 +1,45 @@ +package wasi:clocks@0.2.0-rc-2023-11-10; +/// WASI Monotonic Clock is a clock API intended to let users measure elapsed +/// time. +/// +/// It is intended to be portable at least between Unix-family platforms and +/// Windows. +/// +/// A monotonic clock is a clock which has an unspecified initial value, and +/// successive reads of the clock will produce non-decreasing values. +/// +/// It is intended for measuring elapsed time. +interface monotonic-clock { + use wasi:io/poll@0.2.0-rc-2023-11-10.{pollable}; + + /// An instant in time, in nanoseconds. An instant is relative to an + /// unspecified initial value, and can only be compared to instances from + /// the same monotonic-clock. + type instant = u64; + + /// A duration of time, in nanoseconds. + type duration = u64; + + /// Read the current value of the clock. + /// + /// The clock is monotonic, therefore calling this function repeatedly will + /// produce a sequence of non-decreasing values. + now: func() -> instant; + + /// Query the resolution of the clock. Returns the duration of time + /// corresponding to a clock tick. + resolution: func() -> duration; + + /// Create a `pollable` which will resolve once the specified instant + /// occured. + subscribe-instant: func( + when: instant, + ) -> pollable; + + /// Create a `pollable` which will resolve once the given duration has + /// elapsed, starting at the time at which this function was called. + /// occured. + subscribe-duration: func( + when: duration, + ) -> pollable; +} diff --git a/wit-2023-11-10/deps/clocks/wall-clock.wit b/wit-2023-11-10/deps/clocks/wall-clock.wit new file mode 100644 index 000000000..8abb9a0c0 --- /dev/null +++ b/wit-2023-11-10/deps/clocks/wall-clock.wit @@ -0,0 +1,42 @@ +package wasi:clocks@0.2.0-rc-2023-11-10; +/// WASI Wall Clock is a clock API intended to let users query the current +/// time. The name "wall" makes an analogy to a "clock on the wall", which +/// is not necessarily monotonic as it may be reset. +/// +/// It is intended to be portable at least between Unix-family platforms and +/// Windows. +/// +/// A wall clock is a clock which measures the date and time according to +/// some external reference. +/// +/// External references may be reset, so this clock is not necessarily +/// monotonic, making it unsuitable for measuring elapsed time. +/// +/// It is intended for reporting the current date and time for humans. +interface wall-clock { + /// A time and date in seconds plus nanoseconds. + record datetime { + seconds: u64, + nanoseconds: u32, + } + + /// Read the current value of the clock. + /// + /// This clock is not monotonic, therefore calling this function repeatedly + /// will not necessarily produce a sequence of non-decreasing values. + /// + /// The returned timestamps represent the number of seconds since + /// 1970-01-01T00:00:00Z, also known as [POSIX's Seconds Since the Epoch], + /// also known as [Unix Time]. + /// + /// The nanoseconds field of the output is always less than 1000000000. + /// + /// [POSIX's Seconds Since the Epoch]: https://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xbd_chap04.html#tag_21_04_16 + /// [Unix Time]: https://en.wikipedia.org/wiki/Unix_time + now: func() -> datetime; + + /// Query the resolution of the clock. + /// + /// The nanoseconds field of the output is always less than 1000000000. + resolution: func() -> datetime; +} diff --git a/wit-2023-11-10/deps/clocks/world.wit b/wit-2023-11-10/deps/clocks/world.wit new file mode 100644 index 000000000..8fa080f0e --- /dev/null +++ b/wit-2023-11-10/deps/clocks/world.wit @@ -0,0 +1,6 @@ +package wasi:clocks@0.2.0-rc-2023-11-10; + +world imports { + import monotonic-clock; + import wall-clock; +} diff --git a/wit-2023-11-10/deps/filesystem/preopens.wit b/wit-2023-11-10/deps/filesystem/preopens.wit new file mode 100644 index 000000000..95ec67843 --- /dev/null +++ b/wit-2023-11-10/deps/filesystem/preopens.wit @@ -0,0 +1,8 @@ +package wasi:filesystem@0.2.0-rc-2023-11-10; + +interface preopens { + use types.{descriptor}; + + /// Return the set of preopened directories, and their path. + get-directories: func() -> list>; +} diff --git a/wit-2023-11-10/deps/filesystem/types.wit b/wit-2023-11-10/deps/filesystem/types.wit new file mode 100644 index 000000000..059722ab8 --- /dev/null +++ b/wit-2023-11-10/deps/filesystem/types.wit @@ -0,0 +1,634 @@ +package wasi:filesystem@0.2.0-rc-2023-11-10; +/// WASI filesystem is a filesystem API primarily intended to let users run WASI +/// programs that access their files on their existing filesystems, without +/// significant overhead. +/// +/// It is intended to be roughly portable between Unix-family platforms and +/// Windows, though it does not hide many of the major differences. +/// +/// Paths are passed as interface-type `string`s, meaning they must consist of +/// a sequence of Unicode Scalar Values (USVs). Some filesystems may contain +/// paths which are not accessible by this API. +/// +/// The directory separator in WASI is always the forward-slash (`/`). +/// +/// All paths in WASI are relative paths, and are interpreted relative to a +/// `descriptor` referring to a base directory. If a `path` argument to any WASI +/// function starts with `/`, or if any step of resolving a `path`, including +/// `..` and symbolic link steps, reaches a directory outside of the base +/// directory, or reaches a symlink to an absolute or rooted path in the +/// underlying filesystem, the function fails with `error-code::not-permitted`. +/// +/// For more information about WASI path resolution and sandboxing, see +/// [WASI filesystem path resolution]. +/// +/// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md +interface types { + use wasi:io/streams@0.2.0-rc-2023-11-10.{input-stream, output-stream, error}; + use wasi:clocks/wall-clock@0.2.0-rc-2023-11-10.{datetime}; + + /// File size or length of a region within a file. + type filesize = u64; + + /// The type of a filesystem object referenced by a descriptor. + /// + /// Note: This was called `filetype` in earlier versions of WASI. + enum descriptor-type { + /// The type of the descriptor or file is unknown or is different from + /// any of the other types specified. + unknown, + /// The descriptor refers to a block device inode. + block-device, + /// The descriptor refers to a character device inode. + character-device, + /// The descriptor refers to a directory inode. + directory, + /// The descriptor refers to a named pipe. + fifo, + /// The file refers to a symbolic link inode. + symbolic-link, + /// The descriptor refers to a regular file inode. + regular-file, + /// The descriptor refers to a socket. + socket, + } + + /// Descriptor flags. + /// + /// Note: This was called `fdflags` in earlier versions of WASI. + flags descriptor-flags { + /// Read mode: Data can be read. + read, + /// Write mode: Data can be written to. + write, + /// Request that writes be performed according to synchronized I/O file + /// integrity completion. The data stored in the file and the file's + /// metadata are synchronized. This is similar to `O_SYNC` in POSIX. + /// + /// The precise semantics of this operation have not yet been defined for + /// WASI. At this time, it should be interpreted as a request, and not a + /// requirement. + file-integrity-sync, + /// Request that writes be performed according to synchronized I/O data + /// integrity completion. Only the data stored in the file is + /// synchronized. This is similar to `O_DSYNC` in POSIX. + /// + /// The precise semantics of this operation have not yet been defined for + /// WASI. At this time, it should be interpreted as a request, and not a + /// requirement. + data-integrity-sync, + /// Requests that reads be performed at the same level of integrety + /// requested for writes. This is similar to `O_RSYNC` in POSIX. + /// + /// The precise semantics of this operation have not yet been defined for + /// WASI. At this time, it should be interpreted as a request, and not a + /// requirement. + requested-write-sync, + /// Mutating directories mode: Directory contents may be mutated. + /// + /// When this flag is unset on a descriptor, operations using the + /// descriptor which would create, rename, delete, modify the data or + /// metadata of filesystem objects, or obtain another handle which + /// would permit any of those, shall fail with `error-code::read-only` if + /// they would otherwise succeed. + /// + /// This may only be set on directories. + mutate-directory, + } + + /// File attributes. + /// + /// Note: This was called `filestat` in earlier versions of WASI. + record descriptor-stat { + /// File type. + %type: descriptor-type, + /// Number of hard links to the file. + link-count: link-count, + /// For regular files, the file size in bytes. For symbolic links, the + /// length in bytes of the pathname contained in the symbolic link. + size: filesize, + /// Last data access timestamp. + /// + /// If the `option` is none, the platform doesn't maintain an access + /// timestamp for this file. + data-access-timestamp: option, + /// Last data modification timestamp. + /// + /// If the `option` is none, the platform doesn't maintain a + /// modification timestamp for this file. + data-modification-timestamp: option, + /// Last file status-change timestamp. + /// + /// If the `option` is none, the platform doesn't maintain a + /// status-change timestamp for this file. + status-change-timestamp: option, + } + + /// Flags determining the method of how paths are resolved. + flags path-flags { + /// As long as the resolved path corresponds to a symbolic link, it is + /// expanded. + symlink-follow, + } + + /// Open flags used by `open-at`. + flags open-flags { + /// Create file if it does not exist, similar to `O_CREAT` in POSIX. + create, + /// Fail if not a directory, similar to `O_DIRECTORY` in POSIX. + directory, + /// Fail if file already exists, similar to `O_EXCL` in POSIX. + exclusive, + /// Truncate file to size 0, similar to `O_TRUNC` in POSIX. + truncate, + } + + /// Number of hard links to an inode. + type link-count = u64; + + /// When setting a timestamp, this gives the value to set it to. + variant new-timestamp { + /// Leave the timestamp set to its previous value. + no-change, + /// Set the timestamp to the current time of the system clock associated + /// with the filesystem. + now, + /// Set the timestamp to the given value. + timestamp(datetime), + } + + /// A directory entry. + record directory-entry { + /// The type of the file referred to by this directory entry. + %type: descriptor-type, + + /// The name of the object. + name: string, + } + + /// Error codes returned by functions, similar to `errno` in POSIX. + /// Not all of these error codes are returned by the functions provided by this + /// API; some are used in higher-level library layers, and others are provided + /// merely for alignment with POSIX. + enum error-code { + /// Permission denied, similar to `EACCES` in POSIX. + access, + /// Resource unavailable, or operation would block, similar to `EAGAIN` and `EWOULDBLOCK` in POSIX. + would-block, + /// Connection already in progress, similar to `EALREADY` in POSIX. + already, + /// Bad descriptor, similar to `EBADF` in POSIX. + bad-descriptor, + /// Device or resource busy, similar to `EBUSY` in POSIX. + busy, + /// Resource deadlock would occur, similar to `EDEADLK` in POSIX. + deadlock, + /// Storage quota exceeded, similar to `EDQUOT` in POSIX. + quota, + /// File exists, similar to `EEXIST` in POSIX. + exist, + /// File too large, similar to `EFBIG` in POSIX. + file-too-large, + /// Illegal byte sequence, similar to `EILSEQ` in POSIX. + illegal-byte-sequence, + /// Operation in progress, similar to `EINPROGRESS` in POSIX. + in-progress, + /// Interrupted function, similar to `EINTR` in POSIX. + interrupted, + /// Invalid argument, similar to `EINVAL` in POSIX. + invalid, + /// I/O error, similar to `EIO` in POSIX. + io, + /// Is a directory, similar to `EISDIR` in POSIX. + is-directory, + /// Too many levels of symbolic links, similar to `ELOOP` in POSIX. + loop, + /// Too many links, similar to `EMLINK` in POSIX. + too-many-links, + /// Message too large, similar to `EMSGSIZE` in POSIX. + message-size, + /// Filename too long, similar to `ENAMETOOLONG` in POSIX. + name-too-long, + /// No such device, similar to `ENODEV` in POSIX. + no-device, + /// No such file or directory, similar to `ENOENT` in POSIX. + no-entry, + /// No locks available, similar to `ENOLCK` in POSIX. + no-lock, + /// Not enough space, similar to `ENOMEM` in POSIX. + insufficient-memory, + /// No space left on device, similar to `ENOSPC` in POSIX. + insufficient-space, + /// Not a directory or a symbolic link to a directory, similar to `ENOTDIR` in POSIX. + not-directory, + /// Directory not empty, similar to `ENOTEMPTY` in POSIX. + not-empty, + /// State not recoverable, similar to `ENOTRECOVERABLE` in POSIX. + not-recoverable, + /// Not supported, similar to `ENOTSUP` and `ENOSYS` in POSIX. + unsupported, + /// Inappropriate I/O control operation, similar to `ENOTTY` in POSIX. + no-tty, + /// No such device or address, similar to `ENXIO` in POSIX. + no-such-device, + /// Value too large to be stored in data type, similar to `EOVERFLOW` in POSIX. + overflow, + /// Operation not permitted, similar to `EPERM` in POSIX. + not-permitted, + /// Broken pipe, similar to `EPIPE` in POSIX. + pipe, + /// Read-only file system, similar to `EROFS` in POSIX. + read-only, + /// Invalid seek, similar to `ESPIPE` in POSIX. + invalid-seek, + /// Text file busy, similar to `ETXTBSY` in POSIX. + text-file-busy, + /// Cross-device link, similar to `EXDEV` in POSIX. + cross-device, + } + + /// File or memory access pattern advisory information. + enum advice { + /// The application has no advice to give on its behavior with respect + /// to the specified data. + normal, + /// The application expects to access the specified data sequentially + /// from lower offsets to higher offsets. + sequential, + /// The application expects to access the specified data in a random + /// order. + random, + /// The application expects to access the specified data in the near + /// future. + will-need, + /// The application expects that it will not access the specified data + /// in the near future. + dont-need, + /// The application expects to access the specified data once and then + /// not reuse it thereafter. + no-reuse, + } + + /// A 128-bit hash value, split into parts because wasm doesn't have a + /// 128-bit integer type. + record metadata-hash-value { + /// 64 bits of a 128-bit hash value. + lower: u64, + /// Another 64 bits of a 128-bit hash value. + upper: u64, + } + + /// A descriptor is a reference to a filesystem object, which may be a file, + /// directory, named pipe, special file, or other object on which filesystem + /// calls may be made. + resource descriptor { + /// Return a stream for reading from a file, if available. + /// + /// May fail with an error-code describing why the file cannot be read. + /// + /// Multiple read, write, and append streams may be active on the same open + /// file and they do not interfere with each other. + /// + /// Note: This allows using `read-stream`, which is similar to `read` in POSIX. + read-via-stream: func( + /// The offset within the file at which to start reading. + offset: filesize, + ) -> result; + + /// Return a stream for writing to a file, if available. + /// + /// May fail with an error-code describing why the file cannot be written. + /// + /// Note: This allows using `write-stream`, which is similar to `write` in + /// POSIX. + write-via-stream: func( + /// The offset within the file at which to start writing. + offset: filesize, + ) -> result; + + /// Return a stream for appending to a file, if available. + /// + /// May fail with an error-code describing why the file cannot be appended. + /// + /// Note: This allows using `write-stream`, which is similar to `write` with + /// `O_APPEND` in in POSIX. + append-via-stream: func() -> result; + + /// Provide file advisory information on a descriptor. + /// + /// This is similar to `posix_fadvise` in POSIX. + advise: func( + /// The offset within the file to which the advisory applies. + offset: filesize, + /// The length of the region to which the advisory applies. + length: filesize, + /// The advice. + advice: advice + ) -> result<_, error-code>; + + /// Synchronize the data of a file to disk. + /// + /// This function succeeds with no effect if the file descriptor is not + /// opened for writing. + /// + /// Note: This is similar to `fdatasync` in POSIX. + sync-data: func() -> result<_, error-code>; + + /// Get flags associated with a descriptor. + /// + /// Note: This returns similar flags to `fcntl(fd, F_GETFL)` in POSIX. + /// + /// Note: This returns the value that was the `fs_flags` value returned + /// from `fdstat_get` in earlier versions of WASI. + get-flags: func() -> result; + + /// Get the dynamic type of a descriptor. + /// + /// Note: This returns the same value as the `type` field of the `fd-stat` + /// returned by `stat`, `stat-at` and similar. + /// + /// Note: This returns similar flags to the `st_mode & S_IFMT` value provided + /// by `fstat` in POSIX. + /// + /// Note: This returns the value that was the `fs_filetype` value returned + /// from `fdstat_get` in earlier versions of WASI. + get-type: func() -> result; + + /// Adjust the size of an open file. If this increases the file's size, the + /// extra bytes are filled with zeros. + /// + /// Note: This was called `fd_filestat_set_size` in earlier versions of WASI. + set-size: func(size: filesize) -> result<_, error-code>; + + /// Adjust the timestamps of an open file or directory. + /// + /// Note: This is similar to `futimens` in POSIX. + /// + /// Note: This was called `fd_filestat_set_times` in earlier versions of WASI. + set-times: func( + /// The desired values of the data access timestamp. + data-access-timestamp: new-timestamp, + /// The desired values of the data modification timestamp. + data-modification-timestamp: new-timestamp, + ) -> result<_, error-code>; + + /// Read from a descriptor, without using and updating the descriptor's offset. + /// + /// This function returns a list of bytes containing the data that was + /// read, along with a bool which, when true, indicates that the end of the + /// file was reached. The returned list will contain up to `length` bytes; it + /// may return fewer than requested, if the end of the file is reached or + /// if the I/O operation is interrupted. + /// + /// In the future, this may change to return a `stream`. + /// + /// Note: This is similar to `pread` in POSIX. + read: func( + /// The maximum number of bytes to read. + length: filesize, + /// The offset within the file at which to read. + offset: filesize, + ) -> result, bool>, error-code>; + + /// Write to a descriptor, without using and updating the descriptor's offset. + /// + /// It is valid to write past the end of a file; the file is extended to the + /// extent of the write, with bytes between the previous end and the start of + /// the write set to zero. + /// + /// In the future, this may change to take a `stream`. + /// + /// Note: This is similar to `pwrite` in POSIX. + write: func( + /// Data to write + buffer: list, + /// The offset within the file at which to write. + offset: filesize, + ) -> result; + + /// Read directory entries from a directory. + /// + /// On filesystems where directories contain entries referring to themselves + /// and their parents, often named `.` and `..` respectively, these entries + /// are omitted. + /// + /// This always returns a new stream which starts at the beginning of the + /// directory. Multiple streams may be active on the same directory, and they + /// do not interfere with each other. + read-directory: func() -> result; + + /// Synchronize the data and metadata of a file to disk. + /// + /// This function succeeds with no effect if the file descriptor is not + /// opened for writing. + /// + /// Note: This is similar to `fsync` in POSIX. + sync: func() -> result<_, error-code>; + + /// Create a directory. + /// + /// Note: This is similar to `mkdirat` in POSIX. + create-directory-at: func( + /// The relative path at which to create the directory. + path: string, + ) -> result<_, error-code>; + + /// Return the attributes of an open file or directory. + /// + /// Note: This is similar to `fstat` in POSIX, except that it does not return + /// device and inode information. For testing whether two descriptors refer to + /// the same underlying filesystem object, use `is-same-object`. To obtain + /// additional data that can be used do determine whether a file has been + /// modified, use `metadata-hash`. + /// + /// Note: This was called `fd_filestat_get` in earlier versions of WASI. + stat: func() -> result; + + /// Return the attributes of a file or directory. + /// + /// Note: This is similar to `fstatat` in POSIX, except that it does not + /// return device and inode information. See the `stat` description for a + /// discussion of alternatives. + /// + /// Note: This was called `path_filestat_get` in earlier versions of WASI. + stat-at: func( + /// Flags determining the method of how the path is resolved. + path-flags: path-flags, + /// The relative path of the file or directory to inspect. + path: string, + ) -> result; + + /// Adjust the timestamps of a file or directory. + /// + /// Note: This is similar to `utimensat` in POSIX. + /// + /// Note: This was called `path_filestat_set_times` in earlier versions of + /// WASI. + set-times-at: func( + /// Flags determining the method of how the path is resolved. + path-flags: path-flags, + /// The relative path of the file or directory to operate on. + path: string, + /// The desired values of the data access timestamp. + data-access-timestamp: new-timestamp, + /// The desired values of the data modification timestamp. + data-modification-timestamp: new-timestamp, + ) -> result<_, error-code>; + + /// Create a hard link. + /// + /// Note: This is similar to `linkat` in POSIX. + link-at: func( + /// Flags determining the method of how the path is resolved. + old-path-flags: path-flags, + /// The relative source path from which to link. + old-path: string, + /// The base directory for `new-path`. + new-descriptor: borrow, + /// The relative destination path at which to create the hard link. + new-path: string, + ) -> result<_, error-code>; + + /// Open a file or directory. + /// + /// The returned descriptor is not guaranteed to be the lowest-numbered + /// descriptor not currently open/ it is randomized to prevent applications + /// from depending on making assumptions about indexes, since this is + /// error-prone in multi-threaded contexts. The returned descriptor is + /// guaranteed to be less than 2**31. + /// + /// If `flags` contains `descriptor-flags::mutate-directory`, and the base + /// descriptor doesn't have `descriptor-flags::mutate-directory` set, + /// `open-at` fails with `error-code::read-only`. + /// + /// If `flags` contains `write` or `mutate-directory`, or `open-flags` + /// contains `truncate` or `create`, and the base descriptor doesn't have + /// `descriptor-flags::mutate-directory` set, `open-at` fails with + /// `error-code::read-only`. + /// + /// Note: This is similar to `openat` in POSIX. + open-at: func( + /// Flags determining the method of how the path is resolved. + path-flags: path-flags, + /// The relative path of the object to open. + path: string, + /// The method by which to open the file. + open-flags: open-flags, + /// Flags to use for the resulting descriptor. + %flags: descriptor-flags, + ) -> result; + + /// Read the contents of a symbolic link. + /// + /// If the contents contain an absolute or rooted path in the underlying + /// filesystem, this function fails with `error-code::not-permitted`. + /// + /// Note: This is similar to `readlinkat` in POSIX. + readlink-at: func( + /// The relative path of the symbolic link from which to read. + path: string, + ) -> result; + + /// Remove a directory. + /// + /// Return `error-code::not-empty` if the directory is not empty. + /// + /// Note: This is similar to `unlinkat(fd, path, AT_REMOVEDIR)` in POSIX. + remove-directory-at: func( + /// The relative path to a directory to remove. + path: string, + ) -> result<_, error-code>; + + /// Rename a filesystem object. + /// + /// Note: This is similar to `renameat` in POSIX. + rename-at: func( + /// The relative source path of the file or directory to rename. + old-path: string, + /// The base directory for `new-path`. + new-descriptor: borrow, + /// The relative destination path to which to rename the file or directory. + new-path: string, + ) -> result<_, error-code>; + + /// Create a symbolic link (also known as a "symlink"). + /// + /// If `old-path` starts with `/`, the function fails with + /// `error-code::not-permitted`. + /// + /// Note: This is similar to `symlinkat` in POSIX. + symlink-at: func( + /// The contents of the symbolic link. + old-path: string, + /// The relative destination path at which to create the symbolic link. + new-path: string, + ) -> result<_, error-code>; + + /// Unlink a filesystem object that is not a directory. + /// + /// Return `error-code::is-directory` if the path refers to a directory. + /// Note: This is similar to `unlinkat(fd, path, 0)` in POSIX. + unlink-file-at: func( + /// The relative path to a file to unlink. + path: string, + ) -> result<_, error-code>; + + /// Test whether two descriptors refer to the same filesystem object. + /// + /// In POSIX, this corresponds to testing whether the two descriptors have the + /// same device (`st_dev`) and inode (`st_ino` or `d_ino`) numbers. + /// wasi-filesystem does not expose device and inode numbers, so this function + /// may be used instead. + is-same-object: func(other: borrow) -> bool; + + /// Return a hash of the metadata associated with a filesystem object referred + /// to by a descriptor. + /// + /// This returns a hash of the last-modification timestamp and file size, and + /// may also include the inode number, device number, birth timestamp, and + /// other metadata fields that may change when the file is modified or + /// replaced. It may also include a secret value chosen by the + /// implementation and not otherwise exposed. + /// + /// Implementations are encourated to provide the following properties: + /// + /// - If the file is not modified or replaced, the computed hash value should + /// usually not change. + /// - If the object is modified or replaced, the computed hash value should + /// usually change. + /// - The inputs to the hash should not be easily computable from the + /// computed hash. + /// + /// However, none of these is required. + metadata-hash: func() -> result; + + /// Return a hash of the metadata associated with a filesystem object referred + /// to by a directory descriptor and a relative path. + /// + /// This performs the same hash computation as `metadata-hash`. + metadata-hash-at: func( + /// Flags determining the method of how the path is resolved. + path-flags: path-flags, + /// The relative path of the file or directory to inspect. + path: string, + ) -> result; + } + + /// A stream of directory entries. + resource directory-entry-stream { + /// Read a single directory entry from a `directory-entry-stream`. + read-directory-entry: func() -> result, error-code>; + } + + /// Attempts to extract a filesystem-related `error-code` from the stream + /// `error` provided. + /// + /// Stream operations which return `stream-error::last-operation-failed` + /// have a payload with more information about the operation that failed. + /// This payload can be passed through to this function to see if there's + /// filesystem-related information about the error to return. + /// + /// Note that this function is fallible because not all stream-related + /// errors are filesystem-related errors. + filesystem-error-code: func(err: borrow) -> option; +} diff --git a/wit-2023-11-10/deps/filesystem/world.wit b/wit-2023-11-10/deps/filesystem/world.wit new file mode 100644 index 000000000..285e0bae9 --- /dev/null +++ b/wit-2023-11-10/deps/filesystem/world.wit @@ -0,0 +1,6 @@ +package wasi:filesystem@0.2.0-rc-2023-11-10; + +world imports { + import types; + import preopens; +} diff --git a/wit-2023-11-10/deps/http/handler.wit b/wit-2023-11-10/deps/http/handler.wit new file mode 100644 index 000000000..a34a0649d --- /dev/null +++ b/wit-2023-11-10/deps/http/handler.wit @@ -0,0 +1,43 @@ +/// This interface defines a handler of incoming HTTP Requests. It should +/// be exported by components which can respond to HTTP Requests. +interface incoming-handler { + use types.{incoming-request, response-outparam}; + + /// This function is invoked with an incoming HTTP Request, and a resource + /// `response-outparam` which provides the capability to reply with an HTTP + /// Response. The response is sent by calling the `response-outparam.set` + /// method, which allows execution to continue after the response has been + /// sent. This enables both streaming to the response body, and performing other + /// work. + /// + /// The implementor of this function must write a response to the + /// `response-outparam` before returning, or else the caller will respond + /// with an error on its behalf. + handle: func( + request: incoming-request, + response-out: response-outparam + ); +} + +/// This interface defines a handler of outgoing HTTP Requests. It should be +/// imported by components which wish to make HTTP Requests. +interface outgoing-handler { + use types.{ + outgoing-request, request-options, future-incoming-response, error-code + }; + + /// This function is invoked with an outgoing HTTP Request, and it returns + /// a resource `future-incoming-response` which represents an HTTP Response + /// which may arrive in the future. + /// + /// The `options` argument accepts optional parameters for the HTTP + /// protocol's transport layer. + /// + /// This function may return an error if the `outgoing-request` is invalid + /// or not allowed to be made. Otherwise, protocol errors are reported + /// through the `future-incoming-response`. + handle: func( + request: outgoing-request, + options: option + ) -> result; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/proxy.wit b/wit-2023-11-10/deps/http/proxy.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/proxy.wit rename to wit-2023-11-10/deps/http/proxy.wit diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/types.wit b/wit-2023-11-10/deps/http/types.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/deps/http/types.wit rename to wit-2023-11-10/deps/http/types.wit diff --git a/wit-2023-11-10/deps/io/error.wit b/wit-2023-11-10/deps/io/error.wit new file mode 100644 index 000000000..31918acbb --- /dev/null +++ b/wit-2023-11-10/deps/io/error.wit @@ -0,0 +1,34 @@ +package wasi:io@0.2.0-rc-2023-11-10; + + +interface error { + /// A resource which represents some error information. + /// + /// The only method provided by this resource is `to-debug-string`, + /// which provides some human-readable information about the error. + /// + /// In the `wasi:io` package, this resource is returned through the + /// `wasi:io/streams/stream-error` type. + /// + /// To provide more specific error information, other interfaces may + /// provide functions to further "downcast" this error into more specific + /// error information. For example, `error`s returned in streams derived + /// from filesystem types to be described using the filesystem's own + /// error-code type, using the function + /// `wasi:filesystem/types/filesystem-error-code`, which takes a parameter + /// `borrow` and returns + /// `option`. + /// + /// The set of functions which can "downcast" an `error` into a more + /// concrete type is open. + resource error { + /// Returns a string that is suitable to assist humans in debugging + /// this error. + /// + /// WARNING: The returned string should not be consumed mechanically! + /// It may change across platforms, hosts, or other implementation + /// details. Parsing this string is a major platform-compatibility + /// hazard. + to-debug-string: func() -> string; + } +} diff --git a/wit-2023-11-10/deps/io/poll.wit b/wit-2023-11-10/deps/io/poll.wit new file mode 100644 index 000000000..bddde3c19 --- /dev/null +++ b/wit-2023-11-10/deps/io/poll.wit @@ -0,0 +1,41 @@ +package wasi:io@0.2.0-rc-2023-11-10; + +/// A poll API intended to let users wait for I/O events on multiple handles +/// at once. +interface poll { + /// `pollable` epresents a single I/O event which may be ready, or not. + resource pollable { + + /// Return the readiness of a pollable. This function never blocks. + /// + /// Returns `true` when the pollable is ready, and `false` otherwise. + ready: func() -> bool; + + /// `block` returns immediately if the pollable is ready, and otherwise + /// blocks until ready. + /// + /// This function is equivalent to calling `poll.poll` on a list + /// containing only this pollable. + block: func(); + } + + /// Poll for completion on a set of pollables. + /// + /// This function takes a list of pollables, which identify I/O sources of + /// interest, and waits until one or more of the events is ready for I/O. + /// + /// The result `list` contains one or more indices of handles in the + /// argument list that is ready for I/O. + /// + /// If the list contains more elements than can be indexed with a `u32` + /// value, this function traps. + /// + /// A timeout can be implemented by adding a pollable from the + /// wasi-clocks API to the list. + /// + /// This function does not return a `result`; polling in itself does not + /// do any I/O so it doesn't fail. If any of the I/O sources identified by + /// the pollables has an error, it is indicated by marking the source as + /// being reaedy for I/O. + poll: func(in: list>) -> list; +} diff --git a/wit-2023-11-10/deps/io/streams.wit b/wit-2023-11-10/deps/io/streams.wit new file mode 100644 index 000000000..e7e1b689a --- /dev/null +++ b/wit-2023-11-10/deps/io/streams.wit @@ -0,0 +1,251 @@ +package wasi:io@0.2.0-rc-2023-11-10; + +/// WASI I/O is an I/O abstraction API which is currently focused on providing +/// stream types. +/// +/// In the future, the component model is expected to add built-in stream types; +/// when it does, they are expected to subsume this API. +interface streams { + use error.{error}; + use poll.{pollable}; + + /// An error for input-stream and output-stream operations. + variant stream-error { + /// The last operation (a write or flush) failed before completion. + /// + /// More information is available in the `error` payload. + last-operation-failed(error), + /// The stream is closed: no more input will be accepted by the + /// stream. A closed output-stream will return this error on all + /// future operations. + closed + } + + /// An input bytestream. + /// + /// `input-stream`s are *non-blocking* to the extent practical on underlying + /// platforms. I/O operations always return promptly; if fewer bytes are + /// promptly available than requested, they return the number of bytes promptly + /// available, which could even be zero. To wait for data to be available, + /// use the `subscribe` function to obtain a `pollable` which can be polled + /// for using `wasi:io/poll`. + resource input-stream { + /// Perform a non-blocking read from the stream. + /// + /// This function returns a list of bytes containing the read data, + /// when successful. The returned list will contain up to `len` bytes; + /// it may return fewer than requested, but not more. The list is + /// empty when no bytes are available for reading at this time. The + /// pollable given by `subscribe` will be ready when more bytes are + /// available. + /// + /// This function fails with a `stream-error` when the operation + /// encounters an error, giving `last-operation-failed`, or when the + /// stream is closed, giving `closed`. + /// + /// When the caller gives a `len` of 0, it represents a request to + /// read 0 bytes. If the stream is still open, this call should + /// succeed and return an empty list, or otherwise fail with `closed`. + /// + /// The `len` parameter is a `u64`, which could represent a list of u8 which + /// is not possible to allocate in wasm32, or not desirable to allocate as + /// as a return value by the callee. The callee may return a list of bytes + /// less than `len` in size while more bytes are available for reading. + read: func( + /// The maximum number of bytes to read + len: u64 + ) -> result, stream-error>; + + /// Read bytes from a stream, after blocking until at least one byte can + /// be read. Except for blocking, behavior is identical to `read`. + blocking-read: func( + /// The maximum number of bytes to read + len: u64 + ) -> result, stream-error>; + + /// Skip bytes from a stream. Returns number of bytes skipped. + /// + /// Behaves identical to `read`, except instead of returning a list + /// of bytes, returns the number of bytes consumed from the stream. + skip: func( + /// The maximum number of bytes to skip. + len: u64, + ) -> result; + + /// Skip bytes from a stream, after blocking until at least one byte + /// can be skipped. Except for blocking behavior, identical to `skip`. + blocking-skip: func( + /// The maximum number of bytes to skip. + len: u64, + ) -> result; + + /// Create a `pollable` which will resolve once either the specified stream + /// has bytes available to read or the other end of the stream has been + /// closed. + /// The created `pollable` is a child resource of the `input-stream`. + /// Implementations may trap if the `input-stream` is dropped before + /// all derived `pollable`s created with this function are dropped. + subscribe: func() -> pollable; + } + + + /// An output bytestream. + /// + /// `output-stream`s are *non-blocking* to the extent practical on + /// underlying platforms. Except where specified otherwise, I/O operations also + /// always return promptly, after the number of bytes that can be written + /// promptly, which could even be zero. To wait for the stream to be ready to + /// accept data, the `subscribe` function to obtain a `pollable` which can be + /// polled for using `wasi:io/poll`. + resource output-stream { + /// Check readiness for writing. This function never blocks. + /// + /// Returns the number of bytes permitted for the next call to `write`, + /// or an error. Calling `write` with more bytes than this function has + /// permitted will trap. + /// + /// When this function returns 0 bytes, the `subscribe` pollable will + /// become ready when this function will report at least 1 byte, or an + /// error. + check-write: func() -> result; + + /// Perform a write. This function never blocks. + /// + /// Precondition: check-write gave permit of Ok(n) and contents has a + /// length of less than or equal to n. Otherwise, this function will trap. + /// + /// returns Err(closed) without writing if the stream has closed since + /// the last call to check-write provided a permit. + write: func( + contents: list + ) -> result<_, stream-error>; + + /// Perform a write of up to 4096 bytes, and then flush the stream. Block + /// until all of these operations are complete, or an error occurs. + /// + /// This is a convenience wrapper around the use of `check-write`, + /// `subscribe`, `write`, and `flush`, and is implemented with the + /// following pseudo-code: + /// + /// ```text + /// let pollable = this.subscribe(); + /// while !contents.is_empty() { + /// // Wait for the stream to become writable + /// poll-one(pollable); + /// let Ok(n) = this.check-write(); // eliding error handling + /// let len = min(n, contents.len()); + /// let (chunk, rest) = contents.split_at(len); + /// this.write(chunk ); // eliding error handling + /// contents = rest; + /// } + /// this.flush(); + /// // Wait for completion of `flush` + /// poll-one(pollable); + /// // Check for any errors that arose during `flush` + /// let _ = this.check-write(); // eliding error handling + /// ``` + blocking-write-and-flush: func( + contents: list + ) -> result<_, stream-error>; + + /// Request to flush buffered output. This function never blocks. + /// + /// This tells the output-stream that the caller intends any buffered + /// output to be flushed. the output which is expected to be flushed + /// is all that has been passed to `write` prior to this call. + /// + /// Upon calling this function, the `output-stream` will not accept any + /// writes (`check-write` will return `ok(0)`) until the flush has + /// completed. The `subscribe` pollable will become ready when the + /// flush has completed and the stream can accept more writes. + flush: func() -> result<_, stream-error>; + + /// Request to flush buffered output, and block until flush completes + /// and stream is ready for writing again. + blocking-flush: func() -> result<_, stream-error>; + + /// Create a `pollable` which will resolve once the output-stream + /// is ready for more writing, or an error has occured. When this + /// pollable is ready, `check-write` will return `ok(n)` with n>0, or an + /// error. + /// + /// If the stream is closed, this pollable is always ready immediately. + /// + /// The created `pollable` is a child resource of the `output-stream`. + /// Implementations may trap if the `output-stream` is dropped before + /// all derived `pollable`s created with this function are dropped. + subscribe: func() -> pollable; + + /// Write zeroes to a stream. + /// + /// this should be used precisely like `write` with the exact same + /// preconditions (must use check-write first), but instead of + /// passing a list of bytes, you simply pass the number of zero-bytes + /// that should be written. + write-zeroes: func( + /// The number of zero-bytes to write + len: u64 + ) -> result<_, stream-error>; + + /// Perform a write of up to 4096 zeroes, and then flush the stream. + /// Block until all of these operations are complete, or an error + /// occurs. + /// + /// This is a convenience wrapper around the use of `check-write`, + /// `subscribe`, `write-zeroes`, and `flush`, and is implemented with + /// the following pseudo-code: + /// + /// ```text + /// let pollable = this.subscribe(); + /// while num_zeroes != 0 { + /// // Wait for the stream to become writable + /// poll-one(pollable); + /// let Ok(n) = this.check-write(); // eliding error handling + /// let len = min(n, num_zeroes); + /// this.write-zeroes(len); // eliding error handling + /// num_zeroes -= len; + /// } + /// this.flush(); + /// // Wait for completion of `flush` + /// poll-one(pollable); + /// // Check for any errors that arose during `flush` + /// let _ = this.check-write(); // eliding error handling + /// ``` + blocking-write-zeroes-and-flush: func( + /// The number of zero-bytes to write + len: u64 + ) -> result<_, stream-error>; + + /// Read from one stream and write to another. + /// + /// The behavior of splice is equivelant to: + /// 1. calling `check-write` on the `output-stream` + /// 2. calling `read` on the `input-stream` with the smaller of the + /// `check-write` permitted length and the `len` provided to `splice` + /// 3. calling `write` on the `output-stream` with that read data. + /// + /// Any error reported by the call to `check-write`, `read`, or + /// `write` ends the splice and reports that error. + /// + /// This function returns the number of bytes transferred; it may be less + /// than `len`. + splice: func( + /// The stream to read from + src: borrow, + /// The number of bytes to splice + len: u64, + ) -> result; + + /// Read from one stream and write to another, with blocking. + /// + /// This is similar to `splice`, except that it blocks until the + /// `output-stream` is ready for writing, and the `input-stream` + /// is ready for reading, before performing the `splice`. + blocking-splice: func( + /// The stream to read from + src: borrow, + /// The number of bytes to splice + len: u64, + ) -> result; + } +} diff --git a/wit-2023-11-10/deps/io/world.wit b/wit-2023-11-10/deps/io/world.wit new file mode 100644 index 000000000..8243da2ee --- /dev/null +++ b/wit-2023-11-10/deps/io/world.wit @@ -0,0 +1,6 @@ +package wasi:io@0.2.0-rc-2023-11-10; + +world imports { + import streams; + import poll; +} diff --git a/wit-2023-11-10/deps/random/insecure-seed.wit b/wit-2023-11-10/deps/random/insecure-seed.wit new file mode 100644 index 000000000..f76e87dad --- /dev/null +++ b/wit-2023-11-10/deps/random/insecure-seed.wit @@ -0,0 +1,25 @@ +package wasi:random@0.2.0-rc-2023-11-10; +/// The insecure-seed interface for seeding hash-map DoS resistance. +/// +/// It is intended to be portable at least between Unix-family platforms and +/// Windows. +interface insecure-seed { + /// Return a 128-bit value that may contain a pseudo-random value. + /// + /// The returned value is not required to be computed from a CSPRNG, and may + /// even be entirely deterministic. Host implementations are encouraged to + /// provide pseudo-random values to any program exposed to + /// attacker-controlled content, to enable DoS protection built into many + /// languages' hash-map implementations. + /// + /// This function is intended to only be called once, by a source language + /// to initialize Denial Of Service (DoS) protection in its hash-map + /// implementation. + /// + /// # Expected future evolution + /// + /// This will likely be changed to a value import, to prevent it from being + /// called multiple times and potentially used for purposes other than DoS + /// protection. + insecure-seed: func() -> tuple; +} diff --git a/wit-2023-11-10/deps/random/insecure.wit b/wit-2023-11-10/deps/random/insecure.wit new file mode 100644 index 000000000..ec7b99737 --- /dev/null +++ b/wit-2023-11-10/deps/random/insecure.wit @@ -0,0 +1,22 @@ +package wasi:random@0.2.0-rc-2023-11-10; +/// The insecure interface for insecure pseudo-random numbers. +/// +/// It is intended to be portable at least between Unix-family platforms and +/// Windows. +interface insecure { + /// Return `len` insecure pseudo-random bytes. + /// + /// This function is not cryptographically secure. Do not use it for + /// anything related to security. + /// + /// There are no requirements on the values of the returned bytes, however + /// implementations are encouraged to return evenly distributed values with + /// a long period. + get-insecure-random-bytes: func(len: u64) -> list; + + /// Return an insecure pseudo-random `u64` value. + /// + /// This function returns the same type of pseudo-random data as + /// `get-insecure-random-bytes`, represented as a `u64`. + get-insecure-random-u64: func() -> u64; +} diff --git a/wit-2023-11-10/deps/random/random.wit b/wit-2023-11-10/deps/random/random.wit new file mode 100644 index 000000000..7a7dfa27a --- /dev/null +++ b/wit-2023-11-10/deps/random/random.wit @@ -0,0 +1,26 @@ +package wasi:random@0.2.0-rc-2023-11-10; +/// WASI Random is a random data API. +/// +/// It is intended to be portable at least between Unix-family platforms and +/// Windows. +interface random { + /// Return `len` cryptographically-secure random or pseudo-random bytes. + /// + /// This function must produce data at least as cryptographically secure and + /// fast as an adequately seeded cryptographically-secure pseudo-random + /// number generator (CSPRNG). It must not block, from the perspective of + /// the calling program, under any circumstances, including on the first + /// request and on requests for numbers of bytes. The returned data must + /// always be unpredictable. + /// + /// This function must always return fresh data. Deterministic environments + /// must omit this function, rather than implementing it with deterministic + /// data. + get-random-bytes: func(len: u64) -> list; + + /// Return a cryptographically-secure random or pseudo-random `u64` value. + /// + /// This function returns the same type of data as `get-random-bytes`, + /// represented as a `u64`. + get-random-u64: func() -> u64; +} diff --git a/wit-2023-11-10/deps/random/world.wit b/wit-2023-11-10/deps/random/world.wit new file mode 100644 index 000000000..49e5743b4 --- /dev/null +++ b/wit-2023-11-10/deps/random/world.wit @@ -0,0 +1,7 @@ +package wasi:random@0.2.0-rc-2023-11-10; + +world imports { + import random; + import insecure; + import insecure-seed; +} diff --git a/wit-2023-11-10/deps/sockets/instance-network.wit b/wit-2023-11-10/deps/sockets/instance-network.wit new file mode 100644 index 000000000..e455d0ff7 --- /dev/null +++ b/wit-2023-11-10/deps/sockets/instance-network.wit @@ -0,0 +1,9 @@ + +/// This interface provides a value-export of the default network handle.. +interface instance-network { + use network.{network}; + + /// Get a handle to the default network. + instance-network: func() -> network; + +} diff --git a/wit-2023-11-10/deps/sockets/ip-name-lookup.wit b/wit-2023-11-10/deps/sockets/ip-name-lookup.wit new file mode 100644 index 000000000..931ccf7e0 --- /dev/null +++ b/wit-2023-11-10/deps/sockets/ip-name-lookup.wit @@ -0,0 +1,51 @@ + +interface ip-name-lookup { + use wasi:io/poll@0.2.0-rc-2023-11-10.{pollable}; + use network.{network, error-code, ip-address}; + + + /// Resolve an internet host name to a list of IP addresses. + /// + /// Unicode domain names are automatically converted to ASCII using IDNA encoding. + /// If the input is an IP address string, the address is parsed and returned + /// as-is without making any external requests. + /// + /// See the wasi-socket proposal README.md for a comparison with getaddrinfo. + /// + /// This function never blocks. It either immediately fails or immediately + /// returns successfully with a `resolve-address-stream` that can be used + /// to (asynchronously) fetch the results. + /// + /// # Typical errors + /// - `invalid-argument`: `name` is a syntactically invalid domain name or IP address. + /// + /// # References: + /// - + /// - + /// - + /// - + resolve-addresses: func(network: borrow, name: string) -> result; + + resource resolve-address-stream { + /// Returns the next address from the resolver. + /// + /// This function should be called multiple times. On each call, it will + /// return the next address in connection order preference. If all + /// addresses have been exhausted, this function returns `none`. + /// + /// This function never returns IPv4-mapped IPv6 addresses. + /// + /// # Typical errors + /// - `name-unresolvable`: Name does not exist or has no suitable associated IP addresses. (EAI_NONAME, EAI_NODATA, EAI_ADDRFAMILY) + /// - `temporary-resolver-failure`: A temporary failure in name resolution occurred. (EAI_AGAIN) + /// - `permanent-resolver-failure`: A permanent failure in name resolution occurred. (EAI_FAIL) + /// - `would-block`: A result is not available yet. (EWOULDBLOCK, EAGAIN) + resolve-next-address: func() -> result, error-code>; + + /// Create a `pollable` which will resolve once the stream is ready for I/O. + /// + /// Note: this function is here for WASI Preview2 only. + /// It's planned to be removed when `future` is natively supported in Preview3. + subscribe: func() -> pollable; + } +} diff --git a/wit-2023-11-10/deps/sockets/network.wit b/wit-2023-11-10/deps/sockets/network.wit new file mode 100644 index 000000000..6bb07cd6f --- /dev/null +++ b/wit-2023-11-10/deps/sockets/network.wit @@ -0,0 +1,147 @@ + +interface network { + /// An opaque resource that represents access to (a subset of) the network. + /// This enables context-based security for networking. + /// There is no need for this to map 1:1 to a physical network interface. + resource network; + + /// Error codes. + /// + /// In theory, every API can return any error code. + /// In practice, API's typically only return the errors documented per API + /// combined with a couple of errors that are always possible: + /// - `unknown` + /// - `access-denied` + /// - `not-supported` + /// - `out-of-memory` + /// - `concurrency-conflict` + /// + /// See each individual API for what the POSIX equivalents are. They sometimes differ per API. + enum error-code { + // ### GENERAL ERRORS ### + + /// Unknown error + unknown, + + /// Access denied. + /// + /// POSIX equivalent: EACCES, EPERM + access-denied, + + /// The operation is not supported. + /// + /// POSIX equivalent: EOPNOTSUPP + not-supported, + + /// One of the arguments is invalid. + /// + /// POSIX equivalent: EINVAL + invalid-argument, + + /// Not enough memory to complete the operation. + /// + /// POSIX equivalent: ENOMEM, ENOBUFS, EAI_MEMORY + out-of-memory, + + /// The operation timed out before it could finish completely. + timeout, + + /// This operation is incompatible with another asynchronous operation that is already in progress. + /// + /// POSIX equivalent: EALREADY + concurrency-conflict, + + /// Trying to finish an asynchronous operation that: + /// - has not been started yet, or: + /// - was already finished by a previous `finish-*` call. + /// + /// Note: this is scheduled to be removed when `future`s are natively supported. + not-in-progress, + + /// The operation has been aborted because it could not be completed immediately. + /// + /// Note: this is scheduled to be removed when `future`s are natively supported. + would-block, + + + + // ### TCP & UDP SOCKET ERRORS ### + + /// The operation is not valid in the socket's current state. + invalid-state, + + /// A new socket resource could not be created because of a system limit. + new-socket-limit, + + /// A bind operation failed because the provided address is not an address that the `network` can bind to. + address-not-bindable, + + /// A bind operation failed because the provided address is already in use or because there are no ephemeral ports available. + address-in-use, + + /// The remote address is not reachable + remote-unreachable, + + + // ### TCP SOCKET ERRORS ### + + /// The connection was forcefully rejected + connection-refused, + + /// The connection was reset. + connection-reset, + + /// A connection was aborted. + connection-aborted, + + + // ### UDP SOCKET ERRORS ### + datagram-too-large, + + + // ### NAME LOOKUP ERRORS ### + + /// Name does not exist or has no suitable associated IP addresses. + name-unresolvable, + + /// A temporary failure in name resolution occurred. + temporary-resolver-failure, + + /// A permanent failure in name resolution occurred. + permanent-resolver-failure, + } + + enum ip-address-family { + /// Similar to `AF_INET` in POSIX. + ipv4, + + /// Similar to `AF_INET6` in POSIX. + ipv6, + } + + type ipv4-address = tuple; + type ipv6-address = tuple; + + variant ip-address { + ipv4(ipv4-address), + ipv6(ipv6-address), + } + + record ipv4-socket-address { + port: u16, // sin_port + address: ipv4-address, // sin_addr + } + + record ipv6-socket-address { + port: u16, // sin6_port + flow-info: u32, // sin6_flowinfo + address: ipv6-address, // sin6_addr + scope-id: u32, // sin6_scope_id + } + + variant ip-socket-address { + ipv4(ipv4-socket-address), + ipv6(ipv6-socket-address), + } + +} diff --git a/wit-2023-11-10/deps/sockets/tcp-create-socket.wit b/wit-2023-11-10/deps/sockets/tcp-create-socket.wit new file mode 100644 index 000000000..768a07c85 --- /dev/null +++ b/wit-2023-11-10/deps/sockets/tcp-create-socket.wit @@ -0,0 +1,26 @@ + +interface tcp-create-socket { + use network.{network, error-code, ip-address-family}; + use tcp.{tcp-socket}; + + /// Create a new TCP socket. + /// + /// Similar to `socket(AF_INET or AF_INET6, SOCK_STREAM, IPPROTO_TCP)` in POSIX. + /// + /// This function does not require a network capability handle. This is considered to be safe because + /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind`/`listen`/`connect` + /// is called, the socket is effectively an in-memory configuration object, unable to communicate with the outside world. + /// + /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations. + /// + /// # Typical errors + /// - `not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT) + /// - `new-socket-limit`: The new socket resource could not be created because of a system limit. (EMFILE, ENFILE) + /// + /// # References + /// - + /// - + /// - + /// - + create-tcp-socket: func(address-family: ip-address-family) -> result; +} diff --git a/wit-2023-11-10/deps/sockets/tcp.wit b/wit-2023-11-10/deps/sockets/tcp.wit new file mode 100644 index 000000000..b01b65e6c --- /dev/null +++ b/wit-2023-11-10/deps/sockets/tcp.wit @@ -0,0 +1,321 @@ + +interface tcp { + use wasi:io/streams@0.2.0-rc-2023-11-10.{input-stream, output-stream}; + use wasi:io/poll@0.2.0-rc-2023-11-10.{pollable}; + use wasi:clocks/monotonic-clock@0.2.0-rc-2023-11-10.{duration}; + use network.{network, error-code, ip-socket-address, ip-address-family}; + + enum shutdown-type { + /// Similar to `SHUT_RD` in POSIX. + receive, + + /// Similar to `SHUT_WR` in POSIX. + send, + + /// Similar to `SHUT_RDWR` in POSIX. + both, + } + + + /// A TCP socket handle. + resource tcp-socket { + /// Bind the socket to a specific network on the provided IP address and port. + /// + /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which + /// network interface(s) to bind to. + /// If the TCP/UDP port is zero, the socket will be bound to a random free port. + /// + /// When a socket is not explicitly bound, the first invocation to a listen or connect operation will + /// implicitly bind the socket. + /// + /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts. + /// + /// # Typical `start` errors + /// - `invalid-argument`: The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows) + /// - `invalid-argument`: `local-address` is not a unicast address. (EINVAL) + /// - `invalid-argument`: `local-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL) + /// - `invalid-state`: The socket is already bound. (EINVAL) + /// + /// # Typical `finish` errors + /// - `address-in-use`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows) + /// - `address-in-use`: Address is already in use. (EADDRINUSE) + /// - `address-not-bindable`: `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL) + /// - `not-in-progress`: A `bind` operation is not in progress. + /// - `would-block`: Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN) + /// + /// # References + /// - + /// - + /// - + /// - + start-bind: func(network: borrow, local-address: ip-socket-address) -> result<_, error-code>; + finish-bind: func() -> result<_, error-code>; + + /// Connect to a remote endpoint. + /// + /// On success: + /// - the socket is transitioned into the Connection state + /// - a pair of streams is returned that can be used to read & write to the connection + /// + /// POSIX mentions: + /// > If connect() fails, the state of the socket is unspecified. Conforming applications should + /// > close the file descriptor and create a new socket before attempting to reconnect. + /// + /// WASI prescribes the following behavior: + /// - If `connect` fails because an input/state validation error, the socket should remain usable. + /// - If a connection was actually attempted but failed, the socket should become unusable for further network communication. + /// Besides `drop`, any method after such a failure may return an error. + /// + /// # Typical `start` errors + /// - `invalid-argument`: The `remote-address` has the wrong address family. (EAFNOSUPPORT) + /// - `invalid-argument`: `remote-address` is not a unicast address. (EINVAL, ENETUNREACH on Linux, EAFNOSUPPORT on MacOS) + /// - `invalid-argument`: `remote-address` is an IPv4-mapped IPv6 address, but the socket has `ipv6-only` enabled. (EINVAL, EADDRNOTAVAIL on Illumos) + /// - `invalid-argument`: `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa) + /// - `invalid-argument`: The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EADDRNOTAVAIL on Windows) + /// - `invalid-argument`: The port in `remote-address` is set to 0. (EADDRNOTAVAIL on Windows) + /// - `invalid-argument`: The socket is already attached to a different network. The `network` passed to `connect` must be identical to the one passed to `bind`. + /// - `invalid-state`: The socket is already in the Connection state. (EISCONN) + /// - `invalid-state`: The socket is already in the Listener state. (EOPNOTSUPP, EINVAL on Windows) + /// + /// # Typical `finish` errors + /// - `timeout`: Connection timed out. (ETIMEDOUT) + /// - `connection-refused`: The connection was forcefully rejected. (ECONNREFUSED) + /// - `connection-reset`: The connection was reset. (ECONNRESET) + /// - `connection-aborted`: The connection was aborted. (ECONNABORTED) + /// - `remote-unreachable`: The remote address is not reachable. (EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET) + /// - `address-in-use`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD) + /// - `not-in-progress`: A `connect` operation is not in progress. + /// - `would-block`: Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN) + /// + /// # References + /// - + /// - + /// - + /// - + start-connect: func(network: borrow, remote-address: ip-socket-address) -> result<_, error-code>; + finish-connect: func() -> result, error-code>; + + /// Start listening for new connections. + /// + /// Transitions the socket into the Listener state. + /// + /// Unlike POSIX: + /// - this function is async. This enables interactive WASI hosts to inject permission prompts. + /// - the socket must already be explicitly bound. + /// + /// # Typical `start` errors + /// - `invalid-state`: The socket is not bound to any local address. (EDESTADDRREQ) + /// - `invalid-state`: The socket is already in the Connection state. (EISCONN, EINVAL on BSD) + /// - `invalid-state`: The socket is already in the Listener state. + /// + /// # Typical `finish` errors + /// - `address-in-use`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE) + /// - `not-in-progress`: A `listen` operation is not in progress. + /// - `would-block`: Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN) + /// + /// # References + /// - + /// - + /// - + /// - + start-listen: func() -> result<_, error-code>; + finish-listen: func() -> result<_, error-code>; + + /// Accept a new client socket. + /// + /// The returned socket is bound and in the Connection state. The following properties are inherited from the listener socket: + /// - `address-family` + /// - `ipv6-only` + /// - `keep-alive-enabled` + /// - `keep-alive-idle-time` + /// - `keep-alive-interval` + /// - `keep-alive-count` + /// - `hop-limit` + /// - `receive-buffer-size` + /// - `send-buffer-size` + /// + /// On success, this function returns the newly accepted client socket along with + /// a pair of streams that can be used to read & write to the connection. + /// + /// # Typical errors + /// - `invalid-state`: Socket is not in the Listener state. (EINVAL) + /// - `would-block`: No pending connections at the moment. (EWOULDBLOCK, EAGAIN) + /// - `connection-aborted`: An incoming connection was pending, but was terminated by the client before this listener could accept it. (ECONNABORTED) + /// - `new-socket-limit`: The new socket resource could not be created because of a system limit. (EMFILE, ENFILE) + /// + /// # References + /// - + /// - + /// - + /// - + accept: func() -> result, error-code>; + + /// Get the bound local address. + /// + /// POSIX mentions: + /// > If the socket has not been bound to a local name, the value + /// > stored in the object pointed to by `address` is unspecified. + /// + /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet. + /// + /// # Typical errors + /// - `invalid-state`: The socket is not bound to any local address. + /// + /// # References + /// - + /// - + /// - + /// - + local-address: func() -> result; + + /// Get the remote address. + /// + /// # Typical errors + /// - `invalid-state`: The socket is not connected to a remote address. (ENOTCONN) + /// + /// # References + /// - + /// - + /// - + /// - + remote-address: func() -> result; + + /// Whether the socket is listening for new connections. + /// + /// Equivalent to the SO_ACCEPTCONN socket option. + is-listening: func() -> bool; + + /// Whether this is a IPv4 or IPv6 socket. + /// + /// Equivalent to the SO_DOMAIN socket option. + address-family: func() -> ip-address-family; + + /// Whether IPv4 compatibility (dual-stack) mode is disabled or not. + /// + /// Equivalent to the IPV6_V6ONLY socket option. + /// + /// # Typical errors + /// - `invalid-state`: (set) The socket is already bound. + /// - `not-supported`: (get/set) `this` socket is an IPv4 socket. + /// - `not-supported`: (set) Host does not support dual-stack sockets. (Implementations are not required to.) + ipv6-only: func() -> result; + set-ipv6-only: func(value: bool) -> result<_, error-code>; + + /// Hints the desired listen queue size. Implementations are free to ignore this. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// + /// # Typical errors + /// - `not-supported`: (set) The platform does not support changing the backlog size after the initial listen. + /// - `invalid-argument`: (set) The provided value was 0. + /// - `invalid-state`: (set) The socket is already in the Connection state. + set-listen-backlog-size: func(value: u64) -> result<_, error-code>; + + /// Enables or disables keepalive. + /// + /// The keepalive behavior can be adjusted using: + /// - `keep-alive-idle-time` + /// - `keep-alive-interval` + /// - `keep-alive-count` + /// These properties can be configured while `keep-alive-enabled` is false, but only come into effect when `keep-alive-enabled` is true. + /// + /// Equivalent to the SO_KEEPALIVE socket option. + keep-alive-enabled: func() -> result; + set-keep-alive-enabled: func(value: bool) -> result<_, error-code>; + + /// Amount of time the connection has to be idle before TCP starts sending keepalive packets. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// I.e. after setting a value, reading the same setting back may return a different value. + /// + /// Equivalent to the TCP_KEEPIDLE socket option. (TCP_KEEPALIVE on MacOS) + /// + /// # Typical errors + /// - `invalid-argument`: (set) The provided value was 0. + keep-alive-idle-time: func() -> result; + set-keep-alive-idle-time: func(value: duration) -> result<_, error-code>; + + /// The time between keepalive packets. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// I.e. after setting a value, reading the same setting back may return a different value. + /// + /// Equivalent to the TCP_KEEPINTVL socket option. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The provided value was 0. + keep-alive-interval: func() -> result; + set-keep-alive-interval: func(value: duration) -> result<_, error-code>; + + /// The maximum amount of keepalive packets TCP should send before aborting the connection. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// I.e. after setting a value, reading the same setting back may return a different value. + /// + /// Equivalent to the TCP_KEEPCNT socket option. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The provided value was 0. + keep-alive-count: func() -> result; + set-keep-alive-count: func(value: u32) -> result<_, error-code>; + + /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The TTL value must be 1 or higher. + /// - `invalid-state`: (set) The socket is already in the Connection state. + /// - `invalid-state`: (set) The socket is already in the Listener state. + hop-limit: func() -> result; + set-hop-limit: func(value: u8) -> result<_, error-code>; + + /// The kernel buffer space reserved for sends/receives on this socket. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// I.e. after setting a value, reading the same setting back may return a different value. + /// + /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The provided value was 0. + /// - `invalid-state`: (set) The socket is already in the Connection state. + /// - `invalid-state`: (set) The socket is already in the Listener state. + receive-buffer-size: func() -> result; + set-receive-buffer-size: func(value: u64) -> result<_, error-code>; + send-buffer-size: func() -> result; + set-send-buffer-size: func(value: u64) -> result<_, error-code>; + + /// Create a `pollable` which will resolve once the socket is ready for I/O. + /// + /// Note: this function is here for WASI Preview2 only. + /// It's planned to be removed when `future` is natively supported in Preview3. + subscribe: func() -> pollable; + + /// Initiate a graceful shutdown. + /// + /// - receive: the socket is not expecting to receive any more data from the peer. All subsequent read + /// operations on the `input-stream` associated with this socket will return an End Of Stream indication. + /// Any data still in the receive queue at time of calling `shutdown` will be discarded. + /// - send: the socket is not expecting to send any more data to the peer. All subsequent write + /// operations on the `output-stream` associated with this socket will return an error. + /// - both: same effect as receive & send combined. + /// + /// The shutdown function does not close (drop) the socket. + /// + /// # Typical errors + /// - `invalid-state`: The socket is not in the Connection state. (ENOTCONN) + /// + /// # References + /// - + /// - + /// - + /// - + shutdown: func(shutdown-type: shutdown-type) -> result<_, error-code>; + } +} diff --git a/wit-2023-11-10/deps/sockets/udp-create-socket.wit b/wit-2023-11-10/deps/sockets/udp-create-socket.wit new file mode 100644 index 000000000..cc58234d8 --- /dev/null +++ b/wit-2023-11-10/deps/sockets/udp-create-socket.wit @@ -0,0 +1,26 @@ + +interface udp-create-socket { + use network.{network, error-code, ip-address-family}; + use udp.{udp-socket}; + + /// Create a new UDP socket. + /// + /// Similar to `socket(AF_INET or AF_INET6, SOCK_DGRAM, IPPROTO_UDP)` in POSIX. + /// + /// This function does not require a network capability handle. This is considered to be safe because + /// at time of creation, the socket is not bound to any `network` yet. Up to the moment `bind` is called, + /// the socket is effectively an in-memory configuration object, unable to communicate with the outside world. + /// + /// All sockets are non-blocking. Use the wasi-poll interface to block on asynchronous operations. + /// + /// # Typical errors + /// - `not-supported`: The specified `address-family` is not supported. (EAFNOSUPPORT) + /// - `new-socket-limit`: The new socket resource could not be created because of a system limit. (EMFILE, ENFILE) + /// + /// # References: + /// - + /// - + /// - + /// - + create-udp-socket: func(address-family: ip-address-family) -> result; +} diff --git a/wit-2023-11-10/deps/sockets/udp.wit b/wit-2023-11-10/deps/sockets/udp.wit new file mode 100644 index 000000000..c8dafadfc --- /dev/null +++ b/wit-2023-11-10/deps/sockets/udp.wit @@ -0,0 +1,277 @@ + +interface udp { + use wasi:io/poll@0.2.0-rc-2023-11-10.{pollable}; + use network.{network, error-code, ip-socket-address, ip-address-family}; + + /// A received datagram. + record incoming-datagram { + /// The payload. + /// + /// Theoretical max size: ~64 KiB. In practice, typically less than 1500 bytes. + data: list, + + /// The source address. + /// + /// This field is guaranteed to match the remote address the stream was initialized with, if any. + /// + /// Equivalent to the `src_addr` out parameter of `recvfrom`. + remote-address: ip-socket-address, + } + + /// A datagram to be sent out. + record outgoing-datagram { + /// The payload. + data: list, + + /// The destination address. + /// + /// The requirements on this field depend on how the stream was initialized: + /// - with a remote address: this field must be None or match the stream's remote address exactly. + /// - without a remote address: this field is required. + /// + /// If this value is None, the send operation is equivalent to `send` in POSIX. Otherwise it is equivalent to `sendto`. + remote-address: option, + } + + + + /// A UDP socket handle. + resource udp-socket { + /// Bind the socket to a specific network on the provided IP address and port. + /// + /// If the IP address is zero (`0.0.0.0` in IPv4, `::` in IPv6), it is left to the implementation to decide which + /// network interface(s) to bind to. + /// If the port is zero, the socket will be bound to a random free port. + /// + /// Unlike in POSIX, this function is async. This enables interactive WASI hosts to inject permission prompts. + /// + /// # Typical `start` errors + /// - `invalid-argument`: The `local-address` has the wrong address family. (EAFNOSUPPORT, EFAULT on Windows) + /// - `invalid-state`: The socket is already bound. (EINVAL) + /// + /// # Typical `finish` errors + /// - `address-in-use`: No ephemeral ports available. (EADDRINUSE, ENOBUFS on Windows) + /// - `address-in-use`: Address is already in use. (EADDRINUSE) + /// - `address-not-bindable`: `local-address` is not an address that the `network` can bind to. (EADDRNOTAVAIL) + /// - `not-in-progress`: A `bind` operation is not in progress. + /// - `would-block`: Can't finish the operation, it is still in progress. (EWOULDBLOCK, EAGAIN) + /// + /// # References + /// - + /// - + /// - + /// - + start-bind: func(network: borrow, local-address: ip-socket-address) -> result<_, error-code>; + finish-bind: func() -> result<_, error-code>; + + /// Set up inbound & outbound communication channels, optionally to a specific peer. + /// + /// This function only changes the local socket configuration and does not generate any network traffic. + /// On success, the `remote-address` of the socket is updated. The `local-address` may be updated as well, + /// based on the best network path to `remote-address`. + /// + /// When a `remote-address` is provided, the returned streams are limited to communicating with that specific peer: + /// - `send` can only be used to send to this destination. + /// - `receive` will only return datagrams sent from the provided `remote-address`. + /// + /// This method may be called multiple times on the same socket to change its association, but + /// only the most recently returned pair of streams will be operational. Implementations may trap if + /// the streams returned by a previous invocation haven't been dropped yet before calling `stream` again. + /// + /// The POSIX equivalent in pseudo-code is: + /// ```text + /// if (was previously connected) { + /// connect(s, AF_UNSPEC) + /// } + /// if (remote_address is Some) { + /// connect(s, remote_address) + /// } + /// ``` + /// + /// Unlike in POSIX, the socket must already be explicitly bound. + /// + /// # Typical errors + /// - `invalid-argument`: The `remote-address` has the wrong address family. (EAFNOSUPPORT) + /// - `invalid-argument`: `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa) + /// - `invalid-argument`: The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL) + /// - `invalid-argument`: The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL) + /// - `invalid-state`: The socket is not bound. + /// - `address-in-use`: Tried to perform an implicit bind, but there were no ephemeral ports available. (EADDRINUSE, EADDRNOTAVAIL on Linux, EAGAIN on BSD) + /// - `remote-unreachable`: The remote address is not reachable. (ECONNRESET, ENETRESET, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET) + /// - `connection-refused`: The connection was refused. (ECONNREFUSED) + /// + /// # References + /// - + /// - + /// - + /// - + %stream: func(remote-address: option) -> result, error-code>; + + /// Get the current bound address. + /// + /// POSIX mentions: + /// > If the socket has not been bound to a local name, the value + /// > stored in the object pointed to by `address` is unspecified. + /// + /// WASI is stricter and requires `local-address` to return `invalid-state` when the socket hasn't been bound yet. + /// + /// # Typical errors + /// - `invalid-state`: The socket is not bound to any local address. + /// + /// # References + /// - + /// - + /// - + /// - + local-address: func() -> result; + + /// Get the address the socket is currently streaming to. + /// + /// # Typical errors + /// - `invalid-state`: The socket is not streaming to a specific remote address. (ENOTCONN) + /// + /// # References + /// - + /// - + /// - + /// - + remote-address: func() -> result; + + /// Whether this is a IPv4 or IPv6 socket. + /// + /// Equivalent to the SO_DOMAIN socket option. + address-family: func() -> ip-address-family; + + /// Whether IPv4 compatibility (dual-stack) mode is disabled or not. + /// + /// Equivalent to the IPV6_V6ONLY socket option. + /// + /// # Typical errors + /// - `not-supported`: (get/set) `this` socket is an IPv4 socket. + /// - `invalid-state`: (set) The socket is already bound. + /// - `not-supported`: (set) Host does not support dual-stack sockets. (Implementations are not required to.) + ipv6-only: func() -> result; + set-ipv6-only: func(value: bool) -> result<_, error-code>; + + /// Equivalent to the IP_TTL & IPV6_UNICAST_HOPS socket options. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The TTL value must be 1 or higher. + unicast-hop-limit: func() -> result; + set-unicast-hop-limit: func(value: u8) -> result<_, error-code>; + + /// The kernel buffer space reserved for sends/receives on this socket. + /// + /// If the provided value is 0, an `invalid-argument` error is returned. + /// Any other value will never cause an error, but it might be silently clamped and/or rounded. + /// I.e. after setting a value, reading the same setting back may return a different value. + /// + /// Equivalent to the SO_RCVBUF and SO_SNDBUF socket options. + /// + /// # Typical errors + /// - `invalid-argument`: (set) The provided value was 0. + receive-buffer-size: func() -> result; + set-receive-buffer-size: func(value: u64) -> result<_, error-code>; + send-buffer-size: func() -> result; + set-send-buffer-size: func(value: u64) -> result<_, error-code>; + + /// Create a `pollable` which will resolve once the socket is ready for I/O. + /// + /// Note: this function is here for WASI Preview2 only. + /// It's planned to be removed when `future` is natively supported in Preview3. + subscribe: func() -> pollable; + } + + resource incoming-datagram-stream { + /// Receive messages on the socket. + /// + /// This function attempts to receive up to `max-results` datagrams on the socket without blocking. + /// The returned list may contain fewer elements than requested, but never more. + /// + /// This function returns successfully with an empty list when either: + /// - `max-results` is 0, or: + /// - `max-results` is greater than 0, but no results are immediately available. + /// This function never returns `error(would-block)`. + /// + /// # Typical errors + /// - `remote-unreachable`: The remote address is not reachable. (ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET) + /// - `connection-refused`: The connection was refused. (ECONNREFUSED) + /// + /// # References + /// - + /// - + /// - + /// - + /// - + /// - + /// - + /// - + receive: func(max-results: u64) -> result, error-code>; + + /// Create a `pollable` which will resolve once the stream is ready to receive again. + /// + /// Note: this function is here for WASI Preview2 only. + /// It's planned to be removed when `future` is natively supported in Preview3. + subscribe: func() -> pollable; + } + + resource outgoing-datagram-stream { + /// Check readiness for sending. This function never blocks. + /// + /// Returns the number of datagrams permitted for the next call to `send`, + /// or an error. Calling `send` with more datagrams than this function has + /// permitted will trap. + /// + /// When this function returns ok(0), the `subscribe` pollable will + /// become ready when this function will report at least ok(1), or an + /// error. + /// + /// Never returns `would-block`. + check-send: func() -> result; + + /// Send messages on the socket. + /// + /// This function attempts to send all provided `datagrams` on the socket without blocking and + /// returns how many messages were actually sent (or queued for sending). This function never + /// returns `error(would-block)`. If none of the datagrams were able to be sent, `ok(0)` is returned. + /// + /// This function semantically behaves the same as iterating the `datagrams` list and sequentially + /// sending each individual datagram until either the end of the list has been reached or the first error occurred. + /// If at least one datagram has been sent successfully, this function never returns an error. + /// + /// If the input list is empty, the function returns `ok(0)`. + /// + /// Each call to `send` must be permitted by a preceding `check-send`. Implementations must trap if + /// either `check-send` was not called or `datagrams` contains more items than `check-send` permitted. + /// + /// # Typical errors + /// - `invalid-argument`: The `remote-address` has the wrong address family. (EAFNOSUPPORT) + /// - `invalid-argument`: `remote-address` is a non-IPv4-mapped IPv6 address, but the socket was bound to a specific IPv4-mapped IPv6 address. (or vice versa) + /// - `invalid-argument`: The IP address in `remote-address` is set to INADDR_ANY (`0.0.0.0` / `::`). (EDESTADDRREQ, EADDRNOTAVAIL) + /// - `invalid-argument`: The port in `remote-address` is set to 0. (EDESTADDRREQ, EADDRNOTAVAIL) + /// - `invalid-argument`: The socket is in "connected" mode and `remote-address` is `some` value that does not match the address passed to `stream`. (EISCONN) + /// - `invalid-argument`: The socket is not "connected" and no value for `remote-address` was provided. (EDESTADDRREQ) + /// - `remote-unreachable`: The remote address is not reachable. (ECONNRESET, ENETRESET on Windows, EHOSTUNREACH, EHOSTDOWN, ENETUNREACH, ENETDOWN, ENONET) + /// - `connection-refused`: The connection was refused. (ECONNREFUSED) + /// - `datagram-too-large`: The datagram is too large. (EMSGSIZE) + /// + /// # References + /// - + /// - + /// - + /// - + /// - + /// - + /// - + /// - + send: func(datagrams: list) -> result; + + /// Create a `pollable` which will resolve once the stream is ready to send again. + /// + /// Note: this function is here for WASI Preview2 only. + /// It's planned to be removed when `future` is natively supported in Preview3. + subscribe: func() -> pollable; + } +} diff --git a/wit-2023-11-10/deps/sockets/world.wit b/wit-2023-11-10/deps/sockets/world.wit new file mode 100644 index 000000000..49ad8d3d9 --- /dev/null +++ b/wit-2023-11-10/deps/sockets/world.wit @@ -0,0 +1,11 @@ +package wasi:sockets@0.2.0-rc-2023-11-10; + +world imports { + import instance-network; + import network; + import udp; + import udp-create-socket; + import tcp; + import tcp-create-socket; + import ip-name-lookup; +} diff --git a/tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/test.wit b/wit-2023-11-10/test.wit similarity index 100% rename from tests/http/wasi-http-rust-0.2.0-rc-2023-11-10/wit/test.wit rename to wit-2023-11-10/test.wit