add WASIp3 port of wasi-http-streaming test

This required adding the 0.3.0-rc-2025-08-15 WIT files to the tree so
`wit-bindgen` could use them.

I've also addressed Till's feedback to match only the exact 0.3.0 RC we support
when looking for the `wasi:http/handler` export.

Finally, this includes a temporary workaround for
bytecodealliance/wasmtime#11703, which was uncovered
by the streaming test added in this commit.

Signed-off-by: Joel Dice <[email protected]>

Author: dicej

Cargo.lock

@@ -11,7 +11,7 @@ use std::{
 
 use bytes::Bytes;
 use http::{header::HOST, uri::Scheme, Uri};
-use http_body::{Body, Frame};
+use http_body::{Body, Frame, SizeHint};
 use http_body_util::{combinators::BoxBody, BodyExt};
 use hyper_util::{
     client::legacy::{
@@ -166,6 +166,14 @@ impl<B: Body<Error = p2_types::ErrorCode>> Body for BetweenBytesTimeoutBody<B> {
             }
         }
     }
+
+    fn is_end_stream(&self) -> bool {
+        self.body.is_end_stream()
+    }
+
+    fn size_hint(&self) -> SizeHint {
+        self.body.size_hint()
+    }
 }
 
 pub(crate) fn add_to_linker<C>(ctx: &mut C) -> anyhow::Result<()>

crates/factor-outbound-http/src/wasi.rs

@@ -34,8 +34,8 @@ const WASI_HTTP_EXPORT_2023_10_18: &str = "wasi:http/[email protected]
 const WASI_HTTP_EXPORT_2023_11_10: &str = "wasi:http/[email protected]";
 /// The `incoming-handler` export prefix for all `wasi:http` 0.2 versions
 const WASI_HTTP_EXPORT_0_2_PREFIX: &str = "wasi:http/[email protected]";
-/// The `handler` export prefix for all `wasi:http` 0.3 versions
-const WASI_HTTP_EXPORT_0_3_PREFIX: &str = "wasi:http/[email protected]";
+/// The `handler` export `wasi:http` version 0.3.0-rc-2025-08-15
+const WASI_HTTP_EXPORT_0_3_0_RC_2025_08_15: &str = "wasi:http/[email protected].0-rc-2025-08-15";
 /// The `inbound-http` export for `fermyon:spin`
 const SPIN_HTTP_EXPORT: &str = "fermyon:spin/inbound-http";
 
@@ -70,7 +70,7 @@ impl HandlerType {
                     `{WASI_HTTP_EXPORT_2023_10_18}`, \
                     `{WASI_HTTP_EXPORT_2023_11_10}`, \
                     `{WASI_HTTP_EXPORT_0_2_PREFIX}.*`, \
-                    `{WASI_HTTP_EXPORT_0_3_PREFIX}.*`, \
+                    `{WASI_HTTP_EXPORT_0_3_0_RC_2025_08_15}`, \
                      or `{SPIN_HTTP_EXPORT}` but it exported none of those. \
                      This may mean the component handles a different trigger, or that its `wasi:http` export is newer then those supported by Spin. \
                      If you're sure this is an HTTP module, check if a Spin upgrade is available: this may handle the newer version."

crates/http/src/trigger.rs

@@ -12,9 +12,11 @@ anyhow = { workspace = true }
 clap = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
+http-body = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true }
 hyper-util = { workspace = true }
+pin-project-lite = { workspace = true }
 rustls = { workspace = true }
 rustls-pki-types = { workspace = true }
 serde = { workspace = true }

crates/trigger-http/Cargo.toml

@@ -1,11 +1,15 @@
 use crate::{server::HttpExecutor, TriggerInstanceBuilder};
-use anyhow::{Context, Result};
+use anyhow::{Context as _, Result};
 use futures::{channel::oneshot, FutureExt};
 use http_body_util::BodyExt;
 use spin_factors::RuntimeFactors;
 use spin_factors_executor::InstanceState;
 use spin_http::routes::RouteMatch;
-use std::net::SocketAddr;
+use std::{
+    net::SocketAddr,
+    pin::Pin,
+    task::{Context, Poll},
+};
 use tokio::task;
 use tracing::{instrument, Level};
 use wasmtime_wasi_http::{
@@ -59,9 +63,20 @@ impl HttpExecutor for Wasip3HttpExecutor<'_> {
                             response.into_http_with_getter(&mut store, request_io_result, getter)
                         })?;
 
-                        _ = tx.send(response);
+                        let (response_tx, response_rx) = oneshot::channel::<()>();
+                        _ = tx.send(response.map(|body| BodyWithAttachment {
+                            body,
+                            _attachment: response_tx,
+                        }));
 
                         task.block(store).await;
