Update the Hyperlight components for bindgen fixes

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

Cargo.lock

@@ -21,20 +21,18 @@ hyperlight-sandbox = { path = "src/hyperlight_sandbox" }
 hyperlight-javascript-sandbox = { path = "src/javascript_sandbox" }
 hyperlight-wasm-sandbox = { path = "src/wasm_sandbox" }
 hyperlight-sandbox-pyo3-common = { path = "src/sdk/python/pyo3_common" }
-hyperlight-common = { version = "0.14.0", default-features = false }
-hyperlight-component-macro = { version = "0.14.0" }
-hyperlight-host = { version = "0.14.0", default-features = false, features = ["executable_heap"] }
-hyperlight-wasm = { git = "https://github.com/jsturtevant/hyperlight-wasm", rev = "13906096edc2e014220c11a040242070ce6dee90" } #branch util-compont-fixes
+hyperlight-common = { version = "0.15.0", default-features = false }
+hyperlight-component-macro = { version = "0.15.0" }
+hyperlight-host = { version = "0.15.0", default-features = false, features = ["executable_heap"] }
+# https://github.com/jsturtevant/hyperlight-wasm/tree/sandbox-component-bindgen-prs
+hyperlight-wasm = { git = "https://github.com/jsturtevant/hyperlight-wasm", rev = "6618cabb1c52ad9469d6e2600c761a5b9060f772" }
 pyo3 = { version = "0.29", features = ["extension-module"] }
 
-# hyperlight-wasm 0.13.1 (git) depends on hyperlight-* from the hyperlight-dev
-# GitHub org. Redirect those to the published 0.14.0 crates.io versions.
-[patch."https://github.com/hyperlight-dev/hyperlight"]
-hyperlight-common = { version = "0.14.0" }
-hyperlight-guest = { version = "=0.14.0" }
-hyperlight-guest-bin = { version = "=0.14.0" }
-hyperlight-host = { version = "0.14.0" }
-hyperlight-component-util = { git = "https://github.com/jsturtevant/hyperlight-1", rev="cdbed80af127b4d74e2633511cadb07bfea0160e",  package = "hyperlight-component-util" }
-
 [patch.crates-io]
-hyperlight-component-util = { git = "https://github.com/jsturtevant/hyperlight-1", rev="cdbed80af127b4d74e2633511cadb07bfea0160e", package = "hyperlight-component-util" }
+# https://github.com/jsturtevant/hyperlight-1/tree/sandbox-component-bindgen-prs
+hyperlight-common = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-common" }
+hyperlight-component-macro = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-component-macro" }
+hyperlight-component-util = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-component-util" }
+hyperlight-guest = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-guest" }
+hyperlight-guest-bin = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-guest-bin" }
+hyperlight-host = { git = "https://github.com/jsturtevant/hyperlight-1", rev = "0fedd53253cc8b84f9d3e341bea181fd8db204d5", package = "hyperlight-host" }

Cargo.toml

@@ -10,7 +10,7 @@ description = "Hyperlight JS guest for hyperlight-sandbox"
 hyperlight-sandbox.workspace = true
 anyhow = "1"
 url = "2"
