Merge pull request #2989 from finos/bug/session

Fix `ProxySession` message routing bug with Jupyter widget

Author: texodus

.cargo/config.toml

@@ -6,8 +6,8 @@ rustflags = ["--cfg=web_sys_unstable_apis"]
 target-dir = "rust/target"
 
 [target.wasm32-unknown-unknown]
-runner = 'wasm-bindgen-test-runner'
 rustflags = [
+    "--cfg=getrandom_backend=\"wasm_js\"",
     "--cfg=web_sys_unstable_apis",
     "-Ctarget-feature=+bulk-memory,+simd128,+relaxed-simd,+reference-types",
 ]

Cargo.lock

@@ -59,6 +59,9 @@ itertools = { version = "0.10.1" }
 nanoid = { version = "0.4.0" }
 paste = { version = "1.0.12" }
 prost-types = { version = "0.12.3" }
+getrandom = { version = "0.3", features = ["wasm_js"] }
+rand = { version = "*" }
+rand-unique = { version = "0.2.2" }
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = { version = "0.11" }
 serde_json = { version = "1.0.107", features = ["raw_value"] }

pnpm-lock.yaml

@@ -13,7 +13,6 @@
 use std::collections::HashMap;
 use std::error::Error;
 use std::sync::Arc;
-use std::sync::atomic::AtomicU32;
 
 use async_lock::{Mutex, RwLock};
 use futures::Future;
@@ -142,7 +141,7 @@ pub struct Client {
     name: Arc<String>,
     features: Arc<Mutex<Option<Features>>>,
     send: SendCallback,
-    id_gen: Arc<AtomicU32>,
+    id_gen: IDGen,
     subscriptions_errors: Subscriptions<OnErrorCallback>,
     subscriptions_once: Subscriptions<OnceCallback>,
     subscriptions: Subscriptions<BoxFn<Response, BoxFuture<'static, Result<(), ClientError>>>>,
@@ -156,9 +155,7 @@ impl PartialEq for Client {
 
 impl std::fmt::Debug for Client {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Client")
-            .field("id_gen", &self.id_gen)
-            .finish()
+        f.debug_struct("Client").finish()
     }
 }
 
@@ -182,7 +179,7 @@ impl Client {
         Ok(Client {
             name: Arc::new(name),
             features: Arc::default(),
-            id_gen: Arc::new(AtomicU32::new(1)),
+            id_gen: IDGen::default(),
             send,
             subscriptions: Subscriptions::default(),
             subscriptions_errors: Arc::default(),
@@ -291,8 +288,7 @@ impl Client {
 
     /// Generate a message ID unique to this client.
     pub(crate) fn gen_id(&self) -> u32 {
-        self.id_gen
-            .fetch_add(1, std::sync::atomic::Ordering::Acquire)
+        self.id_gen.next()
     }
 
     pub(crate) async fn unsubscribe(&self, update_id: u32) -> ClientResult<()> {

rust/perspective-client/Cargo.toml

@@ -18,6 +18,9 @@ mod logging;
 #[cfg(test)]
 mod tests;
 
+use std::sync::Arc;
+
+use rand_unique::{RandomSequence, RandomSequenceBuilder};
 use thiserror::*;
 
 use crate::proto;
@@ -101,3 +104,31 @@ where
         }
     }
 }
+
+/// Generate a sequence of IDs
+#[derive(Clone)]
+pub struct IDGen(Arc<std::sync::Mutex<RandomSequence<u32>>>);
+
+impl Default for IDGen {
+    fn default() -> Self {
+        Self(Arc::new(std::sync::Mutex::new(Self::new_seq())))
+    }
+}
+
+impl IDGen {
+    fn new_seq() -> RandomSequence<u32> {
+        let mut rng = rand::rngs::ThreadRng::default();
+        let config = RandomSequenceBuilder::<u32>::rand(&mut rng);
+        config.into_iter()
+    }
+
+    pub fn next(&self) -> u32 {
+        let mut idgen = self.0.lock().unwrap();
+        if let Some(x) = idgen.next() {
+            x
+        } else {
+            *idgen = Self::new_seq();
+            idgen.next().unwrap()
+        }
+    }
+}

rust/perspective-client/src/rust/client.rs

@@ -55,7 +55,7 @@ futures = "0.3.28"
 derivative = "2.2.0"
 getrandom = { version = "0.2", features = ["js"] }
 js-intern = "0.3.1"
-js-sys = "0.3.64"
+js-sys = "0.3.77"
 prost = { version = "0.12.3", default-features = false, features = [
     "prost-derive",
     "std",
@@ -77,7 +77,7 @@ wasm-bindgen-derive = "0.3.0"
 wasm-bindgen-futures = "0.4.41"
 
 [dependencies.web-sys]
-version = "0.3.64"
+version = "0.3.77"
 features = [
     "console",
     "Blob",

rust/perspective-client/src/rust/utils/mod.rs

@@ -34,6 +34,6 @@ pub mod global {
     }
 
     pub fn clipboard() -> web_sys::Clipboard {
-        navigator().clipboard().unwrap()
+        navigator().clipboard()
     }
 }