@automerge/automerge-repo-network-websocket 1.0.7 → 1.0.8

package/dist/BrowserWebSocketClientAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAQ,MAAM,2BAA2B,CAAA;AACxE,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAGlB,MAAM,eAAe,CAAA;AAMtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;;IAGxE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IAGvC,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CAAC,MAAM,EAAE,MAAM;IA0CtB,IAAI;IAoBJ,UAAU;IAOV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAwB/B,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAajC,cAAc,CAAC,OAAO,EAAE,UAAU;CA6BnC"}
+{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAQ,MAAM,2BAA2B,CAAA;AACxE,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAGlB,MAAM,eAAe,CAAA;AAMtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;;IAGxE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IAGvC,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CAAC,MAAM,EAAE,MAAM;IAoDtB,IAAI;IAoBJ,UAAU;IAOV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAwB/B,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAajC,cAAc,CAAC,OAAO,EAAE,UAAU;CA6BnC"}

package/dist/BrowserWebSocketClientAdapter.js

@@ -18,27 +18,37 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         this.url = url;
     }
     connect(peerId) {
-        this.socket?.removeAllListeners();
-        if (!this.timerId) {
-            this.timerId = setInterval(() => this.connect(peerId), 5000);
-        }
-        this.peerId = peerId;
-        this.socket = new WebSocket(this.url);
-        this.socket.binaryType = "arraybuffer";
-        this.socket.addEventListener("open", () => {
+        const onOpen = () => {
             log(`@ ${this.url}: open`);
             clearInterval(this.timerId);
             this.timerId = undefined;
-        });
+        };
         // When a socket closes, or disconnects, remove it from the array.
-        this.socket.addEventListener("close", () => {
+        const onClose = () => {
             log(`${this.url}: close`);
             if (!this.timerId) {
                 this.connect(peerId);
             }
-            // log("Disconnected from server")
-        });
-        this.socket.addEventListener("message", (event) => this.receiveMessage(event.data));
+        };
+        const onMessage = (event) => {
+            this.receiveMessage(event.data);
+        };
+        // If we're reconnecting  make sure we remove the old event listeners
+        // before creating a new connection.
+        if (this.socket) {
+            this.socket.removeEventListener("open", onOpen);
+            this.socket.removeEventListener("close", onClose);
+            this.socket.removeEventListener("message", onMessage);
+        }
+        if (!this.timerId) {
+            this.timerId = setInterval(() => this.connect(peerId), 5000);
+        }
+        this.peerId = peerId;
+        this.socket = new WebSocket(this.url);
+        this.socket.binaryType = "arraybuffer";
+        this.socket.addEventListener("open", onOpen);
+        this.socket.addEventListener("close", onClose);
+        this.socket.addEventListener("message", onMessage);
         // mark this adapter as ready if we haven't received an ack in 1 second.
         // We might hear back from the other end at some point but we shouldn't
         // hold up marking things as unavailable for any longer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "isomorphic node/browser Websocket network adapter for Automerge Repo",
   "peerDependencies": {
     "@automerge/automerge": "^2.1.0"
@@ -16,7 +16,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.0.7",
+    "@automerge/automerge-repo": "^1.0.8",
     "cbor-x": "^1.3.0",
     "eventemitter3": "^5.0.1",
     "isomorphic-ws": "^5.0.0",
@@ -33,5 +33,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "71060981f168e511a99ab85b155a54a13fd04bcc"
+  "gitHead": "d244a36aebab52a86f91b5427bbe8ab2800bf2f4"
 }

package/src/BrowserWebSocketClientAdapter.ts

@@ -31,33 +31,43 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
   }
 
   connect(peerId: PeerId) {
-    this.socket?.removeAllListeners()
-    if (!this.timerId) {
-      this.timerId = setInterval(() => this.connect(peerId), 5000)
-    }
-
-    this.peerId = peerId
-    this.socket = new WebSocket(this.url)
-    this.socket.binaryType = "arraybuffer"
-
-    this.socket.addEventListener("open", () => {
+    const onOpen = () => {
       log(`@ ${this.url}: open`)
       clearInterval(this.timerId)
       this.timerId = undefined
-    })
+    }
 
     // When a socket closes, or disconnects, remove it from the array.
-    this.socket.addEventListener("close", () => {
+    const onClose = () => {
       log(`${this.url}: close`)
       if (!this.timerId) {
         this.connect(peerId)
       }
-      // log("Disconnected from server")
-    })
+    }
 
-    this.socket.addEventListener("message", (event: WebSocket.MessageEvent) =>
+    const onMessage = (event: WebSocket.MessageEvent) => {
       this.receiveMessage(event.data as Uint8Array)
-    )
+    }
+
+    // If we're reconnecting  make sure we remove the old event listeners
+    // before creating a new connection.
+    if (this.socket) {
+      this.socket.removeEventListener("open", onOpen)
+      this.socket.removeEventListener("close", onClose)
+      this.socket.removeEventListener("message", onMessage)
+    }
+
+    if (!this.timerId) {
+      this.timerId = setInterval(() => this.connect(peerId), 5000)
+    }
+
+    this.peerId = peerId
+    this.socket = new WebSocket(this.url)
+    this.socket.binaryType = "arraybuffer"
+
+    this.socket.addEventListener("open", onOpen)
+    this.socket.addEventListener("close", onClose)
+    this.socket.addEventListener("message", onMessage)
 
     // mark this adapter as ready if we haven't received an ack in 1 second.
     // We might hear back from the other end at some point but we shouldn't