bump upstream packages

Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>

Author: jprendes

Cargo.lock

@@ -3,10 +3,10 @@ name = "hyperlight-wasm-http-example"
 edition = "2024"
 
 [dependencies]
-hyperlight-component-macro = { git="https://github.com/jprendes/hyperlight.git", rev="081053cbf8821997445f2f40c79818e14e6f3062" }
-hyperlight-common = { git="https://github.com/jprendes/hyperlight.git", rev="081053cbf8821997445f2f40c79818e14e6f3062" }
-hyperlight-host = { git="https://github.com/jprendes/hyperlight.git", rev="081053cbf8821997445f2f40c79818e14e6f3062", default-features = false, features = [ "kvm", "mshv2" ] }
-hyperlight-wasm = { git="https://github.com/jprendes/hyperlight-wasm.git", rev="2ac973b881939edbd7c0167d6b09055a52548680" }
+hyperlight-component-macro = { git="https://github.com/jprendes/hyperlight.git", rev="3d459364116e2e3c5b7c37598625fdf0fb540217" }
+hyperlight-common = { git="https://github.com/jprendes/hyperlight.git", rev="3d459364116e2e3c5b7c37598625fdf0fb540217" }
+hyperlight-host = { git="https://github.com/jprendes/hyperlight.git", rev="3d459364116e2e3c5b7c37598625fdf0fb540217", default-features = false, features = [ "kvm", "mshv2" ] }
+hyperlight-wasm = { git="https://github.com/jprendes/hyperlight-wasm.git", rev="134d8fc355ef842ace918777a758349342241c9d" }
 
 hyper = "1.7"
 reqwest = { version = "0.12", features = ["stream", "gzip", "brotli", "deflate", "rustls-tls", "blocking"] }
@@ -16,6 +16,3 @@ anyhow = "1.0"
 http-body-util = "0.1"
 hyper-util = { version = "0.1", features = ["full"] }
 getrandom = "0.3.3"
-
-[features]
-use-macro = []

Cargo.toml

