Make sure hosts dont need hyperlight-host dependency

Signed-off-by: Simon Davies <[email protected]>

Author: simongdavies

src/hyperlight_wasm/examples/guest-debugging/main.rs

@@ -42,8 +42,7 @@ limitations under the License.
 //! is built.
 
 use examples_common::get_wasm_module_path;
-use hyperlight_host::HyperlightError;
-use hyperlight_wasm::{LoadedWasmSandbox, Result, SandboxBuilder};
+use hyperlight_wasm::{HyperlightError, LoadedWasmSandbox, Result, SandboxBuilder};
 
 fn get_time_since_boot_microsecond() -> Result<i64> {
     let res = std::time::SystemTime::now()

src/hyperlight_wasm/examples/helloworld/main.rs

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 use examples_common::get_wasm_module_path;
-use hyperlight_host::HyperlightError;
-use hyperlight_wasm::{Result, SandboxBuilder};
+use hyperlight_wasm::{HyperlightError, Result, SandboxBuilder};
 
 fn get_time_since_boot_microsecond() -> Result<i64> {
     let res = std::time::SystemTime::now()

src/hyperlight_wasm/src/lib.rs

@@ -26,20 +26,38 @@ pub use sandbox::loaded_wasm_sandbox::LoadedWasmSandbox;
 pub use sandbox::proto_wasm_sandbox::ProtoWasmSandbox;
 pub use sandbox::sandbox_builder::SandboxBuilder;
 pub use sandbox::wasm_sandbox::WasmSandbox;
+
+// Re-export types from hyperlight-host so consumers don't need to depend on it directly
+
 /// The container to store the value of a single parameter to a guest
 /// function.
 pub type ParameterValue = hyperlight_host::func::ParameterValue;
 /// The container to store the return value from a guest function call.
 pub type ReturnValue = hyperlight_host::func::ReturnValue;
 /// The type of the return value from a guest function call.
 pub type ReturnType = hyperlight_host::func::ReturnType;
-/// The Result of a fuunction call
+/// The Result of a function call
 pub type Result<T> = hyperlight_host::Result<T>;
+
+/// The error type for Hyperlight operations
+pub use hyperlight_host::HyperlightError;
+// Re-export function-related types for host function registration
+/// A host function that can be registered with a sandbox
+pub use hyperlight_host::func::HostFunction;
+/// Trait bound for parameter tuples passed to guest/host functions
+pub use hyperlight_host::func::ParameterTuple;
+/// Trait for types that can register host functions
+pub use hyperlight_host::func::Registerable;
+/// Trait bound for return types from guest/host functions
+pub use hyperlight_host::func::SupportedReturnType;
+// Re-export interrupt handle for cancellation support
+/// Handle for interrupting guest execution
+pub use hyperlight_host::hypervisor::InterruptHandle;
 /// Check if there is a hypervisor present
 pub use hyperlight_host::is_hypervisor_present;
 /// Create a generic HyperlightError
 pub use hyperlight_host::new_error;
-// A snapshot of the memory of a sandbox at a given point in time.
+/// A snapshot of the memory of a sandbox at a given point in time.
 pub use hyperlight_host::sandbox::snapshot::Snapshot;
 
 /// Get the build information for this version of hyperlight-wasm

src/hyperlight_wasm/src/sandbox/loaded_wasm_sandbox.rs

@@ -18,8 +18,7 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 use hyperlight_host::func::{ParameterTuple, SupportedReturnType};
-// re-export the InterruptHandle trait as it's part of the public API
-pub use hyperlight_host::hypervisor::InterruptHandle;
+use hyperlight_host::hypervisor::InterruptHandle;
 use hyperlight_host::sandbox::Callable;
 use hyperlight_host::sandbox::snapshot::Snapshot;
 use hyperlight_host::{MultiUseSandbox, Result, log_then_return, new_error};

src/hyperlight_wasm/src/sandbox/sandbox_builder.rs

@@ -51,7 +51,7 @@ impl SandboxBuilder {
     ///
     /// # Example:
     /// ```rust
-    /// use hyperlight_host::sandbox::SandboxBuilder;
+    /// use hyperlight_wasm::SandboxBuilder;
     /// let sandbox = SandboxBuilder::new()
     ///    .with_debugging_enabled(8080) // Enable debugging on port 8080
     ///    .build()
@@ -134,11 +134,6 @@ impl SandboxBuilder {
         self
     }
 
-    /// Get the current configuration
-    pub fn get_config(&self) -> &SandboxConfiguration {
-        &self.config
-    }
-
     /// Build the ProtoWasmSandbox
     pub fn build(self) -> Result<ProtoWasmSandbox> {
         if !is_hypervisor_present() {