[37.0.0] Final (?) crop of backports (#11706)

* async: add stream/future producers and blanket impl for `Future` (#11684)

* async: add `EmptyProducer` and blanket impl for `Future`

Signed-off-by: Roman Volosatovs <[email protected]>

* move more future/stream producers to `wasmtime` crate

Signed-off-by: Roman Volosatovs <[email protected]>

* async: allow blanket `Future` impl to trap

Signed-off-by: Roman Volosatovs <[email protected]>

* async: remove the need for `{Ready,Empty}Producer`

Signed-off-by: Roman Volosatovs <[email protected]>

---------

Signed-off-by: Roman Volosatovs <[email protected]>

* Fix a missing outparam write in the p1 adapter (#11702)

This fixes an issue found through #11701, notably the "release mode
infinite loops" behavior that was seen. The cause was when `fd_readdir`
returned after skipping all directory entries it forgot to write the
final `*bufused = 0` out-param in the early-exit, unlike the end of the
function which already sets this.

* feat(p3-http): implement `consume-body` changes (#11653)

* feat(p3-http): implement `consume-body` changes

Signed-off-by: Roman Volosatovs <[email protected]>

* Update WITs to the latest snapshot

* Use the 2025-09-16 tag instead of 2025-08-15.
* Pulls in `wasi:http` updates "officially".
* Pulls in minor `wasi:cli` updates, and that's implemented here as
  well.

---------

Signed-off-by: Roman Volosatovs <[email protected]>
Co-authored-by: Alex Crichton <[email protected]>

---------

Signed-off-by: Roman Volosatovs <[email protected]>
Co-authored-by: Roman Volosatovs <[email protected]>

Author: alexcrichton

ci/vendor-wit.sh

@@ -70,20 +70,20 @@ make_vendor "wasi-config" "config@f4d699b"
 make_vendor "wasi-keyvalue" "keyvalue@219ea36"
 
 make_vendor "wasi/src/p3" "
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
 "
 
 make_vendor "wasi-http/src/p3" "
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
-    [email protected]08-15@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
+    [email protected]09-16@wit-0.3.0-draft
 "
 
 rm -rf $cache_dir

crates/test-programs/src/bin/cli_p3_hello_stdout.rs

@@ -7,8 +7,15 @@ export!(Component);
 impl exports::wasi::cli::run::Guest for Component {
     async fn run() -> Result<(), ()> {
         let (mut tx, rx) = wit_stream::new();
-        wasi::cli::stdout::set_stdout(rx);
-        tx.write(b"hello, world\n".to_vec()).await;
+        futures::join!(
+            async {
+                wasi::cli::stdout::write_via_stream(rx).await.unwrap();
+            },
+            async {
+                tx.write(b"hello, world\n".to_vec()).await;
+                drop(tx);
+            },
+        );
         Ok(())
     }
 }

crates/test-programs/src/bin/cli_p3_much_stdout.rs

@@ -12,11 +12,16 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
 
         let bytes = string_to_write.as_bytes();
         let (mut tx, rx) = wit_stream::new();
-        wasi::cli::stdout::set_stdout(rx);
-        for _ in 0..times_to_write {
-            let result = tx.write_all(bytes.to_vec()).await;
-            assert!(result.is_empty());
-        }
+        futures::join!(
+            async { wasi::cli::stdout::write_via_stream(rx).await.unwrap() },
+            async {
+                for _ in 0..times_to_write {
+                    let result = tx.write_all(bytes.to_vec()).await;
+                    assert!(result.is_empty());
+                }
+                drop(tx);
+            }
+        );
         Ok(())
     }
 }

crates/test-programs/src/bin/p3_cli.rs

@@ -18,20 +18,37 @@ impl test_programs::p3::exports::wasi::cli::run::Guest for Component {
         assert!(terminal_stdout::get_terminal_stdout().is_none());
         assert!(terminal_stderr::get_terminal_stderr().is_none());
 
-        let mut stdin = stdin::get_stdin();
+        let (mut stdin, result) = stdin::read_via_stream();
         assert!(stdin.next().await.is_none());
 
         let (mut stdout_tx, stdout_rx) = wit_stream::new();
-        stdout::set_stdout(stdout_rx);
-        let (res, buf) = stdout_tx.write(b"hello stdout\n".into()).await;
-        assert_eq!(res, StreamResult::Complete(13));
-        assert_eq!(buf.into_vec(), []);
+        futures::join!(
+            async {
+                stdout::write_via_stream(stdout_rx).await.unwrap();
+            },
+            async {
+                let (res, buf) = stdout_tx.write(b"hello stdout\n".into()).await;
+                assert_eq!(res, StreamResult::Complete(13));
+                assert_eq!(buf.into_vec(), []);
+                drop(stdout_tx);
+            }
+        );
 
         let (mut stderr_tx, stderr_rx) = wit_stream::new();
-        stderr::set_stderr(stderr_rx);
-        let (res, buf) = stderr_tx.write(b"hello stderr\n".into()).await;
-        assert_eq!(res, StreamResult::Complete(13));
-        assert_eq!(buf.into_vec(), []);
+        futures::join!(
+            async {
+                stderr::write_via_stream(stderr_rx).await.unwrap();
+            },
+            async {
+                let (res, buf) = stderr_tx.write(b"hello stderr\n".into()).await;
+                assert_eq!(res, StreamResult::Complete(13));
+                assert_eq!(buf.into_vec(), []);
+                drop(stderr_tx);
+            }
+        );
+
+        drop(stdin);
+        result.await.unwrap();
 
         Ok(())
     }

crates/test-programs/src/bin/p3_http_echo.rs

@@ -15,9 +15,8 @@ impl Handler for Component {
     /// Return a response which echoes the request headers, body, and trailers.
     async fn handle(request: Request) -> Result<Response, ErrorCode> {
         let headers = request.get_headers();
-        let (body, trailers) = request.consume_body().unwrap();
-
-        // let (headers, body) = Request::into_parts(request);
+        let (_, result_rx) = wit_future::new(|| Ok(()));
+        let (body, trailers) = Request::consume_body(request, result_rx);
 
         let (response, _result) = if false {
             // This is the easy and efficient way to do it...
@@ -47,7 +46,6 @@ impl Handler for Component {
                 drop(pipe_tx);
 
                 trailers_tx.write(trailers.await).await.unwrap();
-                drop(request);
             });
 
             Response::new(headers, Some(pipe_rx), trailers_rx)

crates/test-programs/src/bin/p3_http_middleware.rs

@@ -48,7 +48,8 @@ impl Handler for Component {
             }
             _ => true,
         });
-        let (mut body, trailers) = request.consume_body().unwrap();
+        let (_, result_rx) = wit_future::new(|| Ok(()));
+        let (mut body, trailers) = Request::consume_body(request, result_rx);
 
         let (body, trailers) = if content_deflated {
             // Next, spawn a task to pipe and decode the original request body and trailers into a new request
@@ -77,8 +78,6 @@ impl Handler for Component {
                 }
 
                 trailers_tx.write(trailers.await).await.unwrap();
-
-                drop(request);
             });
 
             (pipe_rx, trailers_rx)
@@ -110,7 +109,8 @@ impl Handler for Component {
             headers.push(("content-encoding".into(), b"deflate".into()));
         }
 
-        let (mut body, trailers) = response.consume_body().unwrap();
+        let (_, result_rx) = wit_future::new(|| Ok(()));
+        let (mut body, trailers) = Response::consume_body(response, result_rx);
         let (body, trailers) = if accept_deflated {
             headers.retain(|(name, _value)| name != "content-length");
 
@@ -141,7 +141,6 @@ impl Handler for Component {
                 }
 
                 trailers_tx.write(trailers.await).await.unwrap();
-                drop(response);
             });
 
             (pipe_rx, trailers_rx)

