From 212205a5ee12dc2f7a00c67395f705984a0656df Mon Sep 17 00:00:00 2001 From: Christien Rioux Date: Sat, 26 Oct 2024 09:17:29 -0700 Subject: [PATCH] skeleton for network shim --- Cargo.lock | 1 + veilid-tools/Cargo.toml | 8 ++++++-- veilid-tools/src/network_shim/async_std.rs | 0 veilid-tools/src/network_shim/mod.rs | 13 +++++++++++++ veilid-tools/src/network_shim/router_client.rs | 0 veilid-tools/src/network_shim/router_server/mod.rs | 0 veilid-tools/src/network_shim/std.rs | 0 veilid-tools/src/network_shim/tokio.rs | 0 veilid-tools/src/network_shim/tokio_stream.rs | 0 veilid-tools/src/network_shim/ws_stream_wasm.rs | 0 10 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 veilid-tools/src/network_shim/async_std.rs create mode 100644 veilid-tools/src/network_shim/router_client.rs create mode 100644 veilid-tools/src/network_shim/router_server/mod.rs create mode 100644 veilid-tools/src/network_shim/std.rs create mode 100644 veilid-tools/src/network_shim/tokio.rs create mode 100644 veilid-tools/src/network_shim/tokio_stream.rs create mode 100644 veilid-tools/src/network_shim/ws_stream_wasm.rs diff --git a/Cargo.lock b/Cargo.lock index f406beab..da62117c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6236,6 +6236,7 @@ dependencies = [ "wasm-logger", "wee_alloc", "winapi", + "ws_stream_wasm", ] [[package]] diff --git a/veilid-tools/Cargo.toml b/veilid-tools/Cargo.toml index 62a08aa9..0578c282 100644 --- a/veilid-tools/Cargo.toml +++ b/veilid-tools/Cargo.toml @@ -32,7 +32,11 @@ rt-tokio = [ "async_executors/tokio_io", "async_executors/tokio_timer", ] -rt-wasm-bindgen = ["async_executors/bindgen", "async_executors/timer"] +rt-wasm-bindgen = [ + "async_executors/bindgen", + "async_executors/timer", + "ws_stream_wasm", +] veilid_tools_android_tests = ["dep:paranoid-android"] veilid_tools_ios_tests = ["dep:tracing", "dep:oslog", "dep:tracing-oslog"] @@ -91,7 +95,7 @@ js-sys = "0.3.70" wasm-bindgen-futures = "0.4.42" async_executors = { version = "0.7.0", default-features = false } getrandom = { version = "0.2", features = ["js"] } - +ws_stream_wasm = { version = "0.7.4", optional = true } send_wrapper = { version = "0.6.0", features = ["futures"] } # Dependencies for Linux or Android diff --git a/veilid-tools/src/network_shim/async_std.rs b/veilid-tools/src/network_shim/async_std.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/mod.rs b/veilid-tools/src/network_shim/mod.rs index 726fa1ee..4ff4d49b 100644 --- a/veilid-tools/src/network_shim/mod.rs +++ b/veilid-tools/src/network_shim/mod.rs @@ -48,3 +48,16 @@ //! * `veilid-core`'s network `native` and `wasm` modules //! * This crate's `network_interfaces` module //! * This crate's `dns_lookup` module + +mod router_client; +mod router_server; + +#[cfg(feature = "async-std")] +mod async_std; +mod std; +#[cfg(feature = "tokio")] +mod tokio; +#[cfg(feature = "tokio-stream")] +mod tokio_stream; +#[cfg(feature = "ws_stream_wasm")] +mod ws_stream_wasm; diff --git a/veilid-tools/src/network_shim/router_client.rs b/veilid-tools/src/network_shim/router_client.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/router_server/mod.rs b/veilid-tools/src/network_shim/router_server/mod.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/std.rs b/veilid-tools/src/network_shim/std.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/tokio.rs b/veilid-tools/src/network_shim/tokio.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/tokio_stream.rs b/veilid-tools/src/network_shim/tokio_stream.rs new file mode 100644 index 00000000..e69de29b diff --git a/veilid-tools/src/network_shim/ws_stream_wasm.rs b/veilid-tools/src/network_shim/ws_stream_wasm.rs new file mode 100644 index 00000000..e69de29b