@automerge/automerge-repo-network-websocket 1.2.1 → 2.0.0-alpha.1

package/dist/BrowserWebSocketClientAdapter.d.ts

@@ -8,6 +8,8 @@ export declare class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapt
     #private;
     readonly url: string;
     readonly retryInterval: number;
+    isReady(): boolean;
+    whenReady(): Promise<void>;
     remotePeerId?: PeerId;
     constructor(url: string, retryInterval?: number);
     connect(peerId: PeerId, peerMetadata?: PeerMetadata): void;

package/dist/BrowserWebSocketClientAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.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,6BAA8B,SAAQ,uBAAuB;;aAQtD,GAAG,EAAE,MAAM;aACX,aAAa;IAJ/B,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,UAAW,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,UAED,KAAK,GACL,SAAS,CAAC,UAAU,UAezB;IAQD,IAAI;IAUJ,UAAU;IAMV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAY/B,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAU9D,cAAc,CAAC,YAAY,EAAE,UAAU;CAiBxC"}
+{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.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,6BAA8B,SAAQ,uBAAuB;;aA4BtD,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,UAAW,SAAS,CAAC,YAAY,UAEzC;IAED,mFAAmF;IACnF,OAAO,UAED,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"}

package/dist/BrowserWebSocketClientAdapter.js

@@ -11,7 +11,23 @@ class WebSocketNetworkAdapter extends NetworkAdapter {
 export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     url;
     retryInterval;
-    #isReady = false;
+    #ready = false;
+    #readyResolver;
+    #readyPromise = new Promise(resolve => {
+        this.#readyResolver = resolve;
+    });
+    isReady() {
+        return this.#ready;
+    }
+    whenReady() {
+        return this.#readyPromise;
+    }
+    #forceReady() {
+        if (!this.#ready) {
+            this.#ready = true;
+            this.#readyResolver?.();
+        }
+    }
     #retryIntervalId;
     #log = debug("automerge-repo:websocket:browser");
     remotePeerId; // this adapter only connects to one remote client at a time
@@ -51,7 +67,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         // 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
-        setTimeout(() => this.#ready(), 1000);
+        setTimeout(() => this.#forceReady(), 1000);
         this.join();
     }
     onOpen = () => {
@@ -93,12 +109,6 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         }
         this.#log("Connection failed, retrying...");
     };