crates/test-programs/src/bin/p3_http_middleware_with_chain.rs

@@ -6,13 +6,13 @@ mod bindings {
 package local:local;
 
 world middleware-with-chain {
-  include wasi:http/[email protected]08-15;
+  include wasi:http/[email protected]09-16;
 
   import chain-http;
 }
 
 interface chain-http {
-  use wasi:http/[email protected]08-15.{request, response, error-code};
+  use wasi:http/[email protected]09-16.{request, response, error-code};
 
   handle: async func(request: request) -> result<response, error-code>;
 }

crates/test-programs/src/bin/preview1_fd_readdir.rs

@@ -241,6 +241,34 @@ unsafe fn test_fd_readdir_unicode_boundary(dir_fd: wasip1::Fd) {
     wasip1::path_unlink_file(dir_fd, filename).expect("removing a file");
 }
 
+unsafe fn test_fd_readdir_past_end(dir_fd: wasip1::Fd) {
+    let file_fd = wasip1::path_open(
+        dir_fd,
+        0,
+        "a",
+        wasip1::OFLAGS_CREAT,
+        wasip1::RIGHTS_FD_READ | wasip1::RIGHTS_FD_WRITE,
+        0,
+        0,
+    )
+    .expect("failed to create file");
+    wasip1::fd_close(file_fd).expect("closing a file");
+
+    let mut buf = vec![0; 128];
+    let len = wasip1::fd_readdir(dir_fd, buf.as_mut_ptr(), buf.capacity(), 0).unwrap();
+
+    let next = ReadDir::from_slice(&buf[..len])
+        .last()
+        .unwrap()
+        .dirent
+        .d_next;
+
+    let len = wasip1::fd_readdir(dir_fd, buf.as_mut_ptr(), buf.capacity(), next + 1).unwrap();
+    assert_eq!(len, 0);
+
+    wasip1::path_unlink_file(dir_fd, "a").expect("removing a file");
+}
+
 fn main() {
     let mut args = env::args();
     let prog = args.next().unwrap();
@@ -264,4 +292,5 @@ fn main() {
     unsafe { test_fd_readdir(dir_fd) }
     unsafe { test_fd_readdir_lots(dir_fd) }
     unsafe { test_fd_readdir_unicode_boundary(dir_fd) }
+    unsafe { test_fd_readdir_past_end(dir_fd) }
 }

crates/test-programs/src/p3/http.rs

@@ -94,9 +94,8 @@ pub async fn request(
             let response = handler::handle(request).await?;
             let status = response.get_status_code();
             let headers = response.get_headers().copy_all();
-            let (body_rx, trailers_rx) = response
-                .consume_body()
-                .expect("failed to get response body");
+            let (_, result_rx) = wit_future::new(|| Ok(()));
+            let (body_rx, trailers_rx) = types::Response::consume_body(response, result_rx);
             let ((), rx) = join!(
                 async {
                     if let Some(buf) = body {

crates/test-programs/src/p3/mod.rs

@@ -6,19 +6,16 @@ wit_bindgen::generate!({
         package wasmtime:test;
 
         world testp3 {
-            include wasi:cli/[email protected]08-15;
-            include wasi:http/[email protected]08-15;
+            include wasi:cli/[email protected]09-16;
+            include wasi:http/[email protected]09-16;
 
-            export wasi:cli/[email protected]08-15;
+            export wasi:cli/[email protected]09-16;
         }
     ",
     path: "../wasi-http/src/p3/wit",
     world: "wasmtime:test/testp3",
     default_bindings_module: "test_programs::p3",
     pub_export_macro: true,
-    async: [
-        "wasi:cli/[email protected]#run",
-    ],
     generate_all,
 });
 
@@ -28,22 +25,24 @@ pub mod proxy {
             package wasmtime:test;
 
             world proxyp3 {
-                include wasi:http/[email protected]08-15;
+                include wasi:http/[email protected]09-16;
             }
         ",
         path: "../wasi-http/src/p3/wit",
         world: "wasmtime:test/proxyp3",
         default_bindings_module: "test_programs::p3::proxy",
         pub_export_macro: true,
         with: {
-            "wasi:http/[email protected]": generate,
-            "wasi:http/[email protected]": crate::p3::wasi::http::types,
-            "wasi:random/[email protected]": crate::p3::wasi::random::random,
-            "wasi:cli/[email protected]": crate::p3::wasi::cli::stdout,
-            "wasi:cli/[email protected]": crate::p3::wasi::cli::stderr,
-            "wasi:cli/[email protected]": crate::p3::wasi::cli::stdin,
-            "wasi:clocks/[email protected]": crate::p3::wasi::clocks::monotonic_clock,
-            "wasi:clocks/[email protected]": crate::p3::wasi::clocks::wall_clock,
+            "wasi:http/[email protected]": generate,
+            "wasi:http/[email protected]": crate::p3::wasi::http::types,
+            "wasi:random/[email protected]": crate::p3::wasi::random::random,
+            "wasi:cli/[email protected]": crate::p3::wasi::cli::stdout,
+            "wasi:cli/[email protected]": crate::p3::wasi::cli::stderr,
+            "wasi:cli/[email protected]": crate::p3::wasi::cli::stdin,
+            "wasi:cli/[email protected]": crate::p3::wasi::cli::types,
+            "wasi:clocks/[email protected]": crate::p3::wasi::clocks::monotonic_clock,
+            "wasi:clocks/[email protected]": crate::p3::wasi::clocks::wall_clock,
+            "wasi:clocks/[email protected]": crate::p3::wasi::clocks::types,
         },
     });
 }