Fix ProxySession message id mis-routing

Signed-off-by: Andrew Stein <[email protected]>

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

@@ -62,6 +62,7 @@ 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"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = { version = "0.11" }
 serde_json = { version = "1.0.107", features = ["raw_value"] }

rust/perspective-client/Cargo.toml

@@ -127,9 +127,13 @@ impl Client {
             Box::pin(async move { send_request(bytes).await })
         });
 
+        let mut buf = [0u8; 4];
+        getrandom::fill(&mut buf).unwrap();
+        let seed = u32::from_ne_bytes(buf);
+
         Client {
             features: Arc::default(),
-            id_gen: Arc::new(AtomicU32::new(1)),
+            id_gen: Arc::new(AtomicU32::new(seed)),
             send,
             subscriptions: Subscriptions::default(),
             subscriptions_errors: Arc::default(),
@@ -256,7 +260,12 @@ 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)
+            .fetch_update(
+                std::sync::atomic::Ordering::Relaxed,
+                std::sync::atomic::Ordering::Relaxed,
+                |old| Some(if old == u32::MAX { 0_u32 } else { old + 1 }),
+            )
+            .unwrap()
     }
 
     pub(crate) async fn unsubscribe(&self, update_id: u32) -> ClientResult<()> {

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

@@ -57,7 +57,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",
@@ -79,7 +79,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-js/Cargo.toml

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

rust/perspective-js/src/rust/utils/browser.rs

@@ -72,3 +72,39 @@ def handle_response(bytes):
         assert (await table.size()) == 3
         table2.update([{"a": 4, "d": 5}])
         assert (await table.size()) == 4
+
+    @pytest.mark.asyncio
+    async def test_dismabiguate_message_ids_in_proxy_session(self):
+        """tests concurrent calls from clients on Session + ProxySession"""
+        server = Server()
+        client = server.new_local_client()
+
+        def send_response(bytes):
+            import asyncio
+
+            asyncio.create_task(sub_client.handle_response(bytes))
+
+        async def send_request(bytes):
+            await sub_session.handle_request_async(bytes)
+            await sub_session.poll_async()
+
+        sub_session = ProxySession(client, send_response)
+        sub_client = AsyncClient(send_request, sub_session.close)
+
+        table = client.table("x\n1", name="test_table")
+        table2 = await sub_client.open_table("test_table")
+        view = table.view()
+        view2 = await table2.view()
+
+        sentinel = []
+
+        def callback1(*args):
+            sentinel.append("Callback 1")
+
+        def callback2(*args):
+            sentinel.append("Callback 2")
+
+        view.on_update(callback1)
+        await view2.on_update(callback2)
+        await table2.update("x\n2")
+        assert sentinel == ["Callback 1", "Callback 2"]

rust/perspective-python/perspective/tests/server/test_session.py

@@ -71,6 +71,11 @@ impl ProxySession {
         Ok(())
     }
 
+    pub async fn poll_async(&self) -> PyResult<()> {
+        self.0.poll().await.into_pyerr()?;
+        Ok(())
+    }
+
     pub fn close(&self, py: Python<'_>) -> PyResult<()> {
         self.0.clone().close().py_block_on(py);
         Ok(())

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

@@ -77,7 +77,7 @@ itertools = "0.10.1"
 js-intern = "0.3.1"
 
 # JavaScript stdlib bindings
-js-sys = "0.3.64"
+js-sys = "0.3.77"
 
 # Parse ExprTK for syntax highlighting.
 nom = "7.1.1"
@@ -119,7 +119,7 @@ wasm-bindgen-futures = "0.4.41"
 yew = { version = "0.21.0", features = ["csr"] }
 
 # Browser stdlib bindings
-web-sys.version = "0.3.64"
+web-sys.version = "0.3.77"
 
 # Browser stdlib bindings
 web-sys.features = [