Merge pull request #1901 from fermyon/no-more-http

No more http and `inbound-http` interfaces

Author: rylev

Cargo.lock

@@ -111,15 +111,15 @@ members = ["crates/*", "sdk/rust", "sdk/rust/macro"]
 [workspace.dependencies]
 anyhow = "1.0.75"
 tracing = { version = "0.1", features = ["log"] }
-wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a", features = [
+wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2da78ca5c4c1e5a8cbc88a8ad3accf24bb4e6cfb", features = [
   "tokio",
 ] }
-wasi-common-preview1 = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a", package = "wasi-common" }
-wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a", features = [
+wasi-common-preview1 = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2da78ca5c4c1e5a8cbc88a8ad3accf24bb4e6cfb", package = "wasi-common" }
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2da78ca5c4c1e5a8cbc88a8ad3accf24bb4e6cfb", features = [
   "component-model",
 ] }
-wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a" }
-spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "00820a455086c3d04b1a01236af03be38aac38a1" }
+wasmtime-wasi-http = { git = "https://github.com/bytecodealliance/wasmtime", rev = "2da78ca5c4c1e5a8cbc88a8ad3accf24bb4e6cfb" }
+spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" }
 hyper = { version = "=1.0.0-rc.3", features = ["full"] }
 http-body-util = "=0.1.0-rc.2"
 

Cargo.toml

@@ -20,7 +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 wasmtime_wasi_http::types::{default_send_request, WasiHttpCtx, WasiHttpView};
 
 use self::host_component::{HostComponents, HostComponentsBuilder};
 
@@ -191,7 +191,7 @@ impl<T: Send> wasmtime_wasi::preview2::WasiView for Data<T> {
     }
 }
 
