Refactor and update dependencies

Cargo.toml

@@ -3,16 +3,18 @@ name = "hyperlight-wasm-http-example"
 edition = "2024"
 
 [dependencies]
-hyperlight-component-macro = { version = "0.9.0" }
-hyperlight-common = { version = "0.9.0" }
-hyperlight-host = { version = "0.9.0", default-features = false, features = [ "kvm", "mshv2" ] }
-hyperlight-wasm = { version = "0.9.0" }
-
-hyper = "1.7"
-reqwest = { version = "0.12", features = ["stream", "gzip", "brotli", "deflate", "rustls-tls", "blocking"] }
-bytes = "1"
-tokio = { version = "1.47", features = ["full"] }
 anyhow = "1.0"
+bytes = "1"
+clap = { version = "4.5.60", features = ["derive"] }
+getrandom = "0.3.3"
 http-body-util = "0.1"
+hyper = "1.7"
 hyper-util = { version = "0.1", features = ["full"] }
-getrandom = "0.3.3"
+hyperlight-component-macro = { version = "0.12.0" }
+hyperlight-common = { version = "0.12.0" }
+hyperlight-host = { version = "0.12.0", default-features = false, features = [ "kvm", "mshv3" ] }
+hyperlight-wasm = { version = "0.12.0" }
+once_cell = "1.21.3"
+reqwest = { version = "0.12", features = ["stream", "gzip", "brotli", "deflate", "rustls-tls", "blocking"] }
+tokio = { version = "1.47", features = ["full"] }
+

README.md

@@ -94,10 +94,10 @@ You can then run the server:
 
 Rust:
 ```sh
-cargo run -- out/sample_wasi_http_rust.aot
+cargo run -- serve --addr 0.0.0.0:9999 {{ OUT_DIR }}/sample_wasi_http_rust.aot
 ```
 
 JS:
 ```sh
-cargo run -- out/sample_wasi_http_js.aot
+cargo run -- serve --addr 0.0.0.0:8888 {{ OUT_DIR }}/sample_wasi_http_js.aot
 ```

justfile

@@ -12,7 +12,7 @@ install-hyperlight-wasm-aot:
     test -f {{ BIN_DIR }}/hyperlight-wasm-aot || \
     cargo install hyperlight-wasm-aot \
         --locked \
-        --version 0.9.0 \
+        --version 0.12.0 \
         --root {{ TARGET_DIR }}
 
 build-js-component: make-out-dir install-hyperlight-wasm-aot
@@ -39,7 +39,7 @@ build: make-wit-world
     cargo build
 
 run-rust: build build-rust-component
-    cargo run -- {{ OUT_DIR }}/sample_wasi_http_rust.aot
+    cargo run -- serve --addr 0.0.0.0:9999 {{ OUT_DIR }}/sample_wasi_http_rust.aot
 
 run-js: build build-js-component
-    cargo run -- {{ OUT_DIR }}/sample-wasi-http-js.aot
+    cargo run -- serve --addr 0.0.0.0:8888 {{ OUT_DIR }}/sample-wasi-http-js.aot

src/main.rs

@@ -1,62 +1,119 @@
 extern crate alloc;
 
-mod bindings {
-    hyperlight_component_macro::host_bindgen!();
-}
+mod sandbox_pool;
+mod wasi_impl;
 
-mod resource;
-mod types;
-mod worker;
+use wasi_impl::Resource;
+use wasi_impl::bindings::wasi::cli::Run;
+use wasi_impl::bindings::wasi::http::IncomingHandler;
+use wasi_impl::types::{WasiImpl, http_incoming_body::IncomingBody, io_stream::Stream};
+use wasi_impl::worker::RUNTIME;
 
 use std::{convert::Infallible, net::SocketAddr, str::FromStr, sync::Arc};
 
-use bindings::RootSandbox;
 use bytes::Bytes;
+use clap::{Args, Parser, Subcommand};
 use http_body_util::{BodyExt, Full};
 use hyper::{server::conn::http1, service::service_fn};
 use hyper_util::rt::TokioIo;
-use hyperlight_host::sandbox::SandboxConfiguration;
-use hyperlight_wasm::LoadedWasmSandbox;
-use resource::Resource;
+use once_cell::sync::Lazy;
+use sandbox_pool::SandboxPool;
 use tokio::{net::TcpListener, sync::Mutex};
-use types::{WasiImpl, http_incoming_body::IncomingBody, io_stream::Stream};
-use worker::RUNTIME;
 
-use crate::bindings::wasi::http::IncomingHandler;
+// Pool of sandboxes that are used at runtime to handle incoming HTTP requests.
+static SANDBOX_POOL: Lazy<Arc<Mutex<SandboxPool>>> =
+    Lazy::new(|| Arc::new(Mutex::new(SandboxPool::default())));
 