-    #ready() {
-        if (this.#isReady)
-            return;
-        this.#isReady = true;
-        this.emit("ready", { network: this });
-    }
     join() {
         assert(this.peerId);
         assert(this.socket);
@@ -112,13 +122,27 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     disconnect() {
         assert(this.peerId);
         assert(this.socket);
-        this.send({ type: "leave", senderId: this.peerId });
+        const socket = this.socket;
+        if (socket) {
+            socket.removeEventListener("open", this.onOpen);
+            socket.removeEventListener("close", this.onClose);
+            socket.removeEventListener("message", this.onMessage);
+            socket.removeEventListener("error", this.onError);
+            socket.close();
+        }
+        clearInterval(this.#retryIntervalId);
+        if (this.remotePeerId)
+            this.emit("peer-disconnected", { peerId: this.remotePeerId });
+        this.socket = undefined;
     }
     send(message) {
         if ("data" in message && message.data?.byteLength === 0)
             throw new Error("Tried to send a zero-length message");
         assert(this.peerId);
-        assert(this.socket);
+        if (!this.socket) {
+            this.#log("Tried to send on a disconnected socket.");
+            return;
+        }
         if (this.socket.readyState !== WebSocket.OPEN)
             throw new Error(`Websocket not ready (${this.socket.readyState})`);
         const encoded = cbor.encode(message);
@@ -126,7 +150,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     }
     peerCandidate(remotePeerId, peerMetadata) {
         assert(this.socket);
-        this.#ready();
+        this.#forceReady();
         this.remotePeerId = remotePeerId;
         this.emit("peer-candidate", {
             peerId: remotePeerId,

package/dist/NodeWSServerAdapter.d.ts

@@ -9,6 +9,8 @@ export declare class NodeWSServerAdapter extends NetworkAdapter {
     sockets: {
         [peerId: PeerId]: WebSocket;
     };
+    isReady(): boolean;
+    whenReady(): Promise<void>;
     constructor(server: WebSocketServer, keepAliveInterval?: number);
     connect(peerId: PeerId, peerMetadata?: PeerMetadata): void;
     disconnect(): void;

package/dist/NodeWSServerAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeWSServerAdapter.d.ts","sourceRoot":"","sources":["../src/NodeWSServerAdapter.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,EAGlB,MAAM,eAAe,CAAA;AAOtB,qBAAa,mBAAoB,SAAQ,cAAc;;IAInD,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,iBAAiB;IAJ3B,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;gBAGnC,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;CA0E3D"}
+{"version":3,"file":"NodeWSServerAdapter.d.ts","sourceRoot":"","sources":["../src/NodeWSServerAdapter.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,mBAAoB,SAAQ,cAAc;;IAyBnD,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;CAoE3D"}

package/dist/NodeWSServerAdapter.js

@@ -2,7 +2,7 @@ import WebSocket from "isomorphic-ws";
 import debug from "debug";
 const log = debug("WebsocketServer");
 import { cbor as cborHelpers, NetworkAdapter, } from "@automerge/automerge-repo/slim";
-import { isJoinMessage, isLeaveMessage, } from "./messages.js";
+import { isJoinMessage, } from "./messages.js";
 import { ProtocolV1 } from "./protocolVersion.js";
 import { assert } from "./assert.js";
 import { toArrayBuffer } from "./toArrayBuffer.js";
@@ -11,6 +11,23 @@ export class NodeWSServerAdapter extends NetworkAdapter {
     server;
     keepAliveInterval;
     sockets = {};
+    #ready = false;
+    #readyResolver;
+    #readyPromise = new Promise(resolve => {
+        this.#readyResolver = resolve;
+    });
+    isReady() {
+        return this.#ready;
+    }
+    whenReady() {
+        return this.#readyPromise;
+    }
+    #forceReady() {
+        if (!this.#ready) {
+            this.#ready = true;
+            this.#readyResolver?.();
+        }
+    }
     constructor(server, keepAliveInterval = 5000) {
         super();
         this.server = server;
@@ -32,7 +49,7 @@ export class NodeWSServerAdapter extends NetworkAdapter {
             // Start out "alive", and every time we get a pong, reset that state.
             socket.isAlive = true;
             socket.on("pong", () => (socket.isAlive = true));
-            this.emit("ready", { network: this });
+            this.#forceReady();
         });
         const keepAliveId = setInterval(() => {
             // Terminate connections to lost clients
@@ -112,14 +129,6 @@ export class NodeWSServerAdapter extends NetworkAdapter {
                 });
             }
         }
-        else if (isLeaveMessage(message)) {
-            const { senderId } = message;
-            const socket = this.sockets[senderId];
-            /* c8 ignore next */
-            if (!socket)
-                return;
-            this.#terminate(socket);
-        }
         else {
             this.emit("message", message);
         }

package/dist/index.d.ts

@@ -14,6 +14,7 @@
  * */
 export { BrowserWebSocketClientAdapter } from "./BrowserWebSocketClientAdapter.js";
 export { NodeWSServerAdapter } from "./NodeWSServerAdapter.js";
-export type { FromClientMessage, FromServerMessage, JoinMessage, LeaveMessage, ErrorMessage, PeerMessage, } from "./messages.js";
-export type { ProtocolVersion, ProtocolV1 } from "./protocolVersion.js";
+export type { FromClientMessage, FromServerMessage, JoinMessage, ErrorMessage, PeerMessage, } from "./messages.js";
+export type { ProtocolVersion } from "./protocolVersion.js";
+export { ProtocolV1 } from "./protocolVersion.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;KAaK;AACL,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,YAAY,EACV,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;KAaK;AACL,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,YAAY,EACV,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,WAAW,GACZ,MAAM,eAAe,CAAA;AACtB,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA"}

package/dist/index.js

@@ -14,3 +14,4 @@
  * */
 export { BrowserWebSocketClientAdapter } from "./BrowserWebSocketClientAdapter.js";
 export { NodeWSServerAdapter } from "./NodeWSServerAdapter.js";
+export { ProtocolV1 } from "./protocolVersion.js";

package/dist/messages.d.ts

@@ -1,10 +1,5 @@
 import type { Message, PeerId, PeerMetadata } from "@automerge/automerge-repo/slim";
 import type { ProtocolVersion } from "./protocolVersion.js";
-/** The sender is disconnecting */
-export type LeaveMessage = {
-    type: "leave";
-    senderId: PeerId;
-};
 /** Sent by the client to the server to tell the server the clients PeerID */
 export type JoinMessage = {
     type: "join";
@@ -38,11 +33,10 @@ export type ErrorMessage = {
     targetId: PeerId;
 };
 /** A message from the client to the server */
-export type FromClientMessage = JoinMessage | LeaveMessage | Message;
+export type FromClientMessage = JoinMessage | Message;
 /** A message from the server to the client */
 export type FromServerMessage = PeerMessage | ErrorMessage | Message;
 export declare const isJoinMessage: (message: FromClientMessage) => message is JoinMessage;
-export declare const isLeaveMessage: (message: FromClientMessage) => message is LeaveMessage;
 export declare const isPeerMessage: (message: FromServerMessage) => message is PeerMessage;
 export declare const isErrorMessage: (message: FromServerMessage) => message is ErrorMessage;
 //# sourceMappingURL=messages.d.ts.map

package/dist/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,kCAAkC;AAClC,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAEhB,sCAAsC;IACtC,YAAY,EAAE,YAAY,CAAA;IAE1B,+CAA+C;IAC/C,yBAAyB,EAAE,eAAe,EAAE,CAAA;CAC7C,CAAA;AAED,yFAAyF;AACzF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAEhB,sCAAsC;IACtC,YAAY,EAAE,YAAY,CAAA;IAE1B,mEAAmE;IACnE,uBAAuB,EAAE,eAAe,CAAA;IACxC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,gGAAgG;AAChG,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,YAAY,GAAG,OAAO,CAAA;AAEpE,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,YAAY,GAAG,OAAO,CAAA;AAIpE,eAAO,MAAM,aAAa,YACf,iBAAiB,KACzB,OAAO,IAAI,WAAsC,CAAA;AAEpD,eAAO,MAAM,cAAc,YAChB,iBAAiB,KACzB,OAAO,IAAI,YAAwC,CAAA;AAEtD,eAAO,MAAM,aAAa,YACf,iBAAiB,KACzB,OAAO,IAAI,WAAsC,CAAA;AAEpD,eAAO,MAAM,cAAc,YAChB,iBAAiB,KACzB,OAAO,IAAI,YAAwC,CAAA"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,MAAM,EACN,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAEhB,sCAAsC;IACtC,YAAY,EAAE,YAAY,CAAA;IAE1B,+CAA+C;IAC/C,yBAAyB,EAAE,eAAe,EAAE,CAAA;CAC7C,CAAA;AAED,yFAAyF;AACzF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAEhB,sCAAsC;IACtC,YAAY,EAAE,YAAY,CAAA;IAE1B,mEAAmE;IACnE,uBAAuB,EAAE,eAAe,CAAA;IACxC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,gGAAgG;AAChG,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,OAAO,CAAA;AAErD,8CAA8C;AAC9C,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,YAAY,GAAG,OAAO,CAAA;AAIpE,eAAO,MAAM,aAAa,YACf,iBAAiB,KACzB,OAAO,IAAI,WAAsC,CAAA;AAEpD,eAAO,MAAM,aAAa,YACf,iBAAiB,KACzB,OAAO,IAAI,WAAsC,CAAA;AAEpD,eAAO,MAAM,cAAc,YAChB,iBAAiB,KACzB,OAAO,IAAI,YAAwC,CAAA"}

package/dist/messages.js

@@ -1,5 +1,4 @@
 // TYPE GUARDS
 export const isJoinMessage = (message) => message.type === "join";
-export const isLeaveMessage = (message) => message.type === "leave";
 export const isPeerMessage = (message) => message.type === "peer";
 export const isErrorMessage = (message) => message.type === "error";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "1.2.1",
+  "version": "2.0.0-alpha.1",
   "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": "1.2.1",
+    "@automerge/automerge-repo": "2.0.0-alpha.1",
     "cbor-x": "^1.3.0",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2108823d685e855977defb75a938838a3734818b"
+  "gitHead": "86421aba21c8037b916ee93f962df1c121fef52b"
 }

package/src/BrowserWebSocketClientAdapter.ts

@@ -24,7 +24,27 @@ abstract class WebSocketNetworkAdapter extends NetworkAdapter {
 }
 
 export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
-  #isReady = false
+  #ready = false
+  #readyResolver?: () => void
+  #readyPromise: Promise<void> = new Promise<void>(resolve => {
+    this.#readyResolver = resolve
+  })
+
+  isReady() {
+    return this.#ready
+  }
+
+  whenReady() {
+    return this.#readyPromise
+  }
+
+  #forceReady() {
+    if (!this.#ready) {
+      this.#ready = true
+      this.#readyResolver?.()
+    }
+  }
+
   #retryIntervalId?: TimeoutId
   #log = debug("automerge-repo:websocket:browser")
 
