chore: update Wasm deps, bump versions

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

Author: rvolosatovs

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 description = "WebAssembly component-native RPC framework based on WIT"
 name = "wrpc"
-version = "0.15.0"
+version = "0.16.0"
 
 authors.workspace = true
 categories.workspace = true
@@ -158,31 +158,31 @@ tracing-subscriber = { version = "0.3", default-features = false }
 url = { version = "2" }
 uuid = { version = "1", default-features = false }
 wasi = { version = "0.14", default-features = false }
-wasi-preview1-component-adapter-provider = { version = "34", default-features = false }
+wasi-preview1-component-adapter-provider = { version = "38", default-features = false }
 wasm-tokio = { version = "0.6", default-features = false }
-wasmparser = { version = "0.236", default-features = false }
-wasmtime = { version = "33.0.2", default-features = false }
-wasmtime-cli-flags = { version = "33.0.2", default-features = false }
-wasmtime-wasi = { version = "33.0.2", default-features = false }
-wasmtime-wasi-http = { version = "33.0.2", default-features = false }
+wasmparser = { version = "0.239", default-features = false }
+wasmtime = { version = "38", default-features = false }
+wasmtime-cli-flags = { version = "38", default-features = false }
+wasmtime-wasi = { version = "38", default-features = false }
+wasmtime-wasi-http = { version = "38", default-features = false }
 wit-bindgen = { version = "0.45", default-features = false }
 wit-bindgen-core = { version = "0.36", default-features = false }
 wit-bindgen-wrpc = { version = "0.10", default-features = false, path = "./crates/wit-bindgen" }
 wit-bindgen-wrpc-go = { version = "0.12", default-features = false, path = "./crates/wit-bindgen-go" }
 wit-bindgen-wrpc-rust = { version = "0.10", default-features = false, path = "./crates/wit-bindgen-rust" }
 wit-bindgen-wrpc-rust-macro = { version = "0.10", default-features = false, path = "./crates/wit-bindgen-rust-macro" }
-wit-component = { version = "0.230", default-features = false }
+wit-component = { version = "0.239", default-features = false }
 wit-parser = { version = "0.220", default-features = false }
-wrpc-cli = { version = "0.6", path = "./crates/cli", default-features = false }
+wrpc-cli = { version = "0.7", path = "./crates/cli", default-features = false }
 wrpc-introspect = { version = "0.7", default-features = false, path = "./crates/introspect" }
-wrpc-runtime-wasmtime = { version = "0.29", path = "./crates/runtime-wasmtime", default-features = false }
+wrpc-runtime-wasmtime = { version = "0.30", path = "./crates/runtime-wasmtime", default-features = false }
 wrpc-test = { path = "./crates/test", default-features = false }
 wrpc-transport = { version = "0.28.3", path = "./crates/transport", default-features = false }
-wrpc-transport-nats = { version = "0.29", path = "./crates/transport-nats", default-features = false }
+wrpc-transport-nats = { version = "0.30", path = "./crates/transport-nats", default-features = false }
 wrpc-transport-quic = { version = "0.5", path = "./crates/transport-quic", default-features = false }
 wrpc-transport-web = { version = "0.2", path = "./crates/transport-web", default-features = false }
 wrpc-wasi-keyvalue = { version = "0.1.1", path = "./crates/wasi-keyvalue", default-features = false }
 wrpc-wasi-keyvalue-mem = { version = "0.1", path = "./crates/wasi-keyvalue-mem", default-features = false }
 wrpc-wasi-keyvalue-redis = { version = "0.1", path = "./crates/wasi-keyvalue-redis", default-features = false }
-wrpc-wasmtime-cli = { version = "0.7", path = "./crates/wasmtime-cli", default-features = false }
+wrpc-wasmtime-cli = { version = "0.8", path = "./crates/wasmtime-cli", default-features = false }
 wtransport = { version = "0.6.1", default-features = false }

Cargo.toml

@@ -14,7 +14,7 @@ use futures::StreamExt as _;
 use tokio::select;
 use tokio::sync::oneshot;
 use wasmtime::component::{Component, Linker, ResourceTable};