-hyperlight-js = { git = "https://github.com/hyperlight-dev/hyperlight-js.git", rev = "dd118685db5da1aca3c22c51752ab1816de311cb" }
+hyperlight-js = { git = "https://github.com/hyperlight-dev/hyperlight-js.git", rev = "915608fbc30e922c7ed03aa08b05c3a3a5614f39" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 

src/javascript_sandbox/Cargo.toml

@@ -14,13 +14,13 @@ ensure-tools:
     # (e.g. a stale wasmtime patch from the CI Cargo bin cache).
     cargo install hyperlight-wasm-aot --locked --force \
         --git https://github.com/jsturtevant/hyperlight-wasm \
-        --rev 13906096edc2e014220c11a040242070ce6dee90
+        --rev 6618cabb1c52ad9469d6e2600c761a5b9060f772
 
 [windows]
 ensure-tools:
     if (-not (Get-Command clang -ErrorAction SilentlyContinue)) { Write-Error 'clang not found — install with: winget install LLVM.LLVM'; exit 1 }; \
     if (-not (Get-Command wasm-tools -ErrorAction SilentlyContinue)) { cargo install wasm-tools --locked }; \
-    cargo install hyperlight-wasm-aot --locked --force --git https://github.com/jsturtevant/hyperlight-wasm --rev 13906096edc2e014220c11a040242070ce6dee90
+    cargo install hyperlight-wasm-aot --locked --force --git https://github.com/jsturtevant/hyperlight-wasm --rev 6618cabb1c52ad9469d6e2600c761a5b9060f772
 
 guest-build-wasm: ensure-tools
     cd {{repo-root}}/src/wasm_sandbox/guests/python && uv run componentize-py \

src/wasm_sandbox/Justfile

@@ -125,13 +125,13 @@ impl bindings::root::component::RootImports for HostState {
         self
     }
 
-    type WasiFilesystemTypes = HostState;
-    fn wasi_filesystem_types(&mut self) -> &mut Self {
+    type WasiFilesystemTypesV020 = HostState;
+    fn wasi_filesystem_types_v0_2_0(&mut self) -> &mut Self {
         self
     }
 
-    type WasiHttpTypes = HostState;
-    fn wasi_http_types(&mut self) -> &mut Self {
+    type WasiHttpTypesV020 = HostState;
+    fn wasi_http_types_v0_2_0(&mut self) -> &mut Self {
         self
     }
 
@@ -197,22 +197,18 @@ impl bindings::root::component::RootImports for HostState {
 }
 
 impl bindings::hyperlight::sandbox::Tools for HostState {
-    fn dispatch(
-        &mut self,
-        name: String,
-        args_json: String,
-    ) -> Result<Result<String, String>, hyperlight_host::HyperlightError> {
+    fn dispatch(&mut self, name: String, args_json: String) -> Result<String, String> {
         let args: serde_json::Value = match serde_json::from_str(&args_json) {
             Ok(args) => args,
-            Err(error) => return Ok(Err(error.to_string())),
+            Err(error) => return Err(error.to_string()),
         };
-        Ok(match self.tools.dispatch(&name, args) {
+        match self.tools.dispatch(&name, args) {
             Ok(v) => match serde_json::to_string(&v) {
                 Ok(s) => Ok(s),
                 Err(e) => Err(format!("serialization failed: {e}")),
             },
             Err(e) => Err(e.to_string()),
-        })
+        }
     }
 }
 
@@ -270,7 +266,7 @@ impl WasmComponentSandbox {
     }
 
     fn run_impl(&mut self, code: &str) -> Result<ExecutionResult> {
-        use bindings::hyperlight::sandbox::Executor;
+        use bindings::hyperlight::sandbox::ExecutorExports;
 
         self.fs
             .lock()

src/wasm_sandbox/src/lib.rs

@@ -1,52 +1,48 @@
 //! CLI trait implementations: Environment, Exit, Stdin/Stdout/Stderr, Terminals.
 #![allow(unused_variables)]
 
-use hyperlight_host::HyperlightError;
-
 use crate::HostState;
 use crate::bindings::wasi;
 use crate::wasi_impl::resource::Resource;
 use crate::wasi_impl::types::stream::Stream;
 
-type HlResult<T> = Result<T, HyperlightError>;
+type HlResult<T> = T;
 
 // ---------------------------------------------------------------------------
 // CLI: Environment, Exit, Stdin/Stdout/Stderr
 // ---------------------------------------------------------------------------
 
 impl wasi::cli::Environment for HostState {
     fn get_environment(&mut self) -> HlResult<Vec<(String, String)>> {
-        Ok(Vec::new())
+        Vec::new()
     }
     fn get_arguments(&mut self) -> HlResult<Vec<String>> {
-        Ok(Vec::new())
+        Vec::new()
     }
     fn initial_cwd(&mut self) -> HlResult<Option<String>> {
-        Ok(None)
+        None
     }
 }
 
 impl wasi::cli::Exit for HostState {
-    fn exit(&mut self, _status: Result<(), ()>) -> HlResult<()> {
-        Ok(())
-    }
+    fn exit(&mut self, _status: Result<(), ()>) -> HlResult<()> {}
 }
 
 impl wasi::cli::Stdin<Resource<Stream>> for HostState {
     fn get_stdin(&mut self) -> HlResult<Resource<Stream>> {
-        Ok(Resource::new(Stream::new()))
+        Resource::new(Stream::new())
     }
 }
 
 impl wasi::cli::Stdout<Resource<Stream>> for HostState {
     fn get_stdout(&mut self) -> HlResult<Resource<Stream>> {
-        Ok(Resource::new(Stream::new()))
+        Resource::new(Stream::new())
     }
 }
 
 impl wasi::cli::Stderr<Resource<Stream>> for HostState {
     fn get_stderr(&mut self) -> HlResult<Resource<Stream>> {
-        Ok(Resource::new(Stream::new()))
+        Resource::new(Stream::new())
     }
 }
 
@@ -66,18 +62,18 @@ impl wasi::cli::TerminalOutput for HostState {}
 
 impl wasi::cli::TerminalStdin<u32> for HostState {
     fn get_terminal_stdin(&mut self) -> HlResult<Option<u32>> {
-        Ok(None)
+        None
     }
 }
 
 impl wasi::cli::TerminalStdout<u32> for HostState {
     fn get_terminal_stdout(&mut self) -> HlResult<Option<u32>> {
-        Ok(None)
+        None
     }
 }
 
 impl wasi::cli::TerminalStderr<u32> for HostState {
     fn get_terminal_stderr(&mut self) -> HlResult<Option<u32>> {
-        Ok(None)
+        None
     }
 }

src/wasm_sandbox/src/wasi_impl/cli.rs

@@ -4,15 +4,14 @@
 use std::sync::LazyLock;
 use std::time::Duration;
 
-use hyperlight_host::HyperlightError;
 use wasi::clocks::{monotonic_clock, wall_clock};
 
 use crate::HostState;
 use crate::bindings::wasi;
 use crate::wasi_impl::resource::Resource;
 use crate::wasi_impl::types::pollable::AnyPollable;
 
-type HlResult<T> = Result<T, HyperlightError>;
+type HlResult<T> = T;
 
 static EPOCH: LazyLock<std::time::Instant> = LazyLock::new(std::time::Instant::now);
 
@@ -22,28 +21,26 @@ fn now() -> u64 {
 
 impl wasi::clocks::MonotonicClock<Resource<AnyPollable>> for HostState {
     fn now(&mut self) -> HlResult<monotonic_clock::Instant> {
-        Ok(now())
+        now()
     }
     fn resolution(&mut self) -> HlResult<monotonic_clock::Duration> {
-        Ok(1)
+        1
     }
     fn subscribe_instant(
         &mut self,
         when: monotonic_clock::Instant,
     ) -> HlResult<Resource<AnyPollable>> {
-        Ok(Resource::new(AnyPollable::future(
-            tokio::time::sleep_until(
-                tokio::time::Instant::now() + Duration::from_nanos(when.saturating_sub(now())),
-            ),
+        Resource::new(AnyPollable::future(tokio::time::sleep_until(
+            tokio::time::Instant::now() + Duration::from_nanos(when.saturating_sub(now())),
         )))
     }
     fn subscribe_duration(
         &mut self,
         when: monotonic_clock::Duration,
     ) -> HlResult<Resource<AnyPollable>> {
-        Ok(Resource::new(AnyPollable::future(tokio::time::sleep(
+        Resource::new(AnyPollable::future(tokio::time::sleep(
             Duration::from_nanos(when),
-        ))))
+        )))
     }
 }
 
@@ -52,15 +49,15 @@ impl wasi::clocks::WallClock for HostState {
         let d = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
             .unwrap_or_default();
-        Ok(wall_clock::Datetime {
+        wall_clock::Datetime {
             seconds: d.as_secs(),
             nanoseconds: d.subsec_nanos(),
-        })
+        }
     }
     fn resolution(&mut self) -> HlResult<wall_clock::Datetime> {
-        Ok(wall_clock::Datetime {
+        wall_clock::Datetime {
             seconds: 0,
             nanoseconds: 1,
-        })
+        }
     }
 }