chore(rust): update dependencies

rvolosatovs · rvolosatovs · commit 487ae4741fb8 · 2025-05-23T15:23:06.000Z
Signed-off-by: Roman Volosatovs &lt;rvolosatovs@riseup.net&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -160,24 +160,24 @@ 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 = "31", default-features = false }
+wasi-preview1-component-adapter-provider = { version = "33", default-features = false }
 wasm-tokio = { version = "0.6", default-features = false }
-wasmparser = { version = "0.227", default-features = false }
-wasmtime = { version = "31", default-features = false }
-wasmtime-cli-flags = { version = "31", default-features = false }
-wasmtime-wasi = { version = "31", default-features = false }
-wasmtime-wasi-http = { version = "31", default-features = false }
+wasmparser = { version = "0.230", default-features = false }
+wasmtime = { version = "33", default-features = false }
+wasmtime-cli-flags = { version = "33", default-features = false }
+wasmtime-wasi = { version = "33", default-features = false }
+wasmtime-wasi-http = { version = "33", default-features = false }
 wit-bindgen = { version = "0.36", default-features = false }
 wit-bindgen-core = { version = "0.36", default-features = false }
 wit-bindgen-wrpc = { version = "0.9", 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.9", default-features = false, path = "./crates/wit-bindgen-rust" }
 wit-bindgen-wrpc-rust-macro = { version = "0.9", default-features = false, path = "./crates/wit-bindgen-rust-macro" }
-wit-component = { version = "0.221", default-features = false }
+wit-component = { version = "0.230", default-features = false }
 wit-parser = { version = "0.220", default-features = false }
 wrpc-cli = { version = "0.5", path = "./crates/cli", default-features = false }
 wrpc-introspect = { version = "0.6", default-features = false, path = "./crates/introspect" }
-wrpc-runtime-wasmtime = { version = "0.28", path = "./crates/runtime-wasmtime", default-features = false }
+wrpc-runtime-wasmtime = { version = "0.29", 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.28", path = "./crates/transport-nats", default-features = false }
@@ -186,5 +186,5 @@ wrpc-transport-web = { version = "0.1", path = "./crates/transport-web", default
 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.6", path = "./crates/wasmtime-cli", default-features = false }
+wrpc-wasmtime-cli = { version = "0.7", path = "./crates/wasmtime-cli", default-features = false }
 wtransport = { version = "0.6", default-features = false }
diff --git a/crates/runtime-wasmtime/Cargo.toml b/crates/runtime-wasmtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wrpc-runtime-wasmtime"
-version = "0.28.0"
+version = "0.29.0"
 description = "wRPC wasmtime integration"
 
 authors.workspace = true
diff --git a/crates/runtime-wasmtime/src/bindings.rs b/crates/runtime-wasmtime/src/bindings.rs
@@ -2,7 +2,7 @@ mod generated {
     wasmtime::component::bindgen!({
         world: "wrpc:rpc/imports",
         with: {
-            "wasi": wasmtime_wasi::bindings,
+            "wasi": wasmtime_wasi::p2::bindings,
             "wrpc:rpc/context/context": with::Context,
             "wrpc:rpc/error/error": crate::rpc::Error,
             "wrpc:rpc/transport/incoming-channel": crate::rpc::IncomingChannel,
diff --git a/crates/runtime-wasmtime/src/codec.rs b/crates/runtime-wasmtime/src/codec.rs
@@ -22,8 +22,8 @@ use wasm_tokio::{
 use wasmtime::component::types::{Case, Field};
 use wasmtime::component::{ResourceType, Type, Val};
 use wasmtime::{AsContextMut, StoreContextMut};
-use wasmtime_wasi::pipe::AsyncReadStream;
-use wasmtime_wasi::{DynInputStream, StreamError, WasiView};
+use wasmtime_wasi::p2::pipe::AsyncReadStream;
+use wasmtime_wasi::p2::{DynInputStream, StreamError, WasiView};
 use wrpc_transport::ListDecoderU8;
 
 use crate::{RemoteResource, WrpcView};
diff --git a/crates/runtime-wasmtime/src/lib.rs b/crates/runtime-wasmtime/src/lib.rs
@@ -20,7 +20,7 @@ use tracing::{debug, instrument, trace, warn};
 use uuid::Uuid;
 use wasmtime::component::{types, Func, Resource, ResourceAny, ResourceType, Type, Val};
 use wasmtime::{AsContextMut, Engine};
-use wasmtime_wasi::{IoView, WasiView};
+use wasmtime_wasi::p2::{IoView, WasiView};
 use wrpc_transport::Invoke;
 
 use crate::bindings::rpc::context::Context;
diff --git a/crates/runtime-wasmtime/src/polyfill.rs b/crates/runtime-wasmtime/src/polyfill.rs
@@ -14,7 +14,7 @@ use tokio_util::codec::Encoder;
 use tracing::{debug, instrument, trace, warn, Instrument as _, Span};
 use wasmtime::component::{types, LinkerInstance, ResourceType, Type, Val};
 use wasmtime::{AsContextMut, Engine, StoreContextMut};
-use wasmtime_wasi::WasiView;
+use wasmtime_wasi::p2::WasiView;
 use wrpc_transport::{Index as _, Invoke, InvokeExt as _};
 
 use crate::rpc::Error;
diff --git a/crates/runtime-wasmtime/src/rpc/host/error.rs b/crates/runtime-wasmtime/src/rpc/host/error.rs
@@ -1,6 +1,6 @@
 use anyhow::Context as _;
 use wasmtime::component::Resource;
-use wasmtime_wasi::bindings::io::error::Error as IoError;
+use wasmtime_wasi::p2::bindings::io::error::Error as IoError;
 
 use crate::bindings::rpc::error::{Error, Host, HostError};
 use crate::rpc::WrpcRpcImpl;
diff --git a/crates/runtime-wasmtime/src/rpc/host/transport.rs b/crates/runtime-wasmtime/src/rpc/host/transport.rs
@@ -4,10 +4,10 @@ use std::sync::Arc;
 
 use anyhow::{bail, Context as _};
 use wasmtime::component::Resource;
-use wasmtime_wasi::bindings::io::poll::Pollable;
-use wasmtime_wasi::bindings::io::streams::{InputStream, OutputStream};
-use wasmtime_wasi::pipe::{AsyncReadStream, AsyncWriteStream};
-use wasmtime_wasi::subscribe;
+use wasmtime_wasi::p2::bindings::io::poll::Pollable;
+use wasmtime_wasi::p2::bindings::io::streams::{InputStream, OutputStream};
+use wasmtime_wasi::p2::pipe::{AsyncReadStream, AsyncWriteStream};
+use wasmtime_wasi::p2::subscribe;
 use wrpc_transport::{Index as _, Invoke};
 
 use crate::bindings::rpc::error::Error;
diff --git a/crates/runtime-wasmtime/src/rpc/mod.rs b/crates/runtime-wasmtime/src/rpc/mod.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 use anyhow::Context as _;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use wasmtime::component::Linker;
-use wasmtime_wasi::Pollable;
+use wasmtime_wasi::p2::Pollable;
 use wrpc_transport::Invoke;
 
 use crate::{bindings, WrpcView};
diff --git a/crates/runtime-wasmtime/src/serve.rs b/crates/runtime-wasmtime/src/serve.rs
@@ -10,7 +10,7 @@ use tracing::{debug, instrument, Instrument as _, Span};
 use wasmtime::component::types;
 use wasmtime::component::{Instance, InstancePre, ResourceType};
 use wasmtime::AsContextMut;
-use wasmtime_wasi::WasiView;
+use wasmtime_wasi::p2::WasiView;
 
 use crate::{call, rpc_func_name, WrpcView};
 
@@ -50,13 +50,13 @@ pub trait ServeExt: wrpc_transport::Serve {
             let idx = if instance_name.is_empty() {
                 None
             } else {
-                let (_, idx) = component_ty
-                    .export_index(None, instance_name)
+                let idx = component_ty
+                    .get_export_index(None, instance_name)
                     .with_context(|| format!("export `{instance_name}` not found"))?;
                 Some(idx)
             };
-            let (_, idx) = component_ty
-                .export_index(idx.as_ref(), name)
+            let idx = component_ty
+                .get_export_index(idx.as_ref(), name)
                 .with_context(|| format!("export `{name}` not found"))?;
 
             // TODO: set paths
@@ -146,12 +146,12 @@ pub trait ServeExt: wrpc_transport::Serve {
                     None
                 } else {
                     let idx = instance
-                        .get_export(store.as_context_mut(), None, instance_name)
+                        .get_export_index(store.as_context_mut(), None, instance_name)
                         .with_context(|| format!("export `{instance_name}` not found"))?;
                     Some(idx)
                 };
                 let idx = instance
-                    .get_export(store.as_context_mut(), idx.as_ref(), name)
+                    .get_export_index(store.as_context_mut(), idx.as_ref(), name)
                     .with_context(|| format!("export `{name}` not found"))?;
                 instance.get_func(store.as_context_mut(), idx)
             }
diff --git a/crates/wasmtime-cli/Cargo.toml b/crates/wasmtime-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wrpc-wasmtime-cli"
-version = "0.6.0"
+version = "0.7.0"
 description = "wRPC Wasmtime CLI"
 
 authors.workspace = true
diff --git a/crates/wasmtime-cli/src/lib.rs b/crates/wasmtime-cli/src/lib.rs
@@ -20,9 +20,9 @@ use wasi_preview1_component_adapter_provider::{
     WASI_SNAPSHOT_PREVIEW1_ADAPTER_NAME, WASI_SNAPSHOT_PREVIEW1_COMMAND_ADAPTER,
     WASI_SNAPSHOT_PREVIEW1_REACTOR_ADAPTER,
 };
-use wasmtime::component::{types, Component, InstancePre, Linker, ResourceType};
+use wasmtime::component::{types, Component, InstancePre, Linker, ResourceTable, ResourceType};
 use wasmtime::{Engine, Store};
-use wasmtime_wasi::{IoView, ResourceTable, WasiCtx, WasiCtxBuilder, WasiView};
+use wasmtime_wasi::p2::{IoView, WasiCtx, WasiCtxBuilder, WasiView};
 use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
 use wrpc_runtime_wasmtime::{
     collect_component_resource_exports, collect_component_resource_imports, link_item, rpc,
@@ -202,7 +202,7 @@ where
     let component = Component::new(&engine, wasm).context("failed to compile component")?;
 
     let mut linker = Linker::<Ctx<C>>::new(&engine);
-    wasmtime_wasi::add_to_linker_async(&mut linker).context("failed to link WASI")?;
+    wasmtime_wasi::p2::add_to_linker_async(&mut linker).context("failed to link WASI")?;
     wasmtime_wasi_http::add_only_http_to_linker_async(&mut linker)
         .context("failed to link `wasi:http`")?;
     wrpc_runtime_wasmtime::rpc::add_to_linker(&mut linker).context("failed to link `wrpc:rpc`")?;
@@ -279,16 +279,16 @@ where
                     let host_ty = match ty {
                         ty if Some(ty) == rpc_err_ty => ResourceType::host::<rpc::Error>(),
                         ty if io_err_tys.contains(&ty) => {
-                            ResourceType::host::<wasmtime_wasi::bindings::io::error::Error>()
+                            ResourceType::host::<wasmtime_wasi::p2::bindings::io::error::Error>()
                         }
                         ty if io_input_stream_tys.contains(&ty) => ResourceType::host::<
-                            wasmtime_wasi::bindings::io::streams::InputStream,
+                            wasmtime_wasi::p2::bindings::io::streams::InputStream,
                         >(),
                         ty if io_output_stream_tys.contains(&ty) => ResourceType::host::<
-                            wasmtime_wasi::bindings::io::streams::OutputStream,
+                            wasmtime_wasi::p2::bindings::io::streams::OutputStream,
                         >(),
                         ty if io_pollable_tys.contains(&ty) => {
-                            ResourceType::host::<wasmtime_wasi::bindings::io::poll::Pollable>()
+                            ResourceType::host::<wasmtime_wasi::p2::bindings::io::poll::Pollable>()
                         }
                         _ => ResourceType::host::<RemoteResource>(),
                     };
@@ -401,7 +401,7 @@ where
     let (pre, engine, _, _) =
         instantiate_pre(WASI_SNAPSHOT_PREVIEW1_COMMAND_ADAPTER, workload).await?;
     let mut store = new_store(&engine, clt, cx, "command.wasm", timeout);
-    let cmd = wasmtime_wasi::bindings::CommandPre::new(pre)
+    let cmd = wasmtime_wasi::p2::bindings::CommandPre::new(pre)
         .context("failed to construct `command` instance")?
         .instantiate_async(&mut store)
         .await