@@ -14,61 +14,68 @@ server](https://github.com/bytecodealliance/sample-wasi-http-rust).
 
 1. [Rust](https://www.rust-lang.org/tools/install), including the `x86_64-unknown-none` target (which may be installed via e.g. `rustup target add x86_64-unknown-none`)
 2. `clang`
-3. [`wasm-tools`](https://github.com/bytecodealliance/wasm-tools)
-4. If you are fetching the sample binary from an OCI registry,
-   [`wkg`](https://crates.io/crates/wkg/0.10.0).
-5. [`hyperlight-wasm-aot`](https://github.com/hyperlight-dev/hyperlight-wasm)
-6. [`just`](https://github.com/casey/just) (optional, but recommended)
+3. [`just`](https://github.com/casey/just) (optional, but recommended)
 
-`wasm-tools`, `wkg`, and `hyperlight-wasm-aot` will be automaticall installed if they are not present.
+If you want to follow the manual build instructions, you will also need:
+4. [`wasm-tools`](https://github.com/bytecodealliance/wasm-tools)
+5. If you are fetching the sample binary from an OCI registry,
+   [`wkg`](https://crates.io/crates/wkg/0.10.0).
+6. [`hyperlight-wasm-aot`](https://github.com/hyperlight-dev/hyperlight-wasm) from [this commit](https://github.com/jprendes/hyperlight-wasm/tree/134d8fc35)
 
-## Building
+## Simply setup
 
-The easy way is to just run
+### Building
 
 ```sh
 just build
 ```
 
-The manual way is as follows.
+### Running
+
+```sh
+just run
+```
+
+From another terminal, you can then test the server:
+
+```sh
+curl http://localhost:3000/
+curl -w'\n' -d "hola mundo" http://127.0.0.1:3000/echo
+curl -I -H "x-language: spanish" http://127.0.0.1:3000/echo-headers
+```
+
+## Manual setup
+
+### Building
 
 Compile the WIT and set the environment variables used when building
 (both the host and the guest):
 
 ```sh
 wasm-tools component wit hyperlight.wit -w -o hyperlight-world.wasm
-export WIT_WORLD=$PWD/hyperlight-world.wasm
 ```
 
 Build:
 ```
 cargo build
 ```
 
-## Running
-
-The easy way is to just run
-
-```sh
-just run
-```
-
-The manual way is as follows.
+### Running
 
 Get an `sample_wasi_http_rust.wasm` from [the sample
 repo](https://github.com/bytecodealliance/sample-wasi-http-rust), either
-by building it or by fetching it from the OCI registry (`wkg oci pull
-ghcr.io/bytecodealliance/sample-wasi-http-rust/sample-wasi-http-rust:latest -o sample_wasi_http_rust.wasm`).
+by building it or by fetching it from the OCI registry
+(`wkg oci pull ghcr.io/bytecodealliance/sample-wasi-http-rust/sample-wasi-http-rust:latest -o sample_wasi_http_rust.wasm`).
 
 AOT compile it:
 
 ```sh
-cargo install hyperlight-wasm-aot
+cargo install hyperlight-wasm-aot --git https://github.com/jprendes/hyperlight-wasm.git --rev 134d8fc35
 hyperlight-wasm-aot compile --component sample_wasi_http_rust.wasm sample_wasi_http_rust.bin
 ```
 
 You can then run the server:
 
 ```sh
-cargo run # or target/debug/echo
+cargo run -- sample_wasi_http_rust.bin
 ```

README.md

@@ -2,56 +2,51 @@
 install-wkg:
     #!/bin/bash
     set -euox pipefail
-    if ! command -v wkg > /dev/null; then
-        cargo install wkg
+    if ! [[ -f {{ justfile_directory() }}/target/bin/wkg ]]; then
+        cargo install wkg \
+            --root {{ justfile_directory() }}/target
     fi
 
 get-component: install-wkg
     #!/bin/bash
     set -euox pipefail
     if ! [[ -f sample_wasi_http_rust.wasm ]]; then
-        wkg oci pull \
+        {{ justfile_directory() }}/target/bin/wkg oci pull \
             ghcr.io/bytecodealliance/sample-wasi-http-rust/sample-wasi-http-rust:latest \
             -o sample_wasi_http_rust.wasm
     fi
 
 install-hyperlight-wasm-aot:
     #!/bin/bash
     set -euox pipefail
-    if ! command -v hyperlight-wasm-aot > /dev/null; then
-        cargo install hyperlight-wasm-aot
+    if ! [[ -f {{ justfile_directory() }}/target/bin/hyperlight-wasm-aot ]]; then
+        cargo install hyperlight-wasm-aot \
+            --git https://github.com/jprendes/hyperlight-wasm.git \
+            --rev 134d8fc355ef842ace918777a758349342241c9d \
+            --root {{ justfile_directory() }}/target
     fi
 
 aot-component: get-component install-hyperlight-wasm-aot
     #!/bin/bash
     set -euox pipefail
-    hyperlight-wasm-aot compile --component sample_wasi_http_rust.wasm sample_wasi_http_rust.bin
+    {{ justfile_directory() }}/target/bin/hyperlight-wasm-aot compile --component sample_wasi_http_rust.wasm sample_wasi_http_rust.bin
 
 install-wasm-tools:
     #!/bin/bash
     set -euox pipefail
-    if ! command -v wasm-tools > /dev/null; then
-        cargo install wasm-tools
+    if ! [[ -f {{ justfile_directory() }}/target/bin/wasm-tools ]]; then
+        cargo install wasm-tools \
+            --root {{ justfile_directory() }}/target
     fi
 
 make-wit-world: install-wasm-tools
     #!/bin/bash
     set -euox pipefail
     if ! [[ -f hyperlight-world.wasm ]]; then
-        wasm-tools component wit hyperlight.wit -w -o hyperlight-world.wasm
+        {{ justfile_directory() }}/target/bin/wasm-tools component wit hyperlight.wit -w -o hyperlight-world.wasm
     fi
 
-generate-bindings: make-wit-world
-    #!/bin/bash
-    set -euox pipefail
-    if ! [[ -f {{ justfile_directory() }}/src/bindings.rs ]]; then
-        export WIT_WORLD={{ justfile_directory() }}/hyperlight-world.wasm
-        export HYPERLIGHT_COMPONENT_MACRO_DEBUG={{ justfile_directory() }}/src/bindings.rs
-        cargo build --features=use-macro || true
-        git apply --no-index {{ justfile_directory() }}/bindings.patch
-    fi
-
-build: generate-bindings
+build: make-wit-world
     #!/bin/bash
     set -euox pipefail
     export WIT_WORLD={{ justfile_directory() }}/hyperlight-world.wasm

justfile

@@ -1,18 +1,9 @@
 extern crate alloc;
 
-#[cfg(feature = "use-macro")]
 mod bindings {
     hyperlight_component_macro::host_bindgen!();
 }
 
-// the bindings mod is like the above definition, but with an extra line that the
-// macro is currently missing:
-//   let mut rts = self.rt.lock().unwrap();
-// without that line, the generated code doesn't compile
-// See bindings.patch for the diff
-#[cfg(not(feature = "use-macro"))]
-mod bindings;
-
 mod resource;
 mod types;
 mod worker;
@@ -34,6 +25,14 @@ use worker::RUNTIME;
 use crate::bindings::wasi::http::IncomingHandler;
 
 fn main() {
+    let args = std::env::args().collect::<Vec<_>>();
+    if args.len() != 2 {
+        eprintln!("Usage: {} <AOT_WASM_FILE>", args[0]);
+        std::process::exit(1);
+    }
+
+    let wasm_path = &args[1];
+
     let builder = hyperlight_wasm::SandboxBuilder::new()
         .with_guest_heap_size(30 * 1024 * 1024)
         .with_guest_stack_size(1 * 1024 * 1024);
@@ -51,7 +50,7 @@ fn main() {
     let rt = bindings::register_host_functions(&mut sb, state);
 
     let sb = sb.load_runtime().unwrap();
-    let sb = sb.load_module("sample_wasi_http_rust.bin").unwrap();
+    let sb = sb.load_module(wasm_path).unwrap();
 
     let sb = bindings::RootSandbox { sb, rt };
     let sb = Arc::new(Mutex::new(sb));