@automerge/automerge-repo-network-websocket 2.5.5 → 2.5.6

package/dist/WebSocketServerAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketServerAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAKpD,OAAO,EAEL,cAAc,EACd,KAAK,YAAY,EACjB,KAAK,MAAM,EACZ,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAEL,iBAAiB,EAElB,MAAM,eAAe,CAAA;AAOtB,qBAAa,sBAAuB,SAAQ,cAAc;;IAyBtD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IAzB3B,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;IAQ7C,OAAO;IAIP,SAAS;gBAYC,MAAM,EAAE,eAAe,EACvB,iBAAiB,SAAO;IAKlC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAyCnD,UAAU;IAQV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAqB/B,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CA2E3D"}
+{"version":3,"file":"WebSocketServerAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketServerAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAA;AAKpD,OAAO,EAEL,cAAc,EACd,KAAK,YAAY,EACjB,KAAK,MAAM,EACZ,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAEL,iBAAiB,EAElB,MAAM,eAAe,CAAA;AAOtB,qBAAa,sBAAuB,SAAQ,cAAc;;IAyBtD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IAzB3B,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;IAQ7C,OAAO;IAIP,SAAS;gBAYC,MAAM,EAAE,eAAe,EACvB,iBAAiB,SAAO;IAKlC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAyCnD,UAAU;IAQV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAqB/B,cAAc,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CA8E3D"}

package/dist/WebSocketServerAdapter.js

@@ -138,6 +138,9 @@ export class WebSocketServerAdapter extends NetworkAdapter {
             }
         }
         else {
+            if (this.sockets[senderId] !== socket) {
+                return;
+            }
             this.emit("message", message);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "isomorphic node/browser Websocket network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-websocket",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -13,7 +13,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "2.5.5",
+    "@automerge/automerge-repo": "2.5.6",
     "cbor-x": "^1.3.0",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f0849a613f190754c7edf7cf3bf5f6433f254468"
+  "gitHead": "38d06b9d9ef0bbe1e0693d3b859015f38897f34b"
 }

package/src/WebSocketServerAdapter.ts

@@ -175,6 +175,9 @@ export class WebSocketServerAdapter extends NetworkAdapter {
         })
       }
     } else {
+      if (this.sockets[senderId] !== socket) {
+        return
+      }
       this.emit("message", message)
     }
   }

package/test/Websocket.test.ts

@@ -454,6 +454,71 @@ describe("Websocket adapters", () => {
       })
     })
 
+    it("should ignore messages from a socket replaced by a same-peer-ID reconnect", async () => {
+      const { serverSocket, server, serverUrl } = await setupServer()
+      const serverAdapter = new WebSocketServerAdapter(serverSocket)
+      const serverSideSockets: WebSocket[] = []
+      serverSocket.on("connection", socket => {
+        serverSideSockets.push(socket)
+      })
+      serverAdapter.connect(serverPeerId, {
+        storageId: undefined,
+        isEphemeral: true,
+      })
+
+      const firstSocket = new WebSocket(serverUrl)
+      await once(firstSocket, "open")
+      firstSocket.send(
+        CBOR.encode({
+          type: "join",
+          senderId: browserPeerId,
+          supportedProtocolVersions: ["1"],
+        })
+      )
+      await messageOrTimeout(firstSocket)
+
+      const secondSocket = new WebSocket(serverUrl)
+      await once(secondSocket, "open")
+      secondSocket.send(
+        CBOR.encode({
+          type: "join",
+          senderId: browserPeerId,
+          supportedProtocolVersions: ["1"],
+        })
+      )
+      await messageOrTimeout(secondSocket)
+
+      let staleMessageReceived = false
+      serverAdapter.once("message", message => {
+        if (message.senderId === browserPeerId) {
+          staleMessageReceived = true
+        }
+      })
+
+      // Simulate a late message event from the old server-side socket. The
+      // client socket has already been closed by the reconnect handling, so
+      // using the captured server socket lets this test exercise the adapter's
+      // stale-socket guard directly.
+      serverSideSockets[0].emit(
+        "message",
+        CBOR.encode({
+          type: "sync",
+          senderId: browserPeerId,
+          targetId: serverPeerId,
+          documentId,
+          data: new Uint8Array([1]),
+        })
+      )
+
+      await pause(100)
+      firstSocket.close()
+      secondSocket.close()
+      serverSocket.close()
+      server.close()
+
+      assert.equal(staleMessageReceived, false)
+    })
+
     it("should disconnect existing peers on reconnect before announcing them", async () => {
       // This test exercises a sync loop which is exposed in the following
       // sequence of events: