@automerge/automerge-repo-network-websocket 2.0.5 → 2.0.7

package/dist/WebSocketClientAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketClientAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,YAAY,EAEb,MAAM,gCAAgC,CAAA;AACvC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAKlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,sBAAuB,SAAQ,uBAAuB;;aA4B/C,GAAG,EAAE,MAAM;aACX,aAAa;IAtB/B,OAAO;IAIP,SAAS;IAcT,YAAY,CAAC,EAAE,MAAM,CAAA;gBAGH,GAAG,EAAE,MAAM,EACX,aAAa,SAAO;IAMtC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAqCnD,MAAM,aAKL;IAGD,OAAO,aAWN;IAED,SAAS,GAAI,OAAO,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,GACL,OACI,KAAK,GACL,SAAS,CAAC,UAAU,UAezB;IAED,IAAI;IAUJ,UAAU;IAiBV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAe/B,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAU9D,cAAc,CAAC,YAAY,EAAE,UAAU;CAiBxC"}
+{"version":3,"file":"WebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/WebSocketClientAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,YAAY,EAEb,MAAM,gCAAgC,CAAA;AACvC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAKlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,sBAAuB,SAAQ,uBAAuB;;aA4B/C,GAAG,EAAE,MAAM;aACX,aAAa;IAtB/B,OAAO;IAIP,SAAS;IAcT,YAAY,CAAC,EAAE,MAAM,CAAA;gBAGH,GAAG,EAAE,MAAM,EACX,aAAa,SAAO;IAMtC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAqCnD,MAAM,aAKL;IAGD,OAAO,aAWN;IAED,SAAS,GAAI,OAAO,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,GACL,OACI,KAAK,GACL,SAAS,CAAC,UAAU,UAezB;IAED,IAAI;IAUJ,UAAU;IAiBV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAe/B,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAU9D,cAAc,CAAC,YAAY,EAAE,UAAU;CAuBxC"}

package/dist/WebSocketClientAdapter.js

@@ -158,7 +158,14 @@ export class WebSocketClientAdapter extends WebSocketNetworkAdapter {
         });
     }
     receiveMessage(messageBytes) {
-        const message = cbor.decode(new Uint8Array(messageBytes));
+        let message;
+        try {
+            message = cbor.decode(new Uint8Array(messageBytes));
+        }
+        catch (e) {
+            this.#log("error decoding message:", e);
+            return;
+        }
         assert(this.socket);
         if (messageBytes.byteLength === 0)
             throw new Error("received a zero-length message");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "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.0.5",
+    "@automerge/automerge-repo": "2.0.7",
     "cbor-x": "^1.3.0",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9d24ea3db7c1f459fc66ce43b794a9ed4bef1341"
+  "gitHead": "fe2b8e6e8b4d945ac7d89aff966e38a2892af891"
 }

package/src/WebSocketClientAdapter.ts

@@ -194,7 +194,13 @@ export class WebSocketClientAdapter extends WebSocketNetworkAdapter {
   }
 
   receiveMessage(messageBytes: Uint8Array) {
-    const message: FromServerMessage = cbor.decode(new Uint8Array(messageBytes))
+    let message: FromServerMessage
+    try {
+      message = cbor.decode(new Uint8Array(messageBytes))
+    } catch (e) {
+      this.#log("error decoding message:", e)
+      return
+    }
 
     assert(this.socket)
     if (messageBytes.byteLength === 0)

package/test/Websocket.test.ts

@@ -245,6 +245,40 @@ describe("Websocket adapters", () => {
       // are cleaned up correctly we shouldn't throw
       await pause(1)
     })
+
+    it("should gracefully handle a server sending invalid cbor", async () => {
+      const port = await getPort()
+      const serverUrl = `ws://localhost:${port}`
+      const server = http.createServer()
+      const serverSocket = new WebSocket.Server({ server })
+
+      // This listener will be added in addition to the listener which the server adds
+      // so we know that at some point we will send garbage. Because we only send the
+      // garbage once, the reconnect logic in the client should recover
+      let garbageSent = false
+      serverSocket.on("connection", ws => {
+        // send garbage to the client
+        if (garbageSent) return
+        ws.send(new Uint8Array([0x00, 0x01, 0x02]))
+      })
+      await new Promise<void>(resolve => server.listen(port, resolve))
+      const serverAdapter = new WebSocketServerAdapter(serverSocket)
+
+      const serverRepo = new Repo({
+        network: [serverAdapter],
+        peerId: "server" as PeerId,
+      })
+      const browser = new WebSocketClientAdapter(serverUrl, 1000)
+
+      const browserRepo = new Repo({
+        network: [browser],
+        peerId: browserPeerId,
+      })
+
+      await browserRepo.networkSubsystem.whenReady()
+
+      assert.deepStrictEqual(browserRepo.peers, ["server" as PeerId])
+    })
   })
 
   describe("WebSocketServerAdapter", () => {