Fixes

Author: MangoPeachGrape

crates/c-api/Cargo.toml

@@ -26,8 +26,6 @@ wasmtime = { workspace = true, features = ['runtime', 'gc', 'std'] }
 wasmtime-c-api-macros = { workspace = true }
 log = { workspace = true }
 tracing = { workspace = true }
-async-trait = { workspace = true }
-bytes = { workspace = true }
 
 # Optional dependency for the `wat2wasm` API
 wat = { workspace = true, optional = true }
@@ -37,6 +35,8 @@ cap-std = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true, features = ["fs"] }
 wasmtime-wasi = { workspace = true, optional = true, features = ["p1"] }
 wasmtime-wasi-io = { workspace = true, optional = true, features = ["std"] }
+async-trait = { workspace = true, optional = true }
+bytes = { workspace = true, optional = true }
 
 # Optional dependencies for the `async` feature
 futures = { workspace = true, optional = true }
@@ -47,7 +47,7 @@ async = ['wasmtime/async', 'futures']
 profiling = ["wasmtime/profiling"]
 cache = ["wasmtime/cache"]
 parallel-compilation = ['wasmtime/parallel-compilation']
-wasi = ['cap-std', 'wasmtime-wasi', 'wasmtime-wasi-io', 'tokio']
+wasi = ['cap-std', 'wasmtime-wasi', 'wasmtime-wasi-io', 'tokio', 'async-trait', 'bytes']
 logging = ['dep:env_logger']
 disable-logging = ["log/max_level_off", "tracing/max_level_off"]
 coredump = ["wasmtime/coredump"]

crates/c-api/src/wasi.rs

@@ -160,11 +160,18 @@ struct CustomOutputStreamInner {
 }
 
 impl CustomOutputStreamInner {
-    pub fn write(&self, buf: &[u8]) -> isize {
-        (self.callback)(self.foreign_data.data, buf.as_ptr(), buf.len())
+    pub fn raw_write(&self, buf: &[u8]) -> io::Result<usize> {
+        let wrote = (self.callback)(self.foreign_data.data, buf.as_ptr(), buf.len());
+
+        if wrote >= 0 {
+            Ok(wrote as _)
+        } else {
+            Err(io::Error::from_raw_os_error(wrote.abs() as _))
+        }
     }
 }
 
+#[derive(Clone)]
 pub struct CustomOutputStream {
     inner: std::sync::Arc<CustomOutputStreamInner>,
 }
@@ -183,14 +190,6 @@ impl CustomOutputStream {
     }
 }
 
-impl Clone for CustomOutputStream {
-    fn clone(&self) -> Self {
-        Self {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
 #[async_trait::async_trait]
 impl wasmtime_wasi::p2::Pollable for CustomOutputStream {
     async fn ready(&mut self) {}
@@ -199,15 +198,12 @@ impl wasmtime_wasi::p2::Pollable for CustomOutputStream {
 #[async_trait::async_trait]
 impl wasmtime_wasi::p2::OutputStream for CustomOutputStream {
     fn write(&mut self, bytes: Bytes) -> Result<(), StreamError> {
-        let wrote = self.inner.write(&bytes);
-
-        if wrote < 0 {
-            return Err(StreamError::Trap(
-                io::Error::from_raw_os_error(wrote.abs() as _).into(),
-            ));
-        }
+        let wrote = self
+            .inner
+            .raw_write(&bytes)
+            .map_err(|e| StreamError::LastOperationFailed(e.into()))?;
 
-        if wrote as usize != bytes.len() {
+        if wrote != bytes.len() {
             return Err(StreamError::Trap(anyhow::anyhow!(
                 "Partial writes in wasip2 implementation are not allowed"
             )));
@@ -229,12 +225,7 @@ impl AsyncWrite for CustomOutputStream {
         _cx: &mut Context<'_>,
         buf: &[u8],
     ) -> Poll<io::Result<usize>> {
-        let wrote = self.inner.write(buf);
-        Poll::Ready(if wrote >= 0 {
-            Ok(wrote as _)
-        } else {
-            Err(io::Error::from_raw_os_error(wrote.abs() as _))
-        })
+        Poll::Ready(self.inner.raw_write(buf))
     }
     fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         Poll::Ready(Ok(()))