-fn main() {
-    let args = std::env::args().collect::<Vec<_>>();
-    if args.len() != 2 {
-        eprintln!("Usage: {} <AOT_WASM_FILE>", args[0]);
-        std::process::exit(1);
-    }
+/// Common options shared between subcommands (modeled after wasmtime).
+#[derive(Args, Debug, Clone)]
+struct CliOptions {
+    /// Not used, it needs `wasi:filesystem` implementation which is not
+    /// possible at the moment because `wasi:filesystem/types` conflicts with
+    /// `wasi:http/types`.
+    /// This is here for compatibility with `wasmtime` cli
+    #[arg(long = "dir", value_name = "HOST_DIR::GUEST_DIR")]
+    dirs: Vec<String>,
 
-    let wasm_path = &args[1];
+    /// Pass an environment variable to the guest.
+    /// Format: `KEY=VALUE`
+    #[arg(long = "env", value_name = "KEY=VALUE")]
+    envs: Vec<String>,
 
-    let builder = hyperlight_wasm::SandboxBuilder::new()
-        .with_guest_heap_size(30 * 1024 * 1024)
-        .with_guest_stack_size(1 * 1024 * 1024);
+    /// Path to the AOT-compiled WASM component file
+    wasm_file: String,
+}
 
-    // hyperlight wasm currently doesn't expose a way to set the host
-    // function definition size, so we do it manually here with a
-    // horrible hack to get a mutable reference to the config
-    let config = builder.get_config() as *const _ as *mut SandboxConfiguration;
-    let config = unsafe { config.as_mut().unwrap() };
-    config.set_host_function_definition_size(20 * 1024);
+#[derive(Subcommand, Debug)]
+enum Command {
+    /// Run a WASM component (guest exports wasi:cli/run)
+    Run {
+        #[command(flatten)]
+        options: CliOptions,
+    },
+    /// Serve an HTTP component (guest exports wasi:http/incoming-handler)
+    Serve {
+        #[command(flatten)]
+        options: CliOptions,
 
-    let mut sb = builder.build().unwrap();
+        /// Socket address to listen on
+        #[arg(long, default_value = "0.0.0.0:8080", value_name = "ADDR")]
+        addr: String,
+    },
+}
 
-    let state = types::WasiImpl::new();
-    let rt = bindings::register_host_functions(&mut sb, state);
+#[derive(Parser, Debug)]
+#[command(name = "hyperlight-wasm-debug")]
+#[command(about = "Run a WASM component with Hyperlight")]
+struct Cli {
+    #[command(subcommand)]
+    command: Command,
+}
 
-    let sb = sb.load_runtime().unwrap();
-    let sb = sb.load_module(wasm_path).unwrap();
+fn main() {
+    let cli = Cli::parse();
 
-    let sb = bindings::RootSandbox { sb, rt };
-    let sb = Arc::new(Mutex::new(sb));
+    match cli.command {
+        Command::Run { options } => {
+            run_cli(options);
+        }
+        Command::Serve { options, addr } => {
+            run_http(options, &addr);
+        }
+    }
+}
+
+/// Run the guest component via `wasi:cli/run`.
+///
+/// The guest manages its own I/O (TCP, UDP, stdio, etc.) through the WASI
+/// imports it was compiled against.
+fn run_cli(options: CliOptions) {
+    println!("Running component...");
+    RUNTIME.block_on(async {
+        SANDBOX_POOL.lock().await.from_options(options);
+        let mut sb = SANDBOX_POOL.lock().await.get_sandbox();
+        tokio::task::block_in_place(|| {
+            let inst = wasi_impl::bindings::root::component::RootExports::run(&mut sb);
+            match inst.run() {
+                Ok(()) => println!("Component exited successfully."),
+                Err(()) => eprintln!("Component exited with an error."),
+            }
+        });
+        SANDBOX_POOL.lock().await.return_sandbox(sb);
+    });
+}
+
+/// Run an HTTP proxy server that forwards requests to the guest component's
+/// `wasi:http/incoming-handler` export.
+fn run_http(options: CliOptions, addr: &str) {
+    let addr: SocketAddr = addr.parse().unwrap_or_else(|e| {
+        eprintln!("Invalid address '{addr}': {e}");
+        std::process::exit(1);
+    });
 
     RUNTIME.block_on(async move {
-        let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+        SANDBOX_POOL.lock().await.from_options(options);
+        println!("Starting server on http://{addr}");
+
         let listener = TcpListener::bind(addr).await.unwrap();
 
         loop {
@@ -66,17 +123,13 @@ fn main() {
             // `hyper::rt` IO traits.
             let io = TokioIo::new(stream);
 
-            let sb = sb.clone();
-
             RUNTIME.spawn(async move {
                 // Finally, we bind the incoming connection to our `hello` service
                 if let Err(err) = http1::Builder::new()
                     // `service_fn` converts our function in a `Service`
                     .serve_connection(
                         io,
-                        service_fn(move |req: hyper::Request<hyper::body::Incoming>| {
-                            hello(sb.clone(), req)
-                        }),
+                        service_fn(move |req: hyper::Request<hyper::body::Incoming>| hello(req)),
                     )
                     .await
                 {
@@ -88,11 +141,11 @@ fn main() {
 }
 
 async fn hello(
-    sb: Arc<Mutex<RootSandbox<WasiImpl, LoadedWasmSandbox>>>,
     mut req: hyper::Request<hyper::body::Incoming>,
 ) -> Result<hyper::Response<Full<Bytes>>, Infallible> {
-    let mut sb = sb.lock().await;
-    let inst = bindings::root::component::RootExports::incoming_handler(&mut *sb);
+    let mut sb = SANDBOX_POOL.lock().await.get_sandbox();
+    let snapshot = sb.sb.snapshot().unwrap();
+    let inst = wasi_impl::bindings::root::component::RootExports::incoming_handler(&mut sb);
 
     let body = req.body_mut();
     let mut full_body = Vec::new();
@@ -115,7 +168,7 @@ async fn hello(
     let _ = body_stream.write(&full_body);
     body_stream.close();
 
-    let req = types::http_incoming_request::IncomingRequest {
+    let req = wasi_impl::types::http_incoming_request::IncomingRequest {
         method: req.method().into(),
         path_with_query: Some(
             req.uri()
@@ -124,9 +177,9 @@ async fn hello(
                 .unwrap_or_default(),
         ),
         scheme: Some(if req.uri().scheme_str() == Some("https") {
-            bindings::wasi::http::types::Scheme::HTTPS
+            wasi_impl::bindings::wasi::http::types::Scheme::HTTPS
         } else {
-            bindings::wasi::http::types::Scheme::HTTP
+            wasi_impl::bindings::wasi::http::types::Scheme::HTTP
         }),
         authority: req
             .uri()
@@ -151,6 +204,12 @@ async fn hello(
         inst.handle(req, outparam.clone());
     });
 
+    sb.sb.restore(&snapshot).unwrap();
+
+    // Return the sandbox to the pool immediately after the call, so it's available for the next
+    // request while we wait for the guest to produce a response.
+    SANDBOX_POOL.lock().await.return_sandbox(sb);
+
     let Some(response) = outparam.write().await.response.take() else {
         let body = Full::new(Bytes::from("Error reading body"));
         let mut res = hyper::Response::new(body);
@@ -188,19 +247,19 @@ async fn hello(
     }
 }
 
-impl From<&hyper::Method> for bindings::wasi::http::types::Method {
+impl From<&hyper::Method> for wasi_impl::bindings::wasi::http::types::Method {
     fn from(method: &hyper::Method) -> Self {
         match method.as_str() {
-            "GET" => bindings::wasi::http::types::Method::Get,
-            "POST" => bindings::wasi::http::types::Method::Post,
-            "PUT" => bindings::wasi::http::types::Method::Put,
-            "DELETE" => bindings::wasi::http::types::Method::Delete,
-            "HEAD" => bindings::wasi::http::types::Method::Head,
-            "OPTIONS" => bindings::wasi::http::types::Method::Options,
-            "CONNECT" => bindings::wasi::http::types::Method::Connect,
-            "TRACE" => bindings::wasi::http::types::Method::Trace,
-            "PATCH" => bindings::wasi::http::types::Method::Patch,
-            other => bindings::wasi::http::types::Method::Other(other.to_string()),
+            "GET" => wasi_impl::bindings::wasi::http::types::Method::Get,
+            "POST" => wasi_impl::bindings::wasi::http::types::Method::Post,
+            "PUT" => wasi_impl::bindings::wasi::http::types::Method::Put,
+            "DELETE" => wasi_impl::bindings::wasi::http::types::Method::Delete,
+            "HEAD" => wasi_impl::bindings::wasi::http::types::Method::Head,
+            "OPTIONS" => wasi_impl::bindings::wasi::http::types::Method::Options,
+            "CONNECT" => wasi_impl::bindings::wasi::http::types::Method::Connect,
+            "TRACE" => wasi_impl::bindings::wasi::http::types::Method::Trace,
+            "PATCH" => wasi_impl::bindings::wasi::http::types::Method::Patch,
+            other => wasi_impl::bindings::wasi::http::types::Method::Other(other.to_string()),
         }
     }
 }