-use wasmtime_wasi::p2::{IoView, WasiCtx, WasiCtxBuilder, WasiView};
+use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiCtxView, WasiView};
 
 mod ping_bindings_wrpc {
     wit_bindgen_wrpc::generate!({
@@ -24,7 +24,7 @@ mod ping_bindings_wrpc {
 }
 mod ping_bindings_wasmtime {
     wasmtime::component::bindgen!({
-        async: true,
+        exports: { default: async },
         world: "ping-proxy",
         path: "benches/wit",
     });
@@ -37,7 +37,7 @@ mod greet_bindings_wrpc {
 }
 mod greet_bindings_wasmtime {
     wasmtime::component::bindgen!({
-        async: true,
+        exports: { default: async },
         world: "greet-proxy",
         path: "benches/wit",
     });
@@ -71,15 +71,12 @@ struct Ctx {
     wasi: WasiCtx,
 }
 
-impl IoView for Ctx {
-    fn table(&mut self) -> &mut ResourceTable {
-        &mut self.table
-    }
-}
-
 impl WasiView for Ctx {
-    fn ctx(&mut self) -> &mut WasiCtx {
-        &mut self.wasi
+    fn ctx(&mut self) -> WasiCtxView<'_> {
+        WasiCtxView {
+            ctx: &mut self.wasi,
+            table: &mut self.table,
+        }
     }
 }
 

benches/bench.rs

@@ -1,6 +1,6 @@
 [package]
 name = "wrpc-cli"
-version = "0.6.0"
+version = "0.7.0"
 description = "wRPC CLI utilities"
 
 authors.workspace = true

crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wrpc-runtime-wasmtime"
-version = "0.29.0"
+version = "0.30.0"
 description = "wRPC wasmtime integration"
 
 authors.workspace = true

crates/runtime-wasmtime/Cargo.toml

@@ -9,12 +9,10 @@ mod generated {
             "wrpc:rpc/transport/invocation": crate::rpc::Invocation,
             "wrpc:rpc/transport/outgoing-channel": crate::rpc::OutgoingChannel,
         },
-        async: {
-            only_imports: [
-                "wrpc:rpc/[email protected]#[static]invocation.finish",
-            ],
+        imports: {
+            default: trappable,
+            "wrpc:rpc/[email protected]/[static]invocation.finish": async | trappable,
         },
-        trappable_imports: true,
         require_store_data_send: true,
     });
 

crates/runtime-wasmtime/src/bindings.rs

@@ -23,12 +23,12 @@ use wasmtime::component::types::{Case, Field};
 use wasmtime::component::{ResourceType, Type, Val};
 use wasmtime::{AsContextMut, StoreContextMut};
 use wasmtime_wasi::p2::pipe::AsyncReadStream;
-use wasmtime_wasi::p2::{DynInputStream, StreamError, WasiView};
+use wasmtime_wasi::p2::{DynInputStream, StreamError};
 use wrpc_transport::ListDecoderU8;
 
 use crate::{RemoteResource, WrpcView};
 
-pub struct ValEncoder<'a, T, W> {
+pub struct ValEncoder<'a, T: 'static, W> {
     pub store: StoreContextMut<'a, T>,
     pub ty: &'a Type,
     pub resources: &'a [ResourceType],
@@ -120,7 +120,7 @@ where
 
 impl<T, W> Encoder<&Val> for ValEncoder<'_, T, W>
 where
-    T: WasiView + WrpcView,
+    T: WrpcView,
     W: AsyncWrite + wrpc_transport::Index<W> + Sync + Send + 'static,
 {
     type Error = wasmtime::Error;
@@ -449,7 +449,8 @@ where
                         let mut stream = self
                             .store
                             .data_mut()
-                            .table()
+                            .wrpc()
+                            .table
                             .delete(stream)
                             .context("failed to delete input stream")?;
                         self.deferred = Some(Box::new(|w| {
@@ -478,7 +479,8 @@ where
                     } else {
                         self.store
                             .data_mut()
-                            .table()
+                            .wrpc()
+                            .table
                             .get_mut(&stream)
                             .context("failed to get input stream")?;
                         // NOTE: In order to handle this we'd need to know how many bytes the
@@ -491,7 +493,7 @@ where
                     let resource = resource
                         .try_into_resource(&mut self.store)
                         .context("resource type mismatch")?;
-                    let table = self.store.data_mut().table();
+                    let table = self.store.data_mut().wrpc().table;
                     if resource.owned() {
                         let RemoteResource(buf) = table
                             .delete(resource)
@@ -516,6 +518,8 @@ where
                     if self
                         .store
                         .data_mut()
+                        .wrpc()
+                        .ctx
                         .shared_resources()
                         .0
                         .insert(id, *resource)
@@ -528,6 +532,10 @@ where
                     bail!("encoding host resources not supported yet")
                 }
             }
+
+            (_, Type::Future(..) | Type::Stream(..) | Type::ErrorContext) => {
+                bail!("async not supported")
+            }
             _ => bail!("value type mismatch"),
         }
     }
@@ -551,7 +559,7 @@ pub async fn read_value<T, R>(
     path: &[usize],
 ) -> std::io::Result<()>
 where
-    T: WasiView + WrpcView,
+    T: WrpcView + 'static,
     R: AsyncRead + wrpc_transport::Index<R> + Send + Unpin + 'static,
 {
     match ty {
@@ -796,7 +804,8 @@ where
                 // which will could potentially break/hang with some transports
                 let res = store
                     .data_mut()
-                    .table()
+                    .wrpc()
+                    .table
                     .push(Box::new(AsyncReadStream::new(
                         FramedRead::new(r, ListDecoderU8::default())
                             .into_async_read()
@@ -837,6 +846,8 @@ where
                 trace!(?id, "lookup shared resource");
                 let resource = store
                     .data_mut()
+                    .wrpc()
+                    .ctx
                     .shared_resources()
                     .0
                     .get(&id)
@@ -850,7 +861,7 @@ where
                     .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidInput, err))?;
                 let mut buf = Vec::with_capacity(n);
                 r.read_to_end(&mut buf).await?;
-                let table = store.data_mut().table();
+                let table = store.data_mut().wrpc().table;
                 let resource = table
                     .push(RemoteResource(buf.into()))
                     .map_err(|err| std::io::Error::new(std::io::ErrorKind::OutOfMemory, err))?;
@@ -861,5 +872,9 @@ where
                 Ok(())
             }
         }
+        Type::Future(..) | Type::Stream(..) | Type::ErrorContext => Err(std::io::Error::new(
+            std::io::ErrorKind::Unsupported,
+            "async not supported",
+        )),
     }
 }