deps: bump wasmtime to 43.0.1

Cargo.toml

@@ -53,9 +53,9 @@ tokio-util = { version = "0.7", default-features = false }
 cfg-if = "1.0"
 
 # wasmtime
-wasmtime = { version = "36.0.6", features = ["async"] }
-wasmtime-wasi = { version = "36.0.6" }
-wasmtime-wasi-http = { version = "36.0.6" }
+wasmtime = { version = "43.0.1", features = ["async"] }
+wasmtime-wasi = { version = "43.0.1" }
+wasmtime-wasi-http = { version = "43.0.1" }
 
 [profile.release]
 panic = "abort"

crates/containerd-shim-wasmer/Cargo.toml

@@ -9,8 +9,8 @@ containerd-shim-wasm = { workspace = true, features = ["opentelemetry"] }
 log = { workspace = true }
 tokio = { workspace = true }
 
-wasmer = "6.0.1"
-wasmer-wasix = "0.600.1"
+wasmer = "6.1.0"
+wasmer-wasix = "0.601.0"
 mio = { version = "1", features = ["net"] }
 
 [dev-dependencies]

crates/containerd-shim-wasmtime/src/http_proxy.rs

@@ -15,11 +15,12 @@ use tokio_util::sync::CancellationToken;
 use tokio_util::task::TaskTracker;
 use wasmtime::Store;
 use wasmtime::component::ResourceTable;
-use wasmtime_wasi_http::bindings::ProxyPre;
-use wasmtime_wasi_http::bindings::http::types::Scheme;
-use wasmtime_wasi_http::body::HyperOutgoingBody;
+use wasmtime_wasi_http::WasiHttpCtx;
 use wasmtime_wasi_http::io::TokioIo;
-use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
+use wasmtime_wasi_http::p2::WasiHttpView;
+use wasmtime_wasi_http::p2::bindings::ProxyPre;
+use wasmtime_wasi_http::p2::bindings::http::types::Scheme;
+use wasmtime_wasi_http::p2::body::HyperOutgoingBody;
 
 use crate::instance::{WasiPreview2Ctx, envs_from_ctx};
 