@@ -71,7 +91,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     // 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
-    setTimeout(() => this.#ready(), 1000)
+    setTimeout(() => this.#forceReady(), 1000)
     this.join()
   }
 
@@ -121,12 +141,6 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     this.#log("Connection failed, retrying...")
   }
 
-  #ready() {
-    if (this.#isReady) return
-    this.#isReady = true
-    this.emit("ready", { network: this })
-  }
-
   join() {
     assert(this.peerId)
     assert(this.socket)
@@ -140,14 +154,28 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
   disconnect() {
     assert(this.peerId)
     assert(this.socket)
-    this.send({ type: "leave", senderId: this.peerId })
+    const socket = this.socket
+    if (socket) {
+      socket.removeEventListener("open", this.onOpen)
+      socket.removeEventListener("close", this.onClose)
+      socket.removeEventListener("message", this.onMessage)
+      socket.removeEventListener("error", this.onError)
+      socket.close()
+    }
+    clearInterval(this.#retryIntervalId)
+    if (this.remotePeerId)
+      this.emit("peer-disconnected", { peerId: this.remotePeerId })
+    this.socket = undefined
   }
 
   send(message: FromClientMessage) {
     if ("data" in message && message.data?.byteLength === 0)
       throw new Error("Tried to send a zero-length message")
     assert(this.peerId)
-    assert(this.socket)
+    if (!this.socket) {
+      this.#log("Tried to send on a disconnected socket.")
+      return
+    }
     if (this.socket.readyState !== WebSocket.OPEN)
       throw new Error(`Websocket not ready (${this.socket.readyState})`)
 
@@ -157,7 +185,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
 
   peerCandidate(remotePeerId: PeerId, peerMetadata: PeerMetadata) {
     assert(this.socket)
-    this.#ready()
+    this.#forceReady()
     this.remotePeerId = remotePeerId
     this.emit("peer-candidate", {
       peerId: remotePeerId,

package/src/NodeWSServerAdapter.ts

@@ -14,7 +14,6 @@ import {
   FromClientMessage,
   FromServerMessage,
   isJoinMessage,
-  isLeaveMessage,
 } from "./messages.js"
 import { ProtocolV1, ProtocolVersion } from "./protocolVersion.js"
 import { assert } from "./assert.js"
@@ -25,6 +24,27 @@ const { encode, decode } = cborHelpers
 export class NodeWSServerAdapter extends NetworkAdapter {
   sockets: { [peerId: PeerId]: WebSocket } = {}
 
+  #ready = false
+  #readyResolver?: () => void
+  #readyPromise: Promise<void> = new Promise<void>(resolve => {
+    this.#readyResolver = resolve
+  })
+
+  isReady() {
+    return this.#ready
+  }
+
+  whenReady() {
+    return this.#readyPromise
+  }
+
+  #forceReady() {
+    if (!this.#ready) {
+      this.#ready = true
+      this.#readyResolver?.()
+    }
+  }
+
   constructor(
     private server: WebSocketServer,
     private keepAliveInterval = 5000
@@ -55,7 +75,7 @@ export class NodeWSServerAdapter extends NetworkAdapter {
       socket.isAlive = true
       socket.on("pong", () => (socket.isAlive = true))
 
-      this.emit("ready", { network: this })
+      this.#forceReady()
     })
 
     const keepAliveId = setInterval(() => {
@@ -147,12 +167,6 @@ export class NodeWSServerAdapter extends NetworkAdapter {
           targetId: senderId,
         })
       }
-    } else if (isLeaveMessage(message)) {
-      const { senderId } = message
-      const socket = this.sockets[senderId]
-      /* c8 ignore next */
-      if (!socket) return
-      this.#terminate(socket as WebSocketWithIsAlive)
     } else {
       this.emit("message", message)
     }

package/src/index.ts

@@ -18,8 +18,8 @@ export type {
   FromClientMessage,
   FromServerMessage,
   JoinMessage,
-  LeaveMessage,
   ErrorMessage,
   PeerMessage,
 } from "./messages.js"
-export type { ProtocolVersion, ProtocolV1 } from "./protocolVersion.js"
+export type { ProtocolVersion } from "./protocolVersion.js"
+export { ProtocolV1 } from "./protocolVersion.js"

package/src/messages.ts

@@ -5,12 +5,6 @@ import type {
 } from "@automerge/automerge-repo/slim"
 import type { ProtocolVersion } from "./protocolVersion.js"
 
-/** The sender is disconnecting */
-export type LeaveMessage = {
-  type: "leave"
-  senderId: PeerId
-}
-
 /** Sent by the client to the server to tell the server the clients PeerID */
 export type JoinMessage = {
   type: "join"
@@ -51,7 +45,7 @@ export type ErrorMessage = {
 }
 
 /** A message from the client to the server */
-export type FromClientMessage = JoinMessage | LeaveMessage | Message
+export type FromClientMessage = JoinMessage | Message
 
 /** A message from the server to the client */
 export type FromServerMessage = PeerMessage | ErrorMessage | Message
@@ -62,10 +56,6 @@ export const isJoinMessage = (
   message: FromClientMessage
 ): message is JoinMessage => message.type === "join"
 
-export const isLeaveMessage = (
-  message: FromClientMessage
-): message is LeaveMessage => message.type === "leave"
-
 export const isPeerMessage = (
   message: FromServerMessage
 ): message is PeerMessage => message.type === "peer"

package/test/Websocket.test.ts

@@ -66,7 +66,7 @@ describe("Websocket adapters", () => {
       })
     })
 
-    it("should announce disconnections", async () => {
+    it("should connect and emit peers", async () => {
       const {
         serverAdapter,
         clients: [browserAdapter],
@@ -82,13 +82,9 @@ describe("Websocket adapters", () => {
         peerId: serverPeerId,
       })
 
-      await eventPromise(serverRepo.networkSubsystem, "peer")
-
-      browserAdapter.disconnect()
-
       await Promise.all([
-        eventPromise(browserAdapter, "peer-disconnected"),
-        eventPromise(serverAdapter, "peer-disconnected"),
+        eventPromise(browserRepo.networkSubsystem, "peer"),
+        eventPromise(serverRepo.networkSubsystem, "peer"),
       ])
     })