Merge pull request #1877 from fermyon/wasi-http-wasmtime-rebase

Add `wasi-http` trigger support based on `wasmtime-wasi-http` take 2

Author: rylev

Cargo.lock

@@ -78,7 +78,8 @@ subprocess = "0.2.9"
 openssl = { version = "0.10" }
 
 [dev-dependencies]
-hyper = { version = "0.14", features = ["full"] }
+hex = "0.4.3"
+hyper = { workspace = true }
 sha2 = "0.10.1"
 which = "4.2.5"
 e2e-testing = { path = "crates/e2e-testing" }
@@ -114,7 +115,10 @@ wasi-common-preview1 = { git = "https://github.com/bytecodealliance/wasmtime", r
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a", features = [
   "component-model",
 ] }
+wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a" }
 spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "84286054d632ccb8ae06c6419940b5d328229e59" }
+hyper = { version = "=1.0.0-rc.3", features = ["full"] }
+http-body-util = "=0.1.0-rc.2"
 
 [[bin]]
 name = "spin"

Cargo.toml

@@ -12,6 +12,7 @@ const RUST_HTTP_INTEGRATION_ENV_TEST: &str = "tests/http/headers-env-routes-test
 const RUST_HTTP_VAULT_CONFIG_TEST: &str = "tests/http/vault-config-test";
 const RUST_OUTBOUND_REDIS_INTEGRATION_TEST: &str = "tests/outbound-redis/http-rust-outbound-redis";
 const TIMER_TRIGGER_INTEGRATION_TEST: &str = "examples/spin-timer/app-example";
+const WASI_HTTP_INTEGRATION_TEST: &str = "examples/wasi-http-rust-async";
 
 fn main() {
     // Extract environment information to be passed to plugins.
@@ -90,6 +91,7 @@ error: the `wasm32-wasi` target is not installed
     cargo_build(RUST_HTTP_VAULT_CONFIG_TEST);
     cargo_build(RUST_OUTBOUND_REDIS_INTEGRATION_TEST);
     cargo_build(TIMER_TRIGGER_INTEGRATION_TEST);
+    cargo_build(WASI_HTTP_INTEGRATION_TEST);
 }
 
 fn build_wasm_test_program(name: &'static str, root: &'static str) {
@@ -99,6 +101,7 @@ fn build_wasm_test_program(name: &'static str, root: &'static str) {
         .build();
     println!("cargo:rerun-if-changed={root}/Cargo.toml");
     println!("cargo:rerun-if-changed={root}/Cargo.lock");
+    println!("cargo:rerun-if-changed={root}/src");
 }
 
 fn has_wasm32_wasi_target() -> bool {
@@ -129,6 +132,8 @@ fn cargo_build(dir: &str) {
         Some(dir),
         None,
     );
+    println!("cargo:rerun-if-changed={dir}/Cargo.toml");
+    println!("cargo:rerun-if-changed={dir}/src");
 }
 
 fn run<S: Into<String> + AsRef<std::ffi::OsStr>>(

build.rs

@@ -11,6 +11,7 @@ crossbeam-channel = "0.5"
 tracing = { workspace = true }
 wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }
+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"

crates/core/Cargo.toml

@@ -20,6 +20,7 @@ use crossbeam_channel::Sender;
 use tracing::instrument;
 use wasmtime::{InstanceAllocationStrategy, PoolingAllocationConfig};
 use wasmtime_wasi::preview2::Table;
+use wasmtime_wasi_http::types::{WasiHttpCtx, WasiHttpView};
 
 use self::host_component::{HostComponents, HostComponentsBuilder};
 
@@ -178,18 +179,31 @@ impl<T: Send> wasmtime_wasi::preview2::WasiView for Data<T> {
     fn ctx(&self) -> &wasmtime_wasi::preview2::WasiCtx {
         match &self.wasi {
             Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
-            Wasi::Preview2(ctx) => ctx,
+            Wasi::Preview2 { wasi_ctx, .. } => wasi_ctx,
         }
     }
 
     fn ctx_mut(&mut self) -> &mut wasmtime_wasi::preview2::WasiCtx {
         match &mut self.wasi {
             Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
-            Wasi::Preview2(ctx) => ctx,
+            Wasi::Preview2 { wasi_ctx, .. } => wasi_ctx,
         }
     }
 }
 
+impl<T: Send> WasiHttpView for Data<T> {
+    fn ctx(&mut self) -> &mut WasiHttpCtx {
+        match &mut self.wasi {
+            Wasi::Preview1(_) => panic!("using WASI Preview 1 functions with Preview 2 store"),
+            Wasi::Preview2 { wasi_http_ctx, .. } => wasi_http_ctx,
+        }
+    }
+
+    fn table(&mut self) -> &mut Table {
+        &mut self.table
+    }
+}
+
 /// An alias for [`wasmtime::Linker`] specialized to [`Data`].
 pub type ModuleLinker<T> = wasmtime::Linker<Data<T>>;
 
@@ -213,12 +227,12 @@ impl<T: Send + Sync> EngineBuilder<T> {
         let engine = wasmtime::Engine::new(&config.inner)?;
 
         let mut linker: Linker<T> = Linker::new(&engine);
-        wasmtime_wasi::preview2::command::add_to_linker(&mut linker)?;
+        wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
 
         let mut module_linker = ModuleLinker::new(&engine);
         wasmtime_wasi::tokio::add_to_linker(&mut module_linker, |data| match &mut data.wasi {
             Wasi::Preview1(ctx) => ctx,
-            Wasi::Preview2(_) => panic!("using WASI Preview 2 functions with Preview 1 store"),
+            Wasi::Preview2 { .. } => panic!("using WASI Preview 2 functions with Preview 1 store"),
         })?;
 
         Ok(Self {

crates/core/src/lib.rs

@@ -9,8 +9,10 @@ use system_interface::io::ReadReady;
 use tokio::io::{AsyncRead, AsyncWrite};
 use wasi_common_preview1 as wasi_preview1;
 use wasmtime_wasi as wasmtime_wasi_preview1;
-use wasmtime_wasi::preview2::{self as wasi_preview2, StdinStream, StdoutStream};
-use wasmtime_wasi_preview1::preview2::{HostInputStream, HostOutputStream};
+use wasmtime_wasi::preview2::{
+    self as wasi_preview2, HostInputStream, HostOutputStream, StdinStream, StdoutStream,
+};
+use wasmtime_wasi_http::types::WasiHttpCtx;
 
 use crate::{
     host_component::{HostComponents, HostComponentsData},
@@ -41,7 +43,13 @@ pub enum Wasi {
     /// Preview 1 `WasiCtx`
     Preview1(wasi_preview1::WasiCtx),
     /// Preview 2 `WasiCtx`
-    Preview2(wasi_preview2::WasiCtx),
+    Preview2 {
+        /// `wasi-cli` context
+        wasi_ctx: wasi_preview2::WasiCtx,
+
+        /// `wasi-http` context
+        wasi_http_ctx: WasiHttpCtx,
+    },
 }
 
 /// The version of Wasi being used
@@ -472,7 +480,10 @@ impl WasiCtxBuilder {
     fn build(self) -> Wasi {
         match self {
             WasiCtxBuilder::Preview1(ctx) => Wasi::Preview1(ctx),
-            WasiCtxBuilder::Preview2(mut b) => Wasi::Preview2(b.build()),
+            WasiCtxBuilder::Preview2(mut b) => Wasi::Preview2 {
+                wasi_ctx: b.build(),
+                wasi_http_ctx: WasiHttpCtx,
+            },
         }
     }
 }