From ae339e657372a3e0fc43c34a36c1b45554ff6f5a Mon Sep 17 00:00:00 2001
From: Christien Rioux <chris@veilid.org>
Date: Fri, 19 Jan 2024 21:30:48 -0500
Subject: [PATCH] wasm fixes

---
 Cargo.lock                                    | 20 +++++++++----------
 veilid-core/src/network_manager/wasm/mod.rs   |  6 +++---
 .../src/tests/common/test_veilid_core.rs      |  4 ++--
 veilid-core/src/veilid_config.rs              |  9 +++++----
 veilid-tools/src/ipc/mod.rs                   |  1 +
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 68599a2d..9353067a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5865,9 +5865,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -5877,9 +5877,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
  "bumpalo",
  "log",
@@ -5904,9 +5904,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5914,9 +5914,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5927,9 +5927,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/veilid-core/src/network_manager/wasm/mod.rs b/veilid-core/src/network_manager/wasm/mod.rs
index 88cc1fcb..d648be90 100644
--- a/veilid-core/src/network_manager/wasm/mod.rs
+++ b/veilid-core/src/network_manager/wasm/mod.rs
@@ -12,11 +12,11 @@ use std::io;
 
 cfg_if! {
     if #[cfg(all(feature = "unstable-blockstore", feature="unstable-tunnels"))] {
-        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 6;
+        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 7;
     } else if #[cfg(any(feature = "unstable-blockstore", feature="unstable-tunnels"))] {
-        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 5;
+        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 6;
     } else  {
-        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 4;
+        const PUBLIC_INTERNET_CAPABILITIES_LEN: usize = 5;
     }
 }
 pub const PUBLIC_INTERNET_CAPABILITIES: [Capability; PUBLIC_INTERNET_CAPABILITIES_LEN] = [
diff --git a/veilid-core/src/tests/common/test_veilid_core.rs b/veilid-core/src/tests/common/test_veilid_core.rs
index 70b864cd..8013958b 100644
--- a/veilid-core/src/tests/common/test_veilid_core.rs
+++ b/veilid-core/src/tests/common/test_veilid_core.rs
@@ -19,12 +19,12 @@ pub async fn test_startup_shutdown_from_config() {
         table_store: VeilidConfigTableStore {
             directory: get_table_store_path(),
             delete: true,
-            ..Default::default()
+            // ..Default::default()
         },
         block_store: VeilidConfigBlockStore {
             directory: get_block_store_path(),
             delete: true,
-            ..Default::default()
+            //..Default::default()
         },
         protected_store: VeilidConfigProtectedStore {
             allow_insecure_fallback: true,
diff --git a/veilid-core/src/veilid_config.rs b/veilid-core/src/veilid_config.rs
index 65e05091..66477fbb 100644
--- a/veilid-core/src/veilid_config.rs
+++ b/veilid-core/src/veilid_config.rs
@@ -263,11 +263,12 @@ impl Default for VeilidConfigTLS {
 }
 
 pub fn get_default_ssl_directory(sub_path: &str) -> String {
-    let default_path = PathBuf::from("/etc/veilid-server/ssl").join(sub_path);
-
     #[cfg(unix)]
-    if default_path.exists() {
-        return default_path.to_string_lossy().into();
+    {
+        let default_path = PathBuf::from("/etc/veilid-server/ssl").join(sub_path);
+        if default_path.exists() {
+            return default_path.to_string_lossy().into();
+        }
     }
 
     ProjectDirs::from("org", "Veilid", "Veilid")
diff --git a/veilid-tools/src/ipc/mod.rs b/veilid-tools/src/ipc/mod.rs
index 27f81639..665c52de 100644
--- a/veilid-tools/src/ipc/mod.rs
+++ b/veilid-tools/src/ipc/mod.rs
@@ -11,6 +11,7 @@ cfg_if! {
     }
 }
 
+#[allow(unused_variables)]
 pub fn is_ipc_socket_path<P: AsRef<Path>>(path: P) -> bool {
     cfg_if! {
         if #[cfg(windows)] {