[bfops/wasm-test]: WIP

Author: bfops

Cargo.lock

@@ -13,13 +13,15 @@ crate-type = ["cdylib", "rlib"]
 default = ["native"]
 
 # Builds the existing CLI test client.
-native = []
+native = ["dep:tokio"]
 
 # Builds the client for wasm32-unknown-unknown using the Rust SDK `web` backend.
 web = [
     "spacetimedb-sdk/web",
     "dep:wasm-bindgen",
     "dep:wasm-bindgen-futures",
+    "dep:console_error_panic_hook",
+    "dep:gloo-timers",
     "dep:futures",
 ]
 
@@ -33,9 +35,12 @@ spacetimedb-sdk = { path = "../.." }
 test-counter = { path = "../test-counter" }
 anyhow.workspace = true
 futures = { workspace = true, optional = true }
+tokio = { workspace = true, optional = true }
+gloo-timers = { version = "0.3.0", features = ["futures"], optional = true }
 
 wasm-bindgen = { version = "0.2.100", optional = true }
 wasm-bindgen-futures = { version = "0.4.45", optional = true }
+console_error_panic_hook = { version = "0.1.7", optional = true }
 
 [lints]
 workspace = true

sdks/rust/tests/connect_disconnect_client/Cargo.toml

@@ -8,6 +8,10 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 #[cfg(all(target_arch = "wasm32", feature = "web"))]
 #[wasm_bindgen]
-pub async fn run(_test_name: String) {
-    cli::dispatch();
+pub async fn run(_test_name: String, db_name: String) {
+    console_error_panic_hook::set_once();
+    // The shared wasm test harness always passes `(test_name, db_name)`, even for
+    // fixed-flow clients like this one that ignore the selector.
+    cli::set_web_db_name(db_name);
+    cli::dispatch().await;
 }

sdks/rust/tests/connect_disconnect_client/src/lib.rs

@@ -8,16 +8,36 @@ use test_counter::TestCounter;
 
 const LOCALHOST: &str = "http://localhost:3000";
 
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+static WEB_DB_NAME: OnceLock<String> = OnceLock::new();
+
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+pub(crate) fn set_web_db_name(db_name: String) {
+    WEB_DB_NAME.set(db_name).expect("WASM DB name was already initialized");
+}
+
 fn db_name_or_panic() -> String {
-    std::env::var("SPACETIME_SDK_TEST_DB_NAME").expect("Failed to read db name from env")
+    #[cfg(all(target_arch = "wasm32", feature = "web"))]
+    {
+        return WEB_DB_NAME
+            .get()
+            .cloned()
+            .expect("Failed to read db name from wasm runner");
+    }
+
+    #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+    {
+        std::env::var("SPACETIME_SDK_TEST_DB_NAME").expect("Failed to read db name from env")
+    }
 }
 
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {
-    dispatch();
+    // Keep a single async execution path so native and wasm exercise the same logic.
+    tokio::runtime::Runtime::new().unwrap().block_on(dispatch());
 }
 
-pub(crate) fn dispatch() {
+pub(crate) async fn dispatch() {
     let disconnect_test_counter = TestCounter::new();
     let disconnect_result = disconnect_test_counter.add_test("disconnect");
 
@@ -62,20 +82,20 @@ pub(crate) fn dispatch() {
                 None => disconnect_result(Ok(())),
             }
         });
-    let connection = build_connection(connection);
+    let connection = build_connection(connection).await;
 
     #[cfg(not(target_arch = "wasm32"))]
     let join_handle = connection.run_threaded();
     #[cfg(target_arch = "wasm32")]
     connection.run_background_task();
 
-    connect_test_counter.wait_for_all();
+    wait_for_all(&connect_test_counter).await;
 
-    connection.disconnect().unwrap();
+    disconnect_connection(&connection).await;
     #[cfg(not(target_arch = "wasm32"))]
     join_handle.join().unwrap();
 
-    disconnect_test_counter.wait_for_all();
+    wait_for_all(&disconnect_test_counter).await;
 
     let reconnect_test_counter = TestCounter::new();
     let reconnected_result = reconnect_test_counter.add_test("on_reconnect");
@@ -88,7 +108,7 @@ pub(crate) fn dispatch() {
         })
         .with_database_name(db_name_or_panic())
         .with_uri(LOCALHOST);
-    let new_connection = build_connection(new_connection);
+    let new_connection = build_connection(new_connection).await;
 
     new_connection
         .subscription_builder()

sdks/rust/tests/connect_disconnect_client/src/main.rs

@@ -13,5 +13,5 @@ use wasm_bindgen::prelude::wasm_bindgen;
 pub async fn run(test_name: String, db_name: String) {
     console_error_panic_hook::set_once();
     cli::set_web_db_name(db_name);
-    cli::dispatch_async(&test_name).await;
+    cli::dispatch(&test_name).await;
 }

sdks/rust/tests/test-client/src/lib.rs

@@ -9,6 +9,8 @@ license-file = "LICENSE"
 [dependencies]
 spacetimedb-data-structures.workspace = true
 anyhow.workspace = true
+futures.workspace = true
+gloo-timers = { version = "0.3.0", features = ["futures"] }
 
 [lints]
 workspace = true