-impl<T: Send> WasiHttpView for Data<T> {
+impl<T: Send + OutboundWasiHttpHandler> 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"),
@@ -202,6 +202,45 @@ impl<T: Send> WasiHttpView for Data<T> {
     fn table(&mut self) -> &mut Table {
         &mut self.table
     }
+
+    fn send_request(
+        &mut self,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized,
+    {
+        T::send_request(self, request)
+    }
+}
+
+/// Handler for wasi-http based requests
+pub trait OutboundWasiHttpHandler {
+    /// Send the request
+    fn send_request(
+        data: &mut Data<Self>,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized;
+}
+
+impl OutboundWasiHttpHandler for () {
+    fn send_request(
+        data: &mut Data<Self>,
+        request: wasmtime_wasi_http::types::OutgoingRequest,
+    ) -> wasmtime::Result<
+        wasmtime::component::Resource<wasmtime_wasi_http::types::HostFutureIncomingResponse>,
+    >
+    where
+        Self: Sized,
+    {
+        default_send_request(data, request)
+    }
 }
 
 /// An alias for [`wasmtime::Linker`] specialized to [`Data`].
@@ -222,13 +261,10 @@ pub struct EngineBuilder<T> {
     epoch_ticker_thread: bool,
 }
 
-impl<T: Send + Sync> EngineBuilder<T> {
+impl<T: Send + Sync + OutboundWasiHttpHandler> EngineBuilder<T> {
     fn new(config: &Config) -> Result<Self> {
         let engine = wasmtime::Engine::new(&config.inner)?;
-
-        let mut linker: Linker<T> = Linker::new(&engine);
-        wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
-
+        let linker: Linker<T> = Linker::new(&engine);
         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,
@@ -244,7 +280,9 @@ impl<T: Send + Sync> EngineBuilder<T> {
             epoch_ticker_thread: true,
         })
     }
+}
 
+impl<T: Send + Sync> EngineBuilder<T> {
     /// Adds definition(s) to the built [`Engine`].
     ///
     /// This method's signature is meant to be used with
@@ -345,7 +383,7 @@ pub struct Engine<T> {
     _epoch_ticker_signal: Option<Sender<()>>,
 }
 
-impl<T: Send + Sync> Engine<T> {
+impl<T: OutboundWasiHttpHandler + Send + Sync> Engine<T> {
     /// Creates a new [`EngineBuilder`] with the given [`Config`].
     pub fn builder(config: &Config) -> Result<EngineBuilder<T>> {
         EngineBuilder::new(config)

crates/core/src/lib.rs

@@ -178,6 +178,9 @@ fn test_config() -> Config {
 fn test_engine() -> Engine<()> {
     let mut builder = Engine::builder(&test_config()).unwrap();
     builder.add_host_component(MultiplierHostComponent).unwrap();
+    builder
+        .link_import(|l, _| wasmtime_wasi::preview2::command::add_to_linker(l))
+        .unwrap();
     builder.build()
 }
 
@@ -212,8 +215,8 @@ async fn run_core_wasi_test_engine<'a>(
         let mut exports = instance.exports(&mut store);
 
         let mut instance = exports
-            .instance("wasi:cli/run")
-            .context("missing the expected 'wasi:cli/run' instance")?;
+            .instance("wasi:cli/run@0.2.0-rc-2023-10-18")
+            .context("missing the expected 'wasi:cli/run@0.2.0-rc-2023-10-18' instance")?;
         instance.typed_func::<(), (Result<(), ()>,)>("run")?
     };
     update_store(&mut store);

crates/core/tests/integration_test.rs

@@ -21,14 +21,14 @@ pub struct HttpTriggerConfig {
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "lowercase", tag = "type")]
 pub enum HttpExecutorType {
-    /// The component implements the Spin HTTP interface.
+    /// The component implements an HTTP based interface.
+    ///
+    /// This can be either `fermyon:spin/inbound-http` or `wasi:http/incoming-handler`
     #[default]
-    Spin,
+    #[serde(alias = "spin")]
+    Http,
     /// The component implements the Wagi CGI interface.
     Wagi(WagiTriggerConfig),
-    /// The component implements [`wasi-http`](https://github.com/WebAssembly/wasi-http)
-    /// interface (experimental, subject to change)
-    Wasi,
 }
 
 /// Wagi specific configuration for the http executor.

crates/http/src/config.rs

@@ -2,7 +2,7 @@ spin_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 description = "A dummy manifest for testing parsing."
 name = "spin-hello-world"
-trigger = {type = "http", base = "/test"}
+trigger = { type = "http", base = "/test" }
 version = "1.0.0"
 
 [variables]
@@ -13,6 +13,7 @@ id = "http-spin"
 source = "dummy.wasm.txt"
 [component.trigger]
 route = "/hello/..."
+executor = { type = "wagi" }
 [component.config]
 message = "I'm a {{object}}"
 
@@ -21,6 +22,6 @@ id = "http-wagi"
 source = "dummy.wasm.txt"
 [component.trigger]
 route = "/waggy/..."
-executor =  { type = "wagi" }
+executor = { type = "wagi" }
 [component.config]
 message = "I'm a {{object}}"

crates/loader/tests/triggers/http.toml

@@ -24,7 +24,7 @@
       "trigger_config": {
         "component": "four-lights",
         "executor": {
-          "type": "spin"
+          "type": "http"
         },
         "route": "/lights"
       }

crates/loader/tests/ui/valid-manifest.lock

@@ -2,14 +2,14 @@ spin_version = "1"
 authors = ["Gul Madred", "Edward Jellico", "JL"]
 description = "A simple application that returns the number of lights"
 name = "chain-of-command"
-trigger = {type = "http"}
+trigger = { type = "http" }
 version = "6.11.2"
 
 [[component]]
 id = "four-lights"
 source = "wasm/dummy.wasm"
 [component.trigger]
-executor = {type = "spin"}
+executor = { type = "http" }
 route = "/lights"
 [component.environment]
 env1 = "first"

crates/loader/tests/ui/valid-manifest.toml

@@ -21,7 +21,7 @@
       "trigger_config": {
         "component": "fs",
         "executor": {
-          "type": "spin"
+          "type": "http"
         },
         "route": "/..."
       }

crates/loader/tests/ui/valid-with-files/spin.lock

@@ -1,7 +1,7 @@
 spin_version = "1"
 authors = ["Fermyon Engineering <[email protected]>"]
 name = "spin-local-source-test"
-trigger = {type = "http"}
+trigger = { type = "http" }
 version = "1.0.0"
 
 [[component]]
@@ -10,5 +10,5 @@ id = "fs"
 source = "spin-fs.wasm"
 
 [component.trigger]
-executor = {type = "spin"}
+executor = { type = "http" }
 route = "/..."