Change stream methods to require &mut

.github/workflows/ci.yaml

@@ -54,6 +54,9 @@ jobs:
     - name: wstd tests
       run: cargo test -p wstd -p wstd-axum --target wasm32-wasip2 -- --nocapture
 
+    - name: p3 wstd tests
+      run: cargo test -p wstd -p wstd-axum --target wasm32-wasip2 --no-default-features --features p3 -- --nocapture
+
     - name: test-programs tests
       run: cargo test -p test-programs -- --nocapture
       if: steps.creds.outcome == 'success'

Cargo.toml

@@ -13,9 +13,16 @@ repository.workspace = true
 rust-version.workspace = true
 
 [features]
-default = ["json"]
+default = ["json", "p2"]
 json = ["dep:serde", "dep:serde_json"]
 
+# WASI backend selection. Exactly one of these must be enabled.
+p2 = ["dep:wasip2"]
+p3 = ["dep:wasip3"]
+
+[build-dependencies]
+cfg_aliases.workspace = true
+
 [dependencies]
 anyhow.workspace = true
 async-task.workspace = true
@@ -27,9 +34,11 @@ http.workspace = true
 itoa.workspace = true
 pin-project-lite.workspace = true
 slab.workspace = true
-wasip2.workspace = true
 wstd-macro.workspace = true
 
+wasip2 = { workspace = true, optional = true }
+wasip3 = { workspace = true, optional = true }
+
 # optional
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
@@ -43,6 +52,62 @@ humantime.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
 
