feat(wasmtime-cli): restore support for wasi http module

Cargo.toml

@@ -29,7 +29,9 @@ wasmtime-cranelift = { workspace = true }
 wasmtime-environ = { workspace = true }
 wasmtime-explorer = { workspace = true }
 wasmtime-wast = { workspace = true }
-wasmtime-wasi = { workspace = true, features = ["exit"] }
+wasmtime-wasi = { workspace = true, default-features = true, features = [
+  "exit",
+] }
 wasmtime-wasi-nn = { workspace = true, optional = true }
 wasmtime-wasi-threads = { workspace = true, optional = true }
 wasmtime-wasi-http = { workspace = true, optional = true }
@@ -51,14 +53,24 @@ rustix = { workspace = true, features = ["mm", "param"] }
 
 [dev-dependencies]
 # depend again on wasmtime to activate its default features for tests
-wasmtime = { workspace = true, features = ['component-model', 'async', 'default', 'winch'] }
+wasmtime = { workspace = true, features = [
+  'component-model',
+  'async',
+  'default',
+  'winch',
+] }
 env_logger = { workspace = true }
 log = { workspace = true }
 filecheck = { workspace = true }
 tempfile = { workspace = true }
 test-programs = { path = "crates/test-programs" }
 wasmtime-runtime = { workspace = true }
-tokio = { version = "1.8.0", features = ["rt", "time", "macros", "rt-multi-thread"] }
+tokio = { version = "1.8.0", features = [
+  "rt",
+  "time",
+  "macros",
+  "rt-multi-thread",
+] }
 wast = { workspace = true }
 criterion = "0.5.0"
 num_cpus = "1.13.0"
@@ -140,8 +152,8 @@ wasmtime-jit = { path = "crates/jit", version = "=13.0.0" }
 wasmtime-jit-debug = { path = "crates/jit-debug", version = "=13.0.0" }
 wasmtime-runtime = { path = "crates/runtime", version = "=13.0.0" }
 wasmtime-wast = { path = "crates/wast", version = "=13.0.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "13.0.0" }
-wasmtime-wasi-http = { path = "crates/wasi-http", version = "=13.0.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "13.0.0", default-features = false }
+wasmtime-wasi-http = { path = "crates/wasi-http", version = "=13.0.0", default-features = false }
 wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "13.0.0" }
 wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "13.0.0" }
 wasmtime-component-util = { path = "crates/component-util", version = "=13.0.0" }
@@ -188,7 +200,9 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
 regalloc2 = "0.9.2"
 
 # cap-std family:
-target-lexicon = { version = "0.12.3", default-features = false, features = ["std"] }
+target-lexicon = { version = "0.12.3", default-features = false, features = [
+  "std",
+] }
 cap-std = "2.0.0"
 cap-rand = { version = "2.0.0", features = ["small_rng"] }
 cap-fs-ext = "2.0.0"
@@ -217,8 +231,15 @@ wit-component = "0.13.2"
 
 # Non-Bytecode Alliance maintained dependencies:
 # --------------------------
-object = { version = "0.32", default-features = false, features = ['read_core', 'elf', 'std'] }
-gimli = { version = "0.28.0", default-features = false, features = ['read', 'std'] }
+object = { version = "0.32", default-features = false, features = [
+  'read_core',
+  'elf',
+  'std',
+] }
+gimli = { version = "0.28.0", default-features = false, features = [
+  'read',
+  'std',
+] }
 anyhow = "1.0.22"
 windows-sys = "0.48.0"
 env_logger = "0.10"
@@ -267,13 +288,16 @@ jitdump = ["wasmtime/jitdump"]
 vtune = ["wasmtime/vtune"]
 wasi-nn = ["dep:wasmtime-wasi-nn"]
 wasi-threads = ["dep:wasmtime-wasi-threads"]
-wasi-http = ["dep:wasmtime-wasi-http"]
-pooling-allocator = ["wasmtime/pooling-allocator", "wasmtime-cli-flags/pooling-allocator"]
+wasi-http = ["dep:wasmtime-wasi-http", "wasmtime-wasi-http/sync"]
+pooling-allocator = [
+  "wasmtime/pooling-allocator",
+  "wasmtime-cli-flags/pooling-allocator",
+]
 all-arch = ["wasmtime/all-arch"]
 component-model = [
   "wasmtime/component-model",
   "wasmtime-wast/component-model",
-  "wasmtime-cli-flags/component-model"
+  "wasmtime-cli-flags/component-model",
 ]
 winch = ["wasmtime/winch"]
 wmemcheck = ["wasmtime/wmemcheck"]

crates/bench-api/Cargo.toml

@@ -21,7 +21,7 @@ shuffling-allocator = { version = "1.1.1", optional = true }
 target-lexicon = { workspace = true }
 wasmtime = { workspace = true }
 wasmtime-cli-flags = { workspace = true, default-features = true }
-wasmtime-wasi = { workspace = true }
+wasmtime-wasi = { workspace = true, default-features = true }
 wasmtime-wasi-nn = { workspace = true, optional = true }
 wasi-cap-std-sync = { workspace = true }
 cap-std = { workspace = true }

crates/c-api/Cargo.toml

@@ -28,7 +28,7 @@ wat = { workspace = true, optional = true }
 
 # Optional dependencies for the `wasi` feature
 wasi-cap-std-sync = { workspace = true, optional = true }
-wasmtime-wasi = { workspace = true, optional = true }
+wasmtime-wasi = { workspace = true, default-features = true, optional = true }
 cap-std = { workspace = true, optional = true }
 wasi-common = { workspace = true, optional = true }
 

crates/test-programs/Cargo.toml

@@ -21,6 +21,7 @@ http-body-util = "0.1.0-rc.2"
 hyper = { version = "1.0.0-rc.3", features = ["full"] }
 is-terminal = { workspace = true }
 tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] }
+tracing = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
@@ -36,12 +37,14 @@ wasmtime = { workspace = true, features = ['cranelift', 'component-model'] }
 
 wasi-common = { workspace = true }
 wasi-cap-std-sync = { workspace = true }
-wasmtime-wasi = { workspace = true, features = ["tokio"] }
+wasmtime-wasi = { workspace = true, default-features = true, features = [
+    "tokio",
+] }
 cap-std = { workspace = true }
 cap-rand = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 
-wasmtime-wasi-http = { workspace = true }
+wasmtime-wasi-http = { workspace = true, features = ["sync"] }
 
 [features]
 test_programs = []