Update host to use wasi 0.2.9

- Prepare for multiple guest components
- Upgrade the rust version used
- Move hyperlight wit file under a `wit/host` directory

Signed-off-by: Doru Blânzeanu <dblnz@pm.me>

Author: dblnz

Cargo.lock

@@ -63,7 +63,7 @@ cargo build
 Build the guest component:
 ```sh
 cargo component build --release \
-    --manifest-path guest/Cargo.toml \
+    --manifest-path guest_rust/Cargo.toml \
     --target-dir target
 ```
 
@@ -73,11 +73,11 @@ AOT compile it:
 cargo install hyperlight-wasm-aot
 hyperlight-wasm-aot compile --component \
     target/wasm32-wasip1/release/sample_wasi_http_rust.wasm \
-    target/wasm32-wasip1/release/sample_wasi_http_rust.bin
+    out/sample_wasi_http_rust.aot
 ```
 
 You can then run the server:
 
 ```sh
-cargo run -- target/wasm32-wasip1/release/sample_wasi_http_rust.bin
+cargo run -- out/sample_wasi_http_rust.aot
 ```

README.md

@@ -1,7 +1,7 @@
 use wstd::http::body::{BodyForthcoming, IncomingBody};
 use wstd::http::server::{Finished, Responder};
 use wstd::http::{IntoBody, Request, Response, StatusCode};
-use wstd::io::{copy, empty, AsyncWrite};
+use wstd::io::{AsyncWrite, copy, empty};
 use wstd::time::{Duration, Instant};
 
 #[wstd::http_server]
@@ -19,7 +19,7 @@ async fn main(req: Request<IncomingBody>, res: Responder) -> Finished {
 
 async fn home(_req: Request<IncomingBody>, res: Responder) -> Finished {
     // To send a single string as the response body, use `res::respond`.
-    res.respond(Response::new("Hello, wasi:http/proxy world!\n".into_body()))
+    res.respond(Response::new("Hello, Rust wasi:http world!\n".into_body()))
         .await
 }
 
@@ -97,4 +97,4 @@ async fn proxy(_req: Request<IncomingBody>, res: Responder) -> Finished {
     let mut body = res.start_response(Response::new(BodyForthcoming));
     let result = copy(upstream_res.body_mut(), &mut body).await;
     Finished::finish(body, result, None)
-}
+}

guest/Cargo.lock guest_rust/Cargo.lockguest/Cargo.lock renamed to guest_rust/Cargo.lock

@@ -1,41 +1,39 @@
 TARGET_DIR := justfile_directory() + "/target"
 BIN_DIR := TARGET_DIR + "/bin"
-GUEST_DIR := justfile_directory() + "/guest"
+OUT_DIR := justfile_directory() + "/out"
+default-target := "release"
 
 default: run
 
-install-cargo-component:
-    test -f {{ BIN_DIR }}/cargo-component || \
-    cargo install cargo-component \
-        --root {{ TARGET_DIR }}
-
-build-component: install-cargo-component
-    test -f {{ TARGET_DIR }}/wasm32-wasip1/release/sample_wasi_http_rust.wasm || \
-    cargo-component build --release \
-        --manifest-path {{ GUEST_DIR }}/Cargo.toml \
-        --target-dir {{ TARGET_DIR }}
+make-out-dir:
+    mkdir -p {{ OUT_DIR }}
 
 install-hyperlight-wasm-aot:
     test -f {{ BIN_DIR }}/hyperlight-wasm-aot || \
     cargo install hyperlight-wasm-aot \
+        --locked \
+        --version 0.9.0 \
         --root {{ TARGET_DIR }}
 
-aot-component: build-component install-hyperlight-wasm-aot
-    {{ BIN_DIR }}/hyperlight-wasm-aot compile --component \
-        {{ TARGET_DIR }}/wasm32-wasip1/release/sample_wasi_http_rust.wasm \
-        {{ TARGET_DIR }}/wasm32-wasip1/release/sample_wasi_http_rust.bin
+build-rust-component target=default-target: make-out-dir install-hyperlight-wasm-aot
+    cargo component build \
+      --profile={{ if target == "debug" { "dev" } else { target } }} \
+      --manifest-path guest_rust/Cargo.toml \
+      --target-dir {{ TARGET_DIR }}
+    cp {{ TARGET_DIR }}/wasm32-wasip1/{{ target }}/sample_wasi_http_rust.wasm {{ OUT_DIR }}/sample_wasi_http_rust.wasm
+    cd {{ OUT_DIR }} && {{ BIN_DIR }}/hyperlight-wasm-aot compile --component sample_wasi_http_rust.wasm
 
 install-wasm-tools:
     test -f {{ BIN_DIR }}/wasm-tools || \
     cargo install wasm-tools \
         --root {{ TARGET_DIR }}
 
 make-wit-world: install-wasm-tools
-    test -f hyperlight-world.wasm || \
-    {{ BIN_DIR }}/wasm-tools component wit hyperlight.wit -w -o hyperlight-world.wasm
+    {{ BIN_DIR }}/wasm-tools component wit wit/host/hyperlight.wit -w -o hyperlight-world.wasm
 
 build: make-wit-world
     cargo build
 
-run: build aot-component
-    cargo run -- {{ TARGET_DIR }}/wasm32-wasip1/release/sample_wasi_http_rust.bin
+run: build build-rust-component
+    cargo run -- {{ OUT_DIR }}/sample_wasi_http_rust.aot
+

guest/Cargo.toml guest_rust/Cargo.tomlguest/Cargo.toml renamed to guest_rust/Cargo.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.87.0"
+channel = "1.89.0"

guest/LICENSE guest_rust/LICENSEguest/LICENSE renamed to guest_rust/LICENSE

@@ -8,4 +8,7 @@ impl wasi::random::Random for WasiImpl {
         getrandom::fill(&mut buf).unwrap();
         buf
     }
+    fn get_random_u64(&mut self) -> u64 {
+        getrandom::u64().unwrap()
+    }
 }