Add wasip2 tests

Author: tomasol

.gitignore

@@ -1,5 +1,5 @@
 **/target
 **/*.rs.bk
 Cargo.lock
-.cargo
+/.cargo
 .config

Justfile

@@ -1,9 +1,14 @@
-# Builds `tonic-web-wasm-client`
+# Builds `tonic-web-wasm-client` for `wasm32-unknown-unknown` target
 build:
     @echo 'Building...'
     cargo build --target wasm32-unknown-unknown
 
-# Builds test `tonic-web` server
+# Builds `tonic-web-wasm-client` for `wasm32-wasip2` target
+build-wasip2:
+    @echo 'Building...'
+    cargo build --target wasm32-wasip2
+
+# Builds test `tonic-web` server natively
 build-test-server:
     @echo 'Building test server...'
     cd test-suite/simple/server && cargo build
@@ -23,12 +28,29 @@ test-headless:
     @echo 'Testing...'
     cd test-suite/simple/client && wasm-pack test --headless --chrome
 
-# Builds test `tonic-web` server (with compression enabled: gzip)
+# Checks wasmtime version, needed only for -wasip2 recipes
+check-wasmtime-version:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    version_output=$(wasmtime --version)
+    current_version=$(echo "${version_output}" | awk '{print $2}')
+    required_version="35.0.0"
+    if ! printf '%s\n' "${required_version}" "${current_version}" | sort --check=silent --version-sort; then
+        echo "Error: wasmtime version ${current_version} is installed."
+        echo "Version 35.0.0 or greater is required."
+        exit 1
+    fi
+
+# Runs wasip2 tests in `wasmtime`
+test-wasip2: check-wasmtime-version
+    cd test-suite/simple/client && cargo test --target wasm32-wasip2
+
+# Builds test `tonic-web` server (with compression enabled: gzip) for `wasm32-unknown-unknown` target
 build-gzip-test-server:
     @echo 'Building test server...'
     cd test-suite/gzip/server && cargo build
 
-# Starts test `tonic-web` server (with compression enabled: gzip)
+# Starts test `tonic-web` server (with compression enabled: gzip) natively
 start-gzip-test-server:
     @echo 'Starting test server...'
     cd test-suite/gzip/server && cargo run
@@ -42,3 +64,9 @@ test-gzip:
 test-gzip-headless:
     @echo 'Testing...'
     cd test-suite/gzip/client && wasm-pack test --headless --chrome
+
+# Runs wasip2 tests (with compression enabled: gzip) in `wasmtime`
+test-gzip-wasip2: check-wasmtime-version
+    @echo 'Testing...'
+    cd test-suite/gzip/client &&  cargo test --target wasm32-wasip2
+

test-suite/gzip/client/.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-wasip2]
+runner = "wasmtime run -Scli -Shttp" # Runs wasip2 tests in wasmtime

test-suite/gzip/client/Cargo.toml

@@ -15,4 +15,10 @@ tonic-prost-build = { version = "0.14", default-features = false }
 
 [dev-dependencies]
 tonic-web-wasm-client = { path = "../../.." }
+
+# Browser-specific dependencies
+[target.wasm32-unknown-unknown.dev-dependencies]
 wasm-bindgen-test = "0.3"
+
+[target.wasm32-wasip2.dependencies]
+wstd = "0.5"

test-suite/gzip/client/tests/web.rs

@@ -1,8 +1,10 @@
 use client::proto::{echo_client::EchoClient, EchoRequest};
 use tonic::codegen::CompressionEncoding;
 use tonic_web_wasm_client::Client;
+#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
+#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 wasm_bindgen_test_configure!(run_in_browser);
 
 fn build_client() -> EchoClient<Client> {
@@ -12,7 +14,11 @@ fn build_client() -> EchoClient<Client> {
     EchoClient::new(wasm_client).accept_compressed(CompressionEncoding::Gzip)
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_echo() {
     let mut client = build_client();
 
@@ -27,7 +33,11 @@ async fn test_echo() {
     assert_eq!(response.message, "echo(John)");
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_echo_stream() {
     let mut client = build_client();
 
@@ -51,7 +61,11 @@ async fn test_echo_stream() {
     assert!(response.is_none());
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_infinite_echo_stream() {
     let mut client = build_client();
 

test-suite/simple/client/.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.wasm32-wasip2]
+runner = "wasmtime run -Scli -Shttp" # Runs wasip2 tests in wasmtime

test-suite/simple/client/Cargo.toml

@@ -15,4 +15,10 @@ tonic-prost-build = { version = "0.14", default-features = false }
 
 [dev-dependencies]
 tonic-web-wasm-client = { path = "../../.." }
+
+# Browser-specific dependencies
+[target.wasm32-unknown-unknown.dev-dependencies]
 wasm-bindgen-test = "0.3"
+
+[target.wasm32-wasip2.dependencies]
+wstd = "0.5"

test-suite/simple/client/tests/web.rs

@@ -1,8 +1,10 @@
 use client::proto::{echo_client::EchoClient, EchoRequest};
 use tonic::Code;
 use tonic_web_wasm_client::Client;
+#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
+#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
 wasm_bindgen_test_configure!(run_in_browser);
 
 fn build_client() -> EchoClient<Client> {
@@ -12,7 +14,11 @@ fn build_client() -> EchoClient<Client> {
     EchoClient::new(wasm_client)
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_echo() {
     let mut client = build_client();
 
@@ -27,7 +33,11 @@ async fn test_echo() {
     assert_eq!(response.message, "echo(John)");
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_echo_stream() {
     let mut client = build_client();
 
@@ -51,7 +61,11 @@ async fn test_echo_stream() {
     assert!(response.is_none());
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_infinite_echo_stream() {
     let mut client = build_client();
 
@@ -75,7 +89,11 @@ async fn test_infinite_echo_stream() {
     assert!(response.is_some());
 }
 
-#[wasm_bindgen_test]
+#[cfg_attr(all(target_arch = "wasm32", target_os = "unknown"), wasm_bindgen_test)]
+#[cfg_attr(
+    all(target_arch = "wasm32", target_os = "wasi", target_env = "p2"),
+    wstd::test
+)]
 async fn test_error_response() {
     let mut client = build_client();