Makes runtime wasm ready

Cargo.toml

@@ -8,6 +8,5 @@ members = [
     "crates/path",
     "crates/runtime",
 	"crates/winit",
-    "crates/wasm",
     "apps/web/src-tauri"
 ]

crates/runtime/Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [dependencies]
 env_logger = "0.10"
 wgpu = { version = "0.17", features = ["webgl"]}
@@ -19,4 +22,17 @@ radiant-core  = { path = "../core" }
 radiant-image-node = { path = "../image" }
 radiant-text-node = { path = "../text" }
 radiant-path-node = { path = "../path" }
-radiant-winit = { path = "../winit" }
+radiant-winit = { path = "../winit" }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+console_log = "1.0"
+console_error_panic_hook = "0.1.6"
+serde-wasm-bindgen = "0.4"
+js-sys = "0.3.64"
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4.30"
+web-sys = { version = "0.3", features = [
+    "Document",
+    "Window",
+    "Element",
+]}

crates/runtime/src/lib.rs

@@ -10,3 +10,6 @@ pub use radiant_core::*;
 pub use radiant_image_node::RadiantImageNode;
 pub use radiant_path_node::RadiantPathNode;
 pub use radiant_text_node::RadiantTextNode;
+
+#[cfg(target_arch = "wasm32")]
+pub mod wasm;

crates/wasm/src/lib.rs → crates/runtime/src/wasm.rs

@@ -1,9 +1,8 @@
 use std::sync::{Arc, RwLock};
 
-use radiant_runtime::RadiantRuntime;
-use radiant_runtime::{RadiantNodeType, RadiantRectangleNode, RadiantResponse};
+use crate::RadiantRuntime;
+use crate::{RadiantNodeType, RadiantRectangleNode, RadiantResponse};
 use wasm_bindgen::prelude::*;
-use winit::platform::web::EventLoopExtWebSys;
 
 #[wasm_bindgen(js_name = RadiantAppController)]
 pub struct RadiantAppController {
@@ -34,29 +33,9 @@ impl RadiantAppController {
                 [100.0, 100.0],
             )));
 
-        let event_loop = std::mem::replace(&mut runtime.app.event_loop, None);
-
         let runtime = Arc::new(RwLock::new(runtime));
-        let weak_runtime = Arc::downgrade(&runtime);
-        let f3 = f.clone();
 
-        if let Some(event_loop) = event_loop {
-            event_loop.spawn(move |event, _, control_flow| {
-                if let Some(runtime) = weak_runtime.upgrade() {
-                    if let Ok(mut runtime) = runtime.write() {
-                        if let Some(message) = runtime.app.handle_event(&event, control_flow) {
-                            if let Some(response) = runtime.handle_message(message) {
-                                let this = JsValue::null();
-                                let _ = f3.call1(
-                                    &this,
-                                    &serde_wasm_bindgen::to_value(&response).unwrap(),
-                                );
-                            }
-                        }
-                    }
-                }
-            });
-        }
+        radiant_winit::run_wasm(runtime.clone(), f.clone());
 
         Self { runtime }
     }

crates/winit/Cargo.toml

@@ -30,4 +30,7 @@ web-sys = { version = "0.3", features = [
     "Document",
     "Window",
     "Element",
-]}
+]}
+wasm-bindgen = "0.2"
+serde-wasm-bindgen = "0.4"
+js-sys = "0.3.64"

crates/winit/src/lib.rs

@@ -5,6 +5,13 @@ use winit::{event::*, event_loop::ControlFlow};
 
 pub use winit::event::Event::RedrawRequested;
 
+#[cfg(target_arch = "wasm32")]
+use std::sync::{Arc, RwLock};
+#[cfg(target_arch = "wasm32")]
+use wasm_bindgen::prelude::*;
+#[cfg(target_arch = "wasm32")]
+use winit::platform::web::EventLoopExtWebSys;
+
 pub struct RadiantApp<M, N: RadiantNode> {
     pub window: Window,
     pub event_loop: Option<EventLoop<()>>,
@@ -286,3 +293,34 @@ pub fn run_native<
         });
     }
 }
+
+#[cfg(target_arch = "wasm32")]
+pub fn run_wasm<
+    M: From<InteractionMessage> + TryInto<InteractionMessage> + 'static,
+    N: RadiantNode + 'static,
+    R: serde::ser::Serialize,
+>(
+    runtime: Arc<RwLock<impl Runtime<M, N, R> + 'static>>,
+    f: js_sys::Function,
+) {
+    let Ok(mut runtime_) = runtime.write() else { return; };
+    let event_loop = std::mem::replace(&mut runtime_.app().event_loop, None);
+
+    let weak_runtime = Arc::downgrade(&runtime);
+
+    if let Some(event_loop) = event_loop {
+        event_loop.spawn(move |event, _, control_flow| {
+            if let Some(runtime) = weak_runtime.upgrade() {
+                if let Ok(mut runtime) = runtime.write() {
+                    if let Some(message) = runtime.app().handle_event(&event, control_flow) {
+                        if let Some(response) = runtime.handle_runtime_message(message) {
+                            let this = JsValue::null();
+                            let _ =
+                                f.call1(&this, &serde_wasm_bindgen::to_value(&response).unwrap());
+                        }
+                    }
+                }
+            }
+        });
+    }
+}

package.json

@@ -2,6 +2,7 @@
     "private": true,
     "workspaces": [
         "crates/wasm/pkg", 
+        "crates/runtime/pkg", 
         "sdk/web",
         "apps/web"
     ]