@automerge/automerge-repo-network-broadcastchannel 1.2.1 → 2.0.0-alpha.0

package/dist/index.d.ts

@@ -19,9 +19,11 @@ export type BroadcastChannelNetworkAdapterOptions = {
 };
 export declare class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     #private;
+    isReady(): boolean;
+    whenReady(): Promise<void>;
     constructor(options?: BroadcastChannelNetworkAdapterOptions);
     connect(peerId: PeerId, peerMetadata?: PeerMetadata): void;
-    send(message: Message): void;
+    send(message: Message): false | undefined;
     disconnect(): void;
 }
 //# 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;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EACd,KAAK,OAAO,EACZ,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAA;AAEvC,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,8BAA+B,SAAQ,cAAc;;gBAKpD,OAAO,CAAC,EAAE,qCAAqC;IAM3D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IA6DnD,IAAI,CAAC,OAAO,EAAE,OAAO;IAgBrB,UAAU;CAIX"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EACd,KAAK,OAAO,EACZ,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAA;AAEvC,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,qBAAa,8BAA+B,SAAQ,cAAc;;IAahE,OAAO;IAIP,SAAS;gBAWG,OAAO,CAAC,EAAE,qCAAqC;IAM3D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAwEnD,IAAI,CAAC,OAAO,EAAE,OAAO;IAmBrB,UAAU;CAUX"}

package/dist/index.js

@@ -16,7 +16,26 @@
 import { NetworkAdapter, } from "@automerge/automerge-repo/slim";
 export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     #broadcastChannel;
+    #disconnected = false;
     #options;
+    #ready = false;
+    #readyResolver;
+    #readyPromise = new Promise(resolve => {
+        this.#readyResolver = resolve;
+    });
+    #connectedPeers = [];
+    isReady() {
+        return this.#ready;
+    }
+    whenReady() {
+        return this.#readyPromise;
+    }
+    #forceReady() {
+        if (!this.#ready) {
+            this.#ready = true;
+            this.#readyResolver?.();
+        }
+    }
     constructor(options) {
         super();
         this.#options = { channelName: "broadcast", ...(options ?? {}) };
@@ -25,11 +44,15 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
     connect(peerId, peerMetadata) {
         this.peerId = peerId;
         this.peerMetadata = peerMetadata;
+        this.#disconnected = false;
         this.#broadcastChannel.addEventListener("message", (e) => {
             const message = e.data;
             if ("targetId" in message && message.targetId !== this.peerId) {
                 return;
             }
+            if (this.#disconnected) {
+                return;
+            }
             const { senderId, type } = message;
             switch (type) {
                 case "arrive":
@@ -50,6 +73,10 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
                         this.#announceConnection(senderId, peerMetadata);
                     }
                     break;
+                case "leave":
+                    this.#connectedPeers = this.#connectedPeers.filter(p => p !== senderId);
+                    this.emit("peer-disconnected", { peerId: senderId });
+                    break;
                 default:
                     if (!("data" in message)) {
                         this.emit("message", message);
@@ -69,12 +96,16 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
             type: "arrive",
             peerMetadata,
         });
-        this.emit("ready", { network: this });
     }
     #announceConnection(peerId, peerMetadata) {
+        this.#forceReady();
+        this.#connectedPeers.push(peerId);
         this.emit("peer-candidate", { peerId, peerMetadata });
     }
     send(message) {
+        if (this.#disconnected) {
+            return false;
+        }
         if ("data" in message) {
             this.#broadcastChannel.postMessage({
                 ...message,
@@ -88,7 +119,13 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
         }
     }
     disconnect() {
-        // TODO:
-        throw new Error("Unimplemented: leave on BroadcastChannelNetworkAdapter");
+        this.#broadcastChannel.postMessage({
+            senderId: this.peerId,
+            type: "leave",
+        });
+        for (const peerId of this.#connectedPeers) {
+            this.emit("peer-disconnected", { peerId });
+        }
+        this.#disconnected = true;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-broadcastchannel",
-  "version": "1.2.1",
+  "version": "2.0.0-alpha.0",
   "description": "BroadcastChannel network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-broadcastchannel",
   "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.0"
   },
   "watch": {
     "build": {
@@ -26,5 +26,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2108823d685e855977defb75a938838a3734818b"
+  "gitHead": "16356392fb2ed9245565ae04f6e6b49e61195e65"
 }

package/src/index.ts

@@ -27,9 +27,32 @@ export type BroadcastChannelNetworkAdapterOptions = {
 
 export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
   #broadcastChannel: BroadcastChannel
+  #disconnected = false
 
   #options: BroadcastChannelNetworkAdapterOptions
 
+  #ready = false
+  #readyResolver?: () => void
+  #readyPromise: Promise<void> = new Promise<void>(resolve => {
+    this.#readyResolver = resolve
+  })
+  #connectedPeers: PeerId[] = []
+
+  isReady() {
+    return this.#ready
+  }
+
+  whenReady() {
+    return this.#readyPromise
+  }
+
+  #forceReady() {
+    if (!this.#ready) {
+      this.#ready = true
+      this.#readyResolver?.()
+    }
+  }
+
   constructor(options?: BroadcastChannelNetworkAdapterOptions) {
     super()
     this.#options = { channelName: "broadcast", ...(options ?? {}) }
@@ -39,6 +62,7 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
   connect(peerId: PeerId, peerMetadata?: PeerMetadata) {
     this.peerId = peerId
     this.peerMetadata = peerMetadata
+    this.#disconnected = false
 
     this.#broadcastChannel.addEventListener(
       "message",
@@ -48,6 +72,10 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
           return
         }
 
+        if (this.#disconnected) {
+          return
+        }
+
         const { senderId, type } = message
 
         switch (type) {
@@ -69,6 +97,12 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
               this.#announceConnection(senderId, peerMetadata)
             }
             break
+          case "leave":
+            this.#connectedPeers = this.#connectedPeers.filter(
+              p => p !== senderId
+            )
+            this.emit("peer-disconnected", { peerId: senderId })
+            break
           default:
             if (!("data" in message)) {
               this.emit("message", message)
@@ -89,15 +123,18 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
       type: "arrive",
       peerMetadata,
     })
-
-    this.emit("ready", { network: this })
   }
 
   #announceConnection(peerId: PeerId, peerMetadata: PeerMetadata) {
+    this.#forceReady()
+    this.#connectedPeers.push(peerId)
     this.emit("peer-candidate", { peerId, peerMetadata })
   }
 
   send(message: Message) {
+    if (this.#disconnected) {
+      return false
+    }
     if ("data" in message) {
       this.#broadcastChannel.postMessage({
         ...message,
@@ -114,8 +151,14 @@ export class BroadcastChannelNetworkAdapter extends NetworkAdapter {
   }
 
   disconnect() {
-    // TODO:
-    throw new Error("Unimplemented: leave on BroadcastChannelNetworkAdapter")
+    this.#broadcastChannel.postMessage({
+      senderId: this.peerId,
+      type: "leave",
+    })
+    for (const peerId of this.#connectedPeers) {
+      this.emit("peer-disconnected", { peerId })
+    }
+    this.#disconnected = true
   }
 }