fix wasm support for cuid2, add test

Author: mplanchard

.github/workflows/ci.yml

@@ -50,10 +50,12 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v2"
+      - uses: "jetli/[email protected]"
       - uses: "actions-rs/cargo@v1"
         with:
           command: "build"
           args: "--target ${{ matrix.target }}"
+      - run: "cd crates/cuid2 && wasm-pack test --node"
 
   lint:
     name: "Lint"

crates/cuid2/Cargo.toml

@@ -30,13 +30,16 @@ rand.workspace = true
 sha3 = "0.10.6"
 
 [dev-dependencies]
+radix_fmt = "1.0.0"
+wasm-bindgen-test.workspace = true
+
+[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
 criterion.workspace = true
 num_cpus = "1.15.0"
 proptest.workspace = true
-radix_fmt = "1.0.0"
-wasm-bindgen-test.workspace = true
 
 [target.wasm32-unknown-unknown.dependencies]
 # Just specified so we can add a feature when the js feature is enabled.
 # This works fine on wasm targets other than unknown-unknown
 getrandom = { version = "0", features = ["js"] }
+web-time = "1.1.0"

crates/cuid2/src/lib.rs

@@ -58,9 +58,13 @@ use std::{
     cell::RefCell,
     collections::hash_map::DefaultHasher,
     hash::{Hash, Hasher},
-    time::{SystemTime, UNIX_EPOCH},
 };
 
+#[cfg(not(target_family = "wasm"))]
+use std::time::{SystemTime, UNIX_EPOCH};
+#[cfg(target_family = "wasm")]
+use web_time::{SystemTime, UNIX_EPOCH};
+
 use cuid_util::ToBase36;
 use num::bigint;
 use rand::{seq::SliceRandom, thread_rng, Rng};
@@ -85,6 +89,21 @@ const STARTING_CHARS: &str = "abcdefghijklmnopqrstuvwxyz";
 // - fingerprint, a hash with added entropy, derived from a random number between
 //   2063 and 4125, inclusive, the process ID, and the thread ID
 
+fn fingerprint() -> String {
+    hash(
+        [
+            thread_rng().gen::<u128>().to_be_bytes(),
+            thread_rng().gen::<u128>().to_be_bytes(),
+            #[cfg(not(target_family = "wasm"))]
+            u128::from(std::process::id()).to_be_bytes(),
+            #[cfg(target_family = "wasm")]
+            thread_rng().gen::<u128>().to_be_bytes(),
+            u128::from(get_thread_id()).to_be_bytes(),
+        ],
+        BIG_LENGTH.into(),
+    )
+}
+
 thread_local! {
     /// Value used to initialize the counter. After the counter hits u64::MAX, it
     /// will roll back to this value.
@@ -109,15 +128,7 @@ thread_local! {
     ///
     /// This is pretty non-language, non-system dependent, so it allows us to
     /// compile to wasm and so on.
-    static FINGERPRINT: String = hash(
-        [
-            thread_rng().gen::<u128>().to_be_bytes(),
-            thread_rng().gen::<u128>().to_be_bytes(),
-            u128::from(std::process::id()).to_be_bytes(),
-            u128::from(get_thread_id()).to_be_bytes(),
-        ],
-        BIG_LENGTH.into(),
-    );
+    static FINGERPRINT: String = fingerprint();
 }
 
 // Hashing
@@ -462,6 +473,12 @@ mod test {
         assert!(next > start);
     }
 
+    #[wasm_bindgen_test::wasm_bindgen_test]
+    fn wasm_cuid_does_not_panic() {
+        cuid();
+    }
+
+    #[cfg(not(target_family = "wasm"))]
     #[test]
     #[ignore] // slow: run explicitly when desired
     fn collisions() {

flake.nix

@@ -43,6 +43,7 @@
               rust-analyzer
               shellcheck
               util-linux  # lspcu utility for getting info about cores
+              wasm-pack
             ];
           };
         });