@@ -194,8 +195,11 @@ impl ProxyHandler {
 
         let mut store = self.wasi_store_for_request(req_id);
 
-        let req = store.data_mut().new_incoming_request(Scheme::Http, req)?;
-        let out = store.data_mut().new_response_outparam(sender)?;
+        let req = store
+            .data_mut()
+            .http()
+            .new_incoming_request(Scheme::Http, req)?;
+        let out = store.data_mut().http().new_response_outparam(sender)?;
         let proxy = self.instance_pre.instantiate_async(&mut store).await?;
 
         let task = self.tracker.spawn(async move {

crates/containerd-shim-wasmtime/src/instance.rs

@@ -11,11 +11,12 @@ use tokio_util::sync::CancellationToken;
 use wasmtime::component::types::ComponentItem;
 use wasmtime::component::{self, Component, ResourceTable};
 use wasmtime::{Config, Module, Precompiled, Store};
+use wasmtime_wasi::p1::{self as wasi_p1, WasiP1Ctx};
 use wasmtime_wasi::p2::bindings::Command;
-use wasmtime_wasi::preview1::{self as wasi_preview1, WasiP1Ctx};
 use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiCtxView, WasiView};
-use wasmtime_wasi_http::bindings::ProxyPre;
-use wasmtime_wasi_http::{WasiHttpCtx, WasiHttpView};
+use wasmtime_wasi_http::WasiHttpCtx;
+use wasmtime_wasi_http::p2::bindings::ProxyPre;
+use wasmtime_wasi_http::p2::{WasiHttpCtxView, WasiHttpView};
 
 use crate::http_proxy::serve_conn;
 
@@ -67,7 +68,6 @@ impl Default for WasmtimeSandbox {
         // see https://github.com/containerd/runwasi/pull/405#issuecomment-1928468714 for details
         config.parallel_compilation(!cfg!(test));
         config.wasm_component_model(true); // enable component linking
-        config.async_support(true); // must be on
 
         if use_pooling_allocator_by_default() {
             let cfg = wasmtime::PoolingAllocationConfig::default();
@@ -76,6 +76,7 @@ impl Default for WasmtimeSandbox {
 
         Self {
             engine: wasmtime::Engine::new(&config)
+                .map_err(anyhow::Error::from)
                 .context("failed to create wasmtime engine")
                 .unwrap(),
             cancel: CancellationToken::new(),
@@ -111,12 +112,12 @@ impl WasiView for WasiPreview2Ctx {
 }
 
 impl WasiHttpView for WasiPreview2Ctx {
-    fn ctx(&mut self) -> &mut wasmtime_wasi_http::WasiHttpCtx {
-        &mut self.wasi_http
-    }
-
-    fn table(&mut self) -> &mut ResourceTable {
-        &mut self.resource_table
+    fn http(&mut self) -> WasiHttpCtxView<'_> {
+        WasiHttpCtxView {
+            ctx: &mut self.wasi_http,
+            table: &mut self.resource_table,
+            hooks: Default::default(),
+        }
     }
 }
 
@@ -139,7 +140,6 @@ impl Shim for WasmtimeShim {
         // see https://github.com/containerd/runwasi/pull/405#issuecomment-1928468714 for details
         config.parallel_compilation(!cfg!(test));
         config.wasm_component_model(true); // enable component linking
-        config.async_support(true); // must be on
 
         let engine = wasmtime::Engine::new(&config)
             .expect("failed to create wasmtime precompilation engine");
@@ -214,9 +214,7 @@ impl WasmtimeSandbox {
         let mut module_linker = wasmtime::Linker::new(&self.engine);
 
         log::debug!("init linker");
-        wasi_preview1::add_to_linker_async(&mut module_linker, |wasi_ctx: &mut WasiP1Ctx| {
-            wasi_ctx
-        })?;
+        wasi_p1::add_to_linker_async(&mut module_linker, |wasi_ctx: &mut WasiP1Ctx| wasi_ctx)?;
 
         log::info!("instantiating instance");
         let instance: wasmtime::Instance =
@@ -232,6 +230,7 @@ impl WasmtimeSandbox {
         start_func
             .call_async(&mut store, &[], &mut [])
             .await
+            .map_err(anyhow::Error::from)
             .into_error_code()
     }
 
@@ -254,7 +253,7 @@ impl WasmtimeSandbox {
                 log::info!("Found HTTP proxy target");
                 let mut linker = component::Linker::new(&self.engine);
                 wasmtime_wasi::p2::add_to_linker_async(&mut linker)?;
-                wasmtime_wasi_http::add_only_http_to_linker_async(&mut linker)?;
+                wasmtime_wasi_http::p2::add_only_http_to_linker_async(&mut linker)?;
 
                 let pre = linker.instantiate_pre(&component)?;
                 log::info!("pre-instantiate_pre");
@@ -295,7 +294,10 @@ impl WasmtimeSandbox {
                 ))?;
 
                 log::debug!("running exported function {func:?} {start_func:?}");
-                start_func.call_async(&mut store, &[], &mut []).await
+                start_func
+                    .call_async(&mut store, &[], &mut [])
+                    .await
+                    .map_err(anyhow::Error::from)
             }
         };
 

crates/containerd-shimkit/src/sandbox/cli.rs

@@ -175,10 +175,10 @@ fn get_mem(pid: u32) -> (usize, usize) {
             if let Some(rest) = rest.strip_suffix("kB") {
                 total = rest.trim().parse().unwrap_or(0);
             }
-        } else if let Some(rest) = line.strip_prefix("VmHWM:") {
-            if let Some(rest) = rest.strip_suffix("kB") {
-                rss = rest.trim().parse().unwrap_or(0);
-            }
+        } else if let Some(rest) = line.strip_prefix("VmHWM:")
+            && let Some(rest) = rest.strip_suffix("kB")
+        {
+            rss = rest.trim().parse().unwrap_or(0);
         }
     }
     (rss, total)

crates/containerd-shimkit/src/sandbox/oci.rs

@@ -81,12 +81,12 @@ pub(crate) fn setup_prestart_hooks(hooks: &Option<oci_spec::runtime::Hooks>) ->
                 // error, in the case that the hook command is waiting for us to
                 // write to stdin.
                 let state = format!("{{ \"pid\": {} }}", std::process::id());
-                if let Err(e) = stdin.write_all(state.as_bytes()) {
-                    if e.kind() != ErrorKind::BrokenPipe {
-                        // Not a broken pipe. The hook command may be waiting
-                        // for us.
-                        let _ = hook_process.kill();
-                    }
+                if let Err(e) = stdin.write_all(state.as_bytes())
+                    && e.kind() != ErrorKind::BrokenPipe
+                {
+                    // Not a broken pipe. The hook command may be waiting
+                    // for us.
+                    let _ = hook_process.kill();
                 }
             }
             hook_process.wait()?;

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel="1.86.0"
+channel="1.91.0"
 profile="default"
 targets = ["wasm32-wasip1"]