feat: make features additive and extract js snippets for better debuggability

Author: nicdard

mls-rs-core/Cargo.toml

@@ -11,9 +11,8 @@ exclude = ["test_data"]
 
 
 [features]
-web = []
 node = []
-default = ["std", "rfc_compliant", "fast_serialize", "web"]
+default = ["std", "rfc_compliant", "fast_serialize"]
 arbitrary = ["std", "dep:arbitrary"]
 fast_serialize = ["mls-rs-codec/preallocate"]
 std = ["mls-rs-codec/std", "zeroize/std", "safer-ffi-gen?/std", "dep:thiserror", "serde?/std"]

mls-rs-core/js/es-time.js

@@ -0,0 +1,3 @@
+export function date_now() {
+    return Date.now();
+}

mls-rs-core/js/node-time.js

@@ -0,0 +1,6 @@
+const a = require("assert");
+
+module.exports.date_now = function() {
+    a(true);
+    return Date.now();
+};

mls-rs-core/src/time.rs

@@ -4,6 +4,7 @@
 
 use core::time::Duration;
 
+use cfg_if::cfg_if;
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;
 
@@ -48,20 +49,14 @@ impl From<u64> for MlsTime {
     }
 }
 
-#[cfg(all(target_arch = "wasm32", feature = "web"))]
-#[wasm_bindgen(inline_js = r#"
-export function date_now() {
-  return Date.now();
-}"#)]
-extern "C" {
-    fn date_now() -> f64;
-}
-
-#[cfg(all(target_arch = "wasm32", feature = "node", not(feature = "web")))]
-#[wasm_bindgen(inline_js = r#"
-module.exports.date_now = function() {
-    return Date.now();
-};"#)]
+#[cfg_attr(
+    all(target_arch = "wasm32", not(feature = "node")),
+    wasm_bindgen(module = "/js/es-time.js")
+)]
+#[cfg_attr(
+    all(target_arch = "wasm32", feature = "node"),
+    wasm_bindgen(module = "/js/node-time.js")
+)]
 extern "C" {
     fn date_now() -> f64;
 }

mls-rs-crypto-webcrypto/Cargo.toml

@@ -9,9 +9,7 @@ keywords = ["mls", "mls-rs"]
 license = "Apache-2.0 OR MIT"
 
 [features]
-web = []
 node = []
-default = ["web"]
 
 [dependencies]
 cfg-if = "1.0.0"

mls-rs-crypto-webcrypto/src/lib.rs

@@ -65,19 +65,7 @@ impl From<JsValue> for CryptoError {
 }
 
 cfg_if! {
-    if #[cfg(feature = "web")] {
-        #[inline]
-        pub(crate) fn crypto() -> Result<Crypto, CryptoError> {
-            Ok(web_sys::window()
-                .ok_or(CryptoError::WindowNotFound)?
-                .crypto()?)
-        }
-
-        #[inline]
-        pub(crate) fn get_crypto() -> Result<SubtleCrypto, CryptoError> {
-            crypto().map(|c| c.subtle())
-        }
-    } else {
+    if #[cfg(feature = "node")] {
         #[wasm_bindgen(module = "/js/node-crypto.js")]
         extern "C" {
             #[wasm_bindgen]
@@ -94,6 +82,18 @@ cfg_if! {
             Ok(node_crypto()
                 .subtle())
         }
+    } else {
+        #[inline]
+        pub(crate) fn crypto() -> Result<Crypto, CryptoError> {
+            Ok(web_sys::window()
+                .ok_or(CryptoError::WindowNotFound)?
+                .crypto()?)
+        }
+
+        #[inline]
+        pub(crate) fn get_crypto() -> Result<SubtleCrypto, CryptoError> {
+            crypto().map(|c| c.subtle())
+        }
     }
 }
 

mls-rs-identity-x509/Cargo.toml

@@ -13,7 +13,7 @@ default = ["std"]
 std = ["mls-rs-core/std", "dep:thiserror"]
 
 [dependencies]
-mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["x509", "web"], version = "0.19.0" }
+mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["x509"], version = "0.19.0" }
 maybe-async = "0.2.10"
 thiserror = { version = "1.0.40", optional = true }
 

mls-rs/Cargo.toml

@@ -51,7 +51,7 @@ benchmark_util = ["test_util", "default", "dep:mls-rs-crypto-openssl"]
 fuzz_util = ["test_util", "default", "dep:once_cell", "dep:mls-rs-crypto-openssl"]
 
 [dependencies]
-mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.19.1", features = ["web"]}
+mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.19.1"}
 mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", default-features = false, version = "0.12.0", optional = true }
 zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
 mls-rs-codec = { version = "0.5.2", path = "../mls-rs-codec", default-features = false}