+[[test]]
+name = "http_first_byte_timeout"
+required-features = ["p2"]
+
+[[test]]
+name = "http_get"
+required-features = ["p2"]
+
+[[test]]
+name = "http_get_json"
+required-features = ["p2"]
+
+[[test]]
+name = "http_handle_error_code"
+required-features = ["p2"]
+
+[[test]]
+name = "http_post"
+required-features = ["p2"]
+
+[[test]]
+name = "http_post_json"
+required-features = ["p2"]
+
+[[test]]
+name = "http_timeout"
+required-features = ["p2"]
+
+[[test]]
+name = "sleep"
+required-features = ["p2"]
+
+[[example]]
+name = "complex_http_client"
+required-features = ["p2"]
+
+[[example]]
+name = "http_client"
+required-features = ["p2"]
+
+[[example]]
+name = "http_server"
+required-features = ["p2"]
+
+[[example]]
+name = "http_server_proxy"
+required-features = ["p2"]
+
+[[example]]
+name = "tcp_echo_server"
+required-features = ["p2"]
+
+[[example]]
+name = "tcp_stream_client"
+required-features = ["p2"]
+
 [workspace]
 members = [
     "axum",
@@ -72,6 +137,7 @@ async-task = "4.7"
 axum = { version = "0.8.6", default-features = false }
 bytes = "1.10.1"
 cargo_metadata = "0.22"
+cfg_aliases = "0.2"
 clap = { version = "4.5.26", features = ["derive"] }
 futures-core = "0.3.19"
 futures-lite = "1.12.0"
@@ -95,13 +161,13 @@ test-programs = { path = "test-programs" }
 tower-service = "0.3.3"
 ureq = { version = "3.1", default-features = false, features = ["json"] }
 wasip2 = "1.0"
-wstd = { path = ".", version = "=0.6.8" }
+wasip3 = "0.8"
+wstd = { path = ".", version = "=0.6.8", default-features = false }
 wstd-axum = { path = "./axum", version = "=0.6.8" }
 wstd-axum-macro = { path = "./axum/macro", version = "=0.6.8" }
 wstd-macro = { path = "./macro", version = "=0.6.8" }
 
 [package.metadata.docs.rs]
-all-features = true
 targets = [
     "wasm32-wasip2"
 ]

axum/Cargo.toml

@@ -13,12 +13,32 @@ rust-version.workspace = true
 [dependencies]
 axum.workspace = true
 tower-service.workspace = true
-wstd.workspace = true
+wstd = { workspace = true, features = ["json"] }
 wstd-axum-macro.workspace = true
 
+[features]
+default = ["p2"]
+p2 = ["wstd/p2"]
+p3 = ["wstd/p3"]
+
+[build-dependencies]
+cfg_aliases.workspace = true
+
 [dev-dependencies]
 anyhow.workspace = true
 futures-concurrency.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_qs.workspace = true
 axum = { workspace = true, features = ["query", "json", "macros"] }
+
+[[example]]
+name = "hello_world"
+required-features = ["p2"]
+
+[[example]]
+name = "hello_world_nomacro"
+required-features = ["p2"]
+
+[[example]]
+name = "weather"
+required-features = ["p2"]

axum/build.rs

@@ -0,0 +1,10 @@
+use cfg_aliases::cfg_aliases;
+
+fn main() {
+    cfg_aliases! {
+        // TODO https://github.com/bytecodealliance/wstd/issues/147: Swap these
+        // to use `target_env` instead.
+        p2: { feature = "p2" },
+        p3: { feature = "p3" },
+    }
+}

axum/src/lib.rs

@@ -1,3 +1,4 @@
+#![cfg(p2)]
 //! Support for the [`axum`] web server framework in wasi-http components, via
 //! [`wstd`].
 //!

build.rs

@@ -0,0 +1,10 @@
+use cfg_aliases::cfg_aliases;
+
+fn main() {
+    cfg_aliases! {
+        // TODO https://github.com/bytecodealliance/wstd/issues/147: Swap these
+        // to use `target_env` instead.
+        p2: { feature = "p2" },
+        p3: { feature = "p3" },
+    }
+}

examples/tcp_echo_server.rs

@@ -4,7 +4,7 @@ use wstd::net::TcpListener;
 
 #[wstd::main]
 async fn main() -> io::Result<()> {
-    let listener = TcpListener::bind("127.0.0.1:8080").await?;
+    let mut listener = TcpListener::bind("127.0.0.1:8080").await?;
     println!("Listening on {}", listener.local_addr()?);
     println!("type `nc localhost 8080` to create a TCP client");
 
@@ -14,7 +14,9 @@ async fn main() -> io::Result<()> {
         println!("Accepted from: {}", stream.peer_addr()?);
         wstd::runtime::spawn(async move {
             // If echo copy fails, we can ignore it.
-            let _ = io::copy(&stream, &stream).await;
+            let mut stream = stream;
+            let (mut read_half, mut write_half) = stream.split();
+            let _ = io::copy(&mut read_half, &mut write_half).await;
         })
         .detach();
     }

src/http/body.rs

@@ -3,7 +3,7 @@ use crate::http::{
     error::Context as _,
     fields::{header_map_from_wasi, header_map_to_wasi},
 };
-use crate::io::{AsyncInputStream, AsyncOutputStream};
+use crate::io::{AsyncInputStream, AsyncOutputStream, AsyncWrite};
 use crate::runtime::{AsyncPollable, Reactor, WaitFor};
 
 pub use ::http_body::{Body as HttpBody, Frame, SizeHint};
@@ -77,7 +77,7 @@ impl Body {
         match self.0 {
             BodyInner::Incoming(incoming) => incoming.send(outgoing_body).await,
             BodyInner::Boxed(box_body) => {
-                let out_stream = AsyncOutputStream::new(
+                let mut out_stream = AsyncOutputStream::new(
                     outgoing_body
                         .write()
                         .expect("outgoing body already written"),
@@ -108,7 +108,7 @@ impl Body {
                 }
             }
             BodyInner::Complete { data, trailers } => {
-                let out_stream = AsyncOutputStream::new(
+                let mut out_stream = AsyncOutputStream::new(
                     outgoing_body
                         .write()
                         .expect("outgoing body already written"),
@@ -348,14 +348,14 @@ impl Incoming {
     }
     async fn send(self, outgoing_body: WasiOutgoingBody) -> Result<(), Error> {
         let in_body = self.body;
-        let in_stream =
+        let mut in_stream =
             AsyncInputStream::new(in_body.stream().expect("incoming body already read"));
-        let out_stream = AsyncOutputStream::new(
+        let mut out_stream = AsyncOutputStream::new(
             outgoing_body
                 .write()
                 .expect("outgoing body already written"),
         );
-        in_stream.copy_to(&out_stream).await.map_err(|e| {
+        in_stream.copy_to(&mut out_stream).await.map_err(|e| {
             Error::from(e).context("copying incoming body stream to outgoing body stream")
         })?;
         drop(in_stream);

src/io/read.rs

@@ -28,7 +28,7 @@ pub trait AsyncRead {
     // If the `AsyncRead` implementation is an unbuffered wrapper around an
     // `AsyncInputStream`, some I/O operations can be more efficient.
     #[inline]
-    fn as_async_input_stream(&self) -> Option<&io::AsyncInputStream> {
+    fn as_async_input_stream(&mut self) -> Option<&mut io::AsyncInputStream> {
         None
     }
 }
@@ -45,7 +45,7 @@ impl<R: AsyncRead + ?Sized> AsyncRead for &mut R {
     }
 
     #[inline]
-    fn as_async_input_stream(&self) -> Option<&io::AsyncInputStream> {
+    fn as_async_input_stream(&mut self) -> Option<&mut io::AsyncInputStream> {
         (**self).as_async_input_stream()
     }
 }

src/io/stdio.rs

@@ -43,8 +43,8 @@ impl AsyncRead for Stdin {
     }
 
     #[inline]
-    fn as_async_input_stream(&self) -> Option<&AsyncInputStream> {
-        Some(&self.stream)
+    fn as_async_input_stream(&mut self) -> Option<&mut AsyncInputStream> {
+        Some(&mut self.stream)
     }
 }
 
@@ -93,7 +93,7 @@ impl AsyncWrite for Stdout {
     }
 
     #[inline]
-    fn as_async_output_stream(&self) -> Option<&AsyncOutputStream> {
+    fn as_async_output_stream(&mut self) -> Option<&mut AsyncOutputStream> {
         self.stream.as_async_output_stream()
     }
 }
@@ -143,7 +143,7 @@ impl AsyncWrite for Stderr {
     }
 
     #[inline]
-    fn as_async_output_stream(&self) -> Option<&AsyncOutputStream> {
+    fn as_async_output_stream(&mut self) -> Option<&mut AsyncOutputStream> {
         self.stream.as_async_output_stream()
     }
 }