ffi work

veilid-wasm/.gitignore

@@ -0,0 +1,5 @@
+/target
+**/*.rs.bk
+bin/
+pkg/
+wasm-pack.log

veilid-wasm/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "veilid-wasm"
+version = "0.1.0"
+authors = ["John Smith <jsmith@example.com>"]
+edition = "2021"
+license = "LGPL-2.0-or-later OR MPL-2.0 OR (MIT AND BSD-3-Clause)"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+wasm-bindgen = "^0"
+console_error_panic_hook = "^0"
+wee_alloc = "^0"
+wasm-logger = "^0"
+log = "^0"
+veilid-core = { path = "../veilid-core" }
+cfg-if = "^1"
+wasm-bindgen-futures = "^0"
+js-sys = "^0"
+
+[dev-dependencies]
+wasm-bindgen-test = "^0"

veilid-wasm/src/js_veilid_core.rs

@@ -0,0 +1,286 @@
+use crate::*;
+pub use wasm_bindgen_futures::*;
+
+#[wasm_bindgen(js_name = VeilidStateChange)]
+pub struct JsVeilidStateChange {
+    kind: String, // "attachment" => AttachmentState(String)
+    from: JsValue,
+    to: JsValue,
+}
+#[wasm_bindgen(js_name = VeilidState)]
+pub struct JsVeilidState {
+    kind: String, // "attachment" => AttachmentState(String)
+    state: JsValue,
+}
+
+#[wasm_bindgen(js_name = VeilidCore)]
+pub struct JsVeilidCore {
+    core: VeilidCore,
+}
+
+#[wasm_bindgen(js_class = VeilidCore)]
+impl JsVeilidCore {
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Self {
+        set_panic_hook();
+        JsVeilidCore {
+            core: VeilidCore::new(),
+        }
+    }
+    fn value_to_string(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(val.as_string().ok_or(())?))
+    }
+    fn value_to_option_string(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        if val.is_null() || val.is_undefined() {
+            return Ok(Box::new(Option::<String>::None));
+        }
+        Ok(Box::new(Some(val.as_string().ok_or(())?)))
+    }
+    fn value_to_bool(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(val.is_truthy()))
+    }
+    fn value_to_u8(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(f64_try_to_unsigned::<u8>(
+            val.as_f64().ok_or(())?,
+        )?))
+    }
+    fn value_to_u32(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(f64_try_to_unsigned::<u32>(
+            val.as_f64().ok_or(())?,
+        )?))
+    }
+    fn value_to_u64(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(f64_try_to_unsigned::<u64>(
+            val.as_f64().ok_or(())?,
+        )?))
+    }
+    fn value_to_option_u64(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        if val.is_null() || val.is_undefined() {
+            return Ok(Box::new(Option::<u64>::None));
+        }
+
+        Ok(Box::new(Some(f64_try_to_unsigned::<u64>(
+            val.as_f64().ok_or(())?,
+        )?)))
+    }
+    fn value_to_dht_key(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(
+            DHTKey::try_decode(val.as_string().ok_or(())?.as_str()).map_err(drop)?,
+        ))
+    }
+    fn value_to_dht_key_secret(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        Ok(Box::new(
+            DHTKeySecret::try_decode(val.as_string().ok_or(())?.as_str()).map_err(drop)?,
+        ))
+    }
+    fn value_to_vec_string(val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        let arrval = val.dyn_into::<Array>().map_err(drop)?.to_vec();
+        let mut out = Vec::<String>::with_capacity(arrval.len());
+        for v in arrval {
+            out.push(v.as_string().ok_or(())?);
+        }
+        Ok(Box::new(out))
+    }
+
+    fn translate_config_callback(key: &str, val: JsValue) -> Result<Box<dyn core::any::Any>, ()> {
+        match key {
+            // xxx: lots of missing keys here
+            "namespace" => Self::value_to_string(val),
+            "capabilities.protocol_udp" => Self::value_to_bool(val),
+            "capabilities.protocol_connect_tcp" => Self::value_to_bool(val),
+            "capabilities.protocol_accept_tcp" => Self::value_to_bool(val),
+            "capabilities.protocol_connect_ws" => Self::value_to_bool(val),
+            "capabilities.protocol_accept_ws" => Self::value_to_bool(val),
+            "capabilities.protocol_connect_wss" => Self::value_to_bool(val),
+            "capabilities.protocol_accept_wss" => Self::value_to_bool(val),
+            "tablestore.directory" => Self::value_to_string(val),
+            "network.max_connections" => Self::value_to_u32(val),
+            "network.node_id" => Self::value_to_dht_key(val),
+            "network.node_id_secret" => Self::value_to_dht_key_secret(val),
+            "network.bootstrap" => Self::value_to_vec_string(val),
+            "network.rpc.concurrency" => Self::value_to_u32(val),
+            "network.rpc.queue_size" => Self::value_to_u32(val),
+            "network.rpc.max_timestamp_behind" => Self::value_to_option_u64(val),
+            "network.rpc.max_timestamp_ahead" => Self::value_to_option_u64(val),
+            "network.rpc.timeout" => Self::value_to_u64(val),
+            "network.rpc.max_route_hop_count" => Self::value_to_u8(val),
+            "network.dht.resolve_node_timeout" => Self::value_to_option_u64(val),
+            "network.dht.resolve_node_count" => Self::value_to_u32(val),
+            "network.dht.resolve_node_fanout" => Self::value_to_u32(val),
+            "network.dht.max_find_node_count" => Self::value_to_u32(val),
+            "network.dht.get_value_timeout" => Self::value_to_option_u64(val),
+            "network.dht.get_value_count" => Self::value_to_u32(val),
+            "network.dht.get_value_fanout" => Self::value_to_u32(val),
+            "network.dht.set_value_timeout" => Self::value_to_option_u64(val),
+            "network.dht.set_value_count" => Self::value_to_u32(val),
+            "network.dht.set_value_fanout" => Self::value_to_u32(val),
+            "network.dht.min_peer_count" => Self::value_to_u32(val),
+            "network.dht.min_peer_refresh_time" => Self::value_to_u64(val),
+            "network.dht.validate_dial_info_receipt_time" => Self::value_to_u64(val),
+            "network.upnp" => Self::value_to_bool(val),
+            "network.natpmp" => Self::value_to_bool(val),
+            "network.address_filter" => Self::value_to_bool(val),
+            "network.restricted_nat_retries" => Self::value_to_u32(val),
+            "network.tls.certificate_path" => Self::value_to_string(val),
+            "network.tls.private_key_path" => Self::value_to_string(val),
+            "network.application.path" => Self::value_to_string(val),
+            "network.application.https.enabled" => Self::value_to_bool(val),
+            "network.application.https.listen_address" => Self::value_to_string(val),
+            "network.application.http.enabled" => Self::value_to_bool(val),
+            "network.application.http.listen_address" => Self::value_to_string(val),
+            "network.protocol.udp.enabled" => Self::value_to_bool(val),
+            "network.protocol.udp.socket_pool_size" => Self::value_to_u32(val),
+            "network.protocol.udp.listen_address" => Self::value_to_string(val),
+            "network.protocol.udp.public_address" => Self::value_to_option_string(val),
+            "network.protocol.tcp.connect" => Self::value_to_bool(val),
+            "network.protocol.tcp.listen" => Self::value_to_bool(val),
+            "network.protocol.tcp.max_connections" => Self::value_to_u32(val),
+            "network.protocol.tcp.listen_address" => Self::value_to_string(val),
+            "network.protocol.tcp.public_address" => Self::value_to_option_string(val),
+            "network.protocol.ws.connect" => Self::value_to_bool(val),
+            "network.protocol.ws.listen" => Self::value_to_bool(val),
+            "network.protocol.ws.max_connections" => Self::value_to_u32(val),
+            "network.protocol.ws.listen_address" => Self::value_to_string(val),
+            "network.protocol.ws.path" => Self::value_to_string(val),
+            "network.protocol.ws.public_address" => Self::value_to_option_string(val),
+            "network.protocol.wss.connect" => Self::value_to_bool(val),
+            "network.protocol.wss.listen" => Self::value_to_bool(val),
+            "network.protocol.wss.max_connections" => Self::value_to_u32(val),
+            "network.protocol.wss.listen_address" => Self::value_to_string(val),
+            "network.protocol.wss.path" => Self::value_to_string(val),
+            "network.protocol.wss.public_address" => Self::value_to_option_string(val),
+            _ => return Err(()),
+        }
+    }
+    fn translate_veilid_state(state: JsVeilidState) -> Result<VeilidState, JsValue> {
+        Ok(match state.kind.as_str() {
+            "attachment" => {
+                let state_string = state
+                    .state
+                    .as_string()
+                    .ok_or(JsValue::from_str("state should be a string"))?;
+                let astate = AttachmentState::try_from(state_string)
+                    .map_err(|e| JsValue::from_str(format!("invalid state: {:?}", e).as_str()))?;
+                VeilidState::Attachment(astate)
+            }
+            _ => return Err(JsValue::from_str("unknown state kind")),
+        })
+    }
+    // xxx rework this for new veilid_api mechanism which should be its own js object now
+    pub fn startup(
+        &self,
+        js_state_change_callback: Function,
+        js_config_callback: Function,
+    ) -> Promise {
+        let core = self.core.clone();
+        future_to_promise(async move {
+            let vcs = VeilidCoreSetup {
+                state_change_callback: Arc::new(
+                    move |change: VeilidStateChange| -> SystemPinBoxFuture<()> {
+                        let js_state_change_callback = js_state_change_callback.clone();
+                        Box::pin(async move {
+                            let js_change = match change {
+                                VeilidStateChange::Attachment {
+                                    old_state,
+                                    new_state,
+                                } => JsVeilidStateChange {
+                                    kind: "attachment".to_owned(),
+                                    from: JsValue::from_str(old_state.to_string().as_str()),
+                                    to: JsValue::from_str(new_state.to_string().as_str()),
+                                },
+                            };
+
+                            let ret = match Function::call1(
+                                &js_state_change_callback,
+                                &JsValue::UNDEFINED,
+                                &JsValue::from(js_change),
+                            ) {
+                                Ok(v) => v,
+                                Err(e) => {
+                                    error!("calling state change callback failed: {:?}", e);
+                                    return;
+                                }
+                            };
+                            let retp: Promise = match ret.dyn_into() {
+                                Ok(v) => v,
+                                Err(e) => {
+                                    error!(
+                                        "state change callback did not return a promise: {:?}",
+                                        e
+                                    );
+                                    return;
+                                }
+                            };
+                            match JsFuture::from(retp).await {
+                                Ok(_) => (),
+                                Err(e) => {
+                                    error!("state change callback returned an error: {:?}", e);
+                                    return;
+                                }
+                            };
+                        })
+                    },
+                ),
+                config_callback: Arc::new(
+                    move |key: String| -> Result<Box<dyn core::any::Any>, String> {
+                        let val = Function::call1(
+                            &js_config_callback,
+                            &JsValue::UNDEFINED,
+                            &JsValue::from_str(key.as_str()),
+                        )
+                        .map_err(|_| {
+                            format!("Failed to get config from callback for key '{}'", key)
+                        })?;
+
+                        Self::translate_config_callback(key.as_str(), val)
+                            .map_err(|_| format!("invalid value type for config key '{}'", key))
+                    },
+                ),
+            };
+
+            match core.startup(vcs).await {
+                Ok(_) => Ok(JsValue::UNDEFINED),
+                Err(e) => Err(JsValue::from_str(
+                    format!("VeilidCore startup() failed: {}", e.to_string()).as_str(),
+                )),
+            }
+        })
+    }
+
+    pub fn send_state_update(&self) {
+        self.core.send_state_update();
+    }
+
+    pub fn shutdown(&self) -> Promise {
+        let core = self.core.clone();
+        future_to_promise(async move {
+            core.shutdown().await;
+            Ok(JsValue::UNDEFINED)
+        })
+    }
+
+    pub fn attach(&self) -> Promise {
+        let core = self.core.clone();
+        future_to_promise(async move {
+            core.attach();
+            Ok(JsValue::UNDEFINED)
+        })
+    }
+
+    pub fn detach(&self) -> Promise {
+        let core = self.core.clone();
+        future_to_promise(async move {
+            core.detach();
+            Ok(JsValue::UNDEFINED)
+        })
+    }
+
+    pub fn wait_for_state(&self, state: JsVeilidState) -> Promise {
+        let core = self.core.clone();
+        future_to_promise(async move {
+            let state = Self::translate_veilid_state(state)?;
+            core.wait_for_state(state).await;
+            Ok(JsValue::UNDEFINED)
+        })
+    }
+}

veilid-wasm/src/lib.rs

@@ -0,0 +1,25 @@
+#![cfg(target_arch = "wasm32")]
+#![no_std]
+
+#[macro_use]
+extern crate alloc;
+
+pub use log::*;
+pub use wasm_bindgen::prelude::*;
+pub use wasm_bindgen::JsCast;
+
+pub use alloc::boxed::Box;
+pub use alloc::string::String;
+pub use alloc::sync::Arc;
+pub use alloc::vec::Vec;
+pub use core::convert::TryFrom;
+pub use js_sys::*;
+pub use js_veilid_core::*;
+pub use utils::*;
+pub use veilid_core::dht::key::*;
+pub use veilid_core::xx::*;
+pub use veilid_core::*;
+pub use wasm_logger::*;
+
+mod js_veilid_core;
+mod utils;

veilid-wasm/src/utils.rs

@@ -0,0 +1,38 @@
+use cfg_if::*;
+use wasm_bindgen::prelude::*;
+//use wasm_bindgen_futures::*;
+
+cfg_if! {
+    if #[cfg(feature = "wee_alloc")] {
+        // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
+        // allocator.
+        extern crate wee_alloc;
+        #[global_allocator]
+        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+    }
+}
+
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen(js_namespace = console, js_name = log)]
+    pub fn console_log(s: &str);
+
+    #[wasm_bindgen]
+    pub fn alert(s: &str);
+}
+
+pub fn set_panic_hook() {
+    #[cfg(feature = "console_error_panic_hook")]
+    console_error_panic_hook::set_once();
+}
+
+pub fn f64_try_to_unsigned<T>(f: f64) -> Result<T, ()>
+where
+    T: core::convert::TryFrom<u64>,
+{
+    let rf = f.floor();
+    if rf < 0.0 {
+        return Err(());
+    }
+    T::try_from(rf as u64).map_err(drop)
+}

veilid-wasm/tests/web.rs

@@ -0,0 +1,179 @@
+//! Test suite for the Web and headless browsers.
+#![cfg(target_arch = "wasm32")]
+
+extern crate alloc;
+extern crate wasm_bindgen_test;
+use core::sync::atomic::AtomicBool;
+use veilid_wasm::*;
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+static SETUP_ONCE: AtomicBool = AtomicBool::new(false);
+pub fn setup() -> () {
+    if SETUP_ONCE
+        .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
+        .is_ok()
+    {
+        console_log("setup()");
+        console_error_panic_hook::set_once();
+        wasm_logger::init(wasm_logger::Config::new(Level::Trace));
+        init_callbacks();
+    }
+}
+// xxx needs updating to new keys and veilid_api object
+fn init_callbacks() {
+    assert_eq!(js_sys::eval(r#"
+    window.sleep = (milliseconds) => { return new Promise(resolve => setTimeout(resolve, milliseconds)) };
+    window.stateChangeCallback = async (stateChange) => { console.log("State change: " + stateChange); };
+    window.configCallback = (configKey) => { 
+        switch(configKey) {
+            case "namespace": return "";
+            case "capabilities.protocol_udp": return false;
+            case "capabilities.protocol_connect_tcp": return false;
+            case "capabilities.protocol_accept_tcp": return false;
+            case "capabilities.protocol_connect_ws": return true;
+            case "capabilities.protocol_accept_ws": return false;
+            case "capabilities.protocol_connect_wss": return true;
+            case "capabilities.protocol_accept_wss": return false;
+            case "tablestore.directory": return "";
+            case "network.max_connections": return 16;
+            case "network.node_id": return "ZLd4uMYdP4qYLtxF6GqrzBb32Z6T3rE2FWMkWup1pdY";
+            case "network.node_id_secret": return "s2Gvq6HJOxgQh-3xIgfWSL3I-DWZ2c1RjZLJl2Xmg2E";
+            case "network.bootstrap": return [];
+            case "network.rpc.concurrency": return 2;
+            case "network.rpc.queue_size": return 128;
+            case "network.rpc.max_timestamp_behind": return 10000000;
+            case "network.rpc.max_timestamp_ahead": return 10000000;
+            case "network.rpc.timeout": return 10000000;
+            case "network.rpc.max_route_hop_count": return 7;
+            case "network.dht.resolve_node_timeout": return null;
+            case "network.dht.resolve_node_count": return 20;
+            case "network.dht.resolve_node_fanout": return 3;
+            case "network.dht.max_find_node_count": return 20;
+            case "network.dht.get_value_timeout": return null;
+            case "network.dht.get_value_count": return 20;
+            case "network.dht.get_value_fanout": return 3;
+            case "network.dht.set_value_timeout": return null;
+            case "network.dht.set_value_count": return 20;
+            case "network.dht.set_value_fanout": return 5;
+            case "network.dht.min_peer_count": return 20;
+            case "network.dht.min_peer_refresh_time": return 2000000;
+            case "network.dht.validate_dial_info_receipt_time": return 5000000;
+            case "network.upnp": return false;
+            case "network.natpmp": return false;
+            case "network.address_filter": return true;
+            case "network.restricted_nat_retries": return 3;
+            case "network.tls.certificate_path": return "";
+            case "network.tls.private_key_path": return "";
+            case "network.application.path": return "/app";
+            case "network.application.https.enabled": return false;
+            case "network.application.https.listen_address": return "";
+            case "network.application.http.enabled": return false;
+            case "network.application.http.listen_address": return "";
+            case "network.protocol.udp.enabled": return false;
+            case "network.protocol.udp.socket_pool_size": return 0;
+            case "network.protocol.udp.listen_address": return "";
+            case "network.protocol.udp.public_address": return "";
+            case "network.protocol.tcp.connect": return false;
+            case "network.protocol.tcp.listen": return false;
+            case "network.protocol.tcp.max_connections": return 32;
+            case "network.protocol.tcp.listen_address": return "";
+            case "network.protocol.tcp.public_address": return "";
+            case "network.protocol.ws.connect": return true;
+            case "network.protocol.ws.listen": return false;
+            case "network.protocol.ws.max_connections": return 16;
+            case "network.protocol.ws.listen_address": return "";
+            case "network.protocol.ws.path": return "/ws";
+            case "network.protocol.ws.public_address": return "";
+            case "network.protocol.wss.connect": return true;
+            case "network.protocol.wss.listen": return false;
+            case "network.protocol.wss.max_connections": return 16;
+            case "network.protocol.wss.listen_address": return "";
+            case "network.protocol.wss.path": return "/ws";
+            case "network.protocol.wss.public_address": return "";
+            default: 
+                console.log("config key '" + key +"' doesn't exist"); break;
+        }
+    };
+    true
+    "#).expect("failed to eval"), JsValue::TRUE);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///
+
+#[wasm_bindgen_test]
+fn test_construct() {
+    setup();
+
+    assert_eq!(
+        js_sys::eval(
+            r#"
+        let vc = new VeilidCore();
+        true
+    "#
+        )
+        .expect("failed to eval"),
+        JsValue::TRUE
+    );
+}
+
+#[wasm_bindgen_test(async)]
+async fn test_startup_shutdown() {
+    setup();
+
+    assert_eq!(
+        JsFuture::from(
+            js_sys::eval(
+                r#"
+        (async function() {
+            let vc = new VeilidCore();
+            await vc.startup(window.stateChangeCallback, window.configCallback);
+            await vc.shutdown();
+            return true;
+        })().then(v => {
+            console.log("finished: " + v);
+            return v;
+        });
+    "#
+            )
+            .expect("failed to eval")
+            .dyn_into::<Promise>()
+            .unwrap()
+        )
+        .await,
+        Ok(JsValue::TRUE)
+    );
+}
+
+#[wasm_bindgen_test(async)]
+async fn test_attach_detach() {
+    setup();
+
+    assert_eq!(
+        JsFuture::from(
+            js_sys::eval(
+                r#"
+        (async function() {
+            let vc = new VeilidCore();
+            await vc.startup(window.stateChangeCallback, window.configCallback);
+            await vc.attach();
+            await window.sleep(1000);
+            await vc.detach();
+            await vc.shutdown();
+            return true;
+        })().then(v => {
+            console.log("finished: " + v);
+            return v;
+        });
+    "#
+            )
+            .expect("failed to eval")
+            .dyn_into::<Promise>()
+            .unwrap()
+        )
+        .await,
+        Ok(JsValue::TRUE)
+    );
+}