+
+                        // TODO: This is a temporary workaround for
+                        // https://github.com/bytecodealliance/wasmtime/issues/11703.
+                        // Remove this (and `BodyWithAttachment`) once that
+                        // issue is addressed:
+                        _ = response_rx.await;
+
                         anyhow::Ok(())
                     })
                     .await?
@@ -80,6 +95,34 @@ impl HttpExecutor for Wasip3HttpExecutor<'_> {
     }
 }
 
+pin_project_lite::pin_project! {
+    struct BodyWithAttachment<B, A> {
+        #[pin]
+        body: B,
+        _attachment: A,
+    }
+}
+
+impl<B: http_body::Body, A> http_body::Body for BodyWithAttachment<B, A> {
+    type Data = B::Data;
+    type Error = B::Error;
+
+    fn poll_frame(
+        self: Pin<&mut Self>,
+        cx: &mut Context<'_>,
+    ) -> Poll<Option<Result<http_body::Frame<Self::Data>, Self::Error>>> {
+        self.project().body.poll_frame(cx)
+    }
+
+    fn is_end_stream(&self) -> bool {
+        self.body.is_end_stream()
+    }
+
+    fn size_hint(&self) -> http_body::SizeHint {
+        self.body.size_hint()
+    }
+}
+
 fn wasi_http<F: RuntimeFactors>(
     data: &mut InstanceState<F::InstanceState, ()>,
 ) -> Result<WasiHttpCtxView<'_>> {

crates/trigger-http/src/wasip3.rs

@@ -143,7 +143,7 @@ mod integration_tests {
                             Err(e) => {
                                 return Err(
                                     anyhow::anyhow!("could not read stdout file: {e}").into()
-                                )
+                                );
                             }
                         }
                     },
@@ -201,7 +201,7 @@ mod integration_tests {
                             Err(e) => {
                                 return Err(
                                     anyhow::anyhow!("could not read stdout file: {e}").into()
-                                )
+                                );
                             }
                         }
                     },
@@ -1195,16 +1195,38 @@ route = "/..."
     }
 
     #[test]
-    fn test_wasi_http_echo() -> anyhow::Result<()> {
-        wasi_http_echo("echo".into(), None)
+    fn test_wasi_http_p2_echo() -> anyhow::Result<()> {
+        wasi_http_echo("wasi-http-p2-streaming", "echo".into(), None)
     }
 
     #[test]
-    fn test_wasi_http_double_echo() -> anyhow::Result<()> {
-        wasi_http_echo("double-echo".into(), Some("echo".into()))
+    fn test_wasi_http_p3_echo() -> anyhow::Result<()> {
+        wasi_http_echo("wasi-http-p3-streaming", "echo".into(), None)
     }
 
-    fn wasi_http_echo(uri: String, url_header_uri: Option<String>) -> anyhow::Result<()> {
+    #[test]
+    fn test_wasi_http_p2_double_echo() -> anyhow::Result<()> {
+        wasi_http_echo(
+            "wasi-http-p2-streaming",
+            "double-echo".into(),
+            Some("echo".into()),
+        )
+    }
+
+    #[test]
+    fn test_wasi_http_p3_double_echo() -> anyhow::Result<()> {
+        wasi_http_echo(
+            "wasi-http-p2-streaming",
+            "double-echo".into(),
+            Some("echo".into()),
+        )
+    }
+
+    fn wasi_http_echo(
+        test: &str,
+        uri: String,
+        url_header_uri: Option<String>,
+    ) -> anyhow::Result<()> {
         let body_bytes = {
             // A sorta-random-ish megabyte
             let mut n = 0_u8;
@@ -1227,7 +1249,7 @@ route = "/..."
         ));
 
         run_test(
-            "wasi-http-streaming",
+            test,
             SpinConfig {
                 binary_path: spin_binary(),
                 spin_up_args: Vec::new(),
@@ -1267,7 +1289,16 @@ route = "/..."
     }
 
     #[test]
-    fn test_wasi_http_hash_all() -> anyhow::Result<()> {
+    fn test_wasi_http_p2_hash_all() -> anyhow::Result<()> {
+        wasi_http_hash_all("wasi-http-p2-streaming")
+    }
+
+    #[test]
+    fn test_wasi_http_p3_hash_all() -> anyhow::Result<()> {
+        wasi_http_hash_all("wasi-http-p3-streaming")
+    }
+
+    fn wasi_http_hash_all(test: &str) -> anyhow::Result<()> {
         let requests = [
             ("/a", "’Twas brillig, and the slithy toves"),
             ("/b", "Did gyre and gimble in the wabe:"),
@@ -1277,7 +1308,7 @@ route = "/..."
         .into_iter()
         .collect::<HashMap<_, _>>();
         run_test(
-            "wasi-http-streaming",
+            test,
             SpinConfig {
                 binary_path: spin_binary(),
                 spin_up_args: Vec::new(),