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

package/dist/MessagePortRef.d.ts

@@ -5,6 +5,7 @@ export interface PortRefEvents {
 }
 export interface MessagePortRef extends EventEmitter<PortRefEvents> {
     start(): void;
+    stop(): void;
     postMessage(message: any, transferable?: Transferable[]): void;
     isAlive(): boolean;
 }

package/dist/MessagePortRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessagePortRef.d.ts","sourceRoot":"","sources":["../src/MessagePortRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACtC,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,aAAa,CAAC;IACjE,KAAK,IAAI,IAAI,CAAA;IACb,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAC9D,OAAO,IAAI,OAAO,CAAA;CACnB"}
+{"version":3,"file":"MessagePortRef.d.ts","sourceRoot":"","sources":["../src/MessagePortRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAE5C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAA;IACtC,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,aAAa,CAAC;IACjE,KAAK,IAAI,IAAI,CAAA;IACb,IAAI,IAAI,IAAI,CAAA;IACZ,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,CAAA;IAC9D,OAAO,IAAI,OAAO,CAAA;CACnB"}

package/dist/StrongMessagePortRef.d.ts

@@ -2,9 +2,11 @@ import { EventEmitter } from "eventemitter3";
 import { PortRefEvents, MessagePortRef } from "./MessagePortRef.js";
 export declare class StrongMessagePortRef extends EventEmitter<PortRefEvents> implements MessagePortRef {
     private port;
+    isDisconnected: boolean;
     constructor(port: MessagePort);
     postMessage(message: any, transfer: Transferable[]): void;
     start(): void;
+    stop(): void;
     isAlive(): boolean;
 }
 //# sourceMappingURL=StrongMessagePortRef.d.ts.map

package/dist/StrongMessagePortRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StrongMessagePortRef.d.ts","sourceRoot":"","sources":["../src/StrongMessagePortRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEnE,qBAAa,oBACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,cAAc;IAEb,OAAO,CAAC,IAAI;gBAAJ,IAAI,EAAE,WAAW;IAQrC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI;IAIzD,KAAK,IAAI,IAAI;IAIb,OAAO,IAAI,OAAO;CAInB"}
+{"version":3,"file":"StrongMessagePortRef.d.ts","sourceRoot":"","sources":["../src/StrongMessagePortRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEnE,qBAAa,oBACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,cAAc;IAIb,OAAO,CAAC,IAAI;IAFxB,cAAc,EAAE,OAAO,CAAQ;gBAEX,IAAI,EAAE,WAAW;IAUrC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI;IAMzD,KAAK,IAAI,IAAI;IAKb,IAAI;IAIJ,OAAO,IAAI,OAAO;CAInB"}

package/dist/StrongMessagePortRef.js

@@ -1,19 +1,28 @@
 import { EventEmitter } from "eventemitter3";
 export class StrongMessagePortRef extends EventEmitter {
     port;
+    isDisconnected = false;
     constructor(port) {
         port.addEventListener("message", event => {
-            this.emit("message", event);
+            if (!this.isDisconnected) {
+                this.emit("message", event);
+            }
         });
         super();
         this.port = port;
     }
     postMessage(message, transfer) {
-        this.port.postMessage(message, transfer);
+        if (!this.isDisconnected) {
+            this.port.postMessage(message, transfer);
+        }
     }
     start() {
+        this.isDisconnected = false;
         this.port.start();
     }
+    stop() {
+        this.isDisconnected = true;
+    }
     isAlive() {
         /* c8 ignore next */
         return true;

package/dist/WeakMessagePortRef.d.ts

@@ -6,6 +6,7 @@ export declare class WeakMessagePortRef extends EventEmitter<PortRefEvents> impl
     constructor(port: MessagePort);
     postMessage(message: any, transfer: Transferable[]): void;
     start(): void;
+    stop(): void;
     private disconnnect;
     isAlive(): boolean;
 }

package/dist/WeakMessagePortRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeakMessagePortRef.d.ts","sourceRoot":"","sources":["../src/WeakMessagePortRef.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEnE,qBAAa,kBACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,cAAc;IAEzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAQ;gBAElB,IAAI,EAAE,WAAW;IAU7B,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI;IAezD,KAAK,IAAI,IAAI;IAeb,OAAO,CAAC,WAAW;IAOnB,OAAO,IAAI,OAAO;CAYnB"}
+{"version":3,"file":"WeakMessagePortRef.d.ts","sourceRoot":"","sources":["../src/WeakMessagePortRef.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAEnE,qBAAa,kBACX,SAAQ,YAAY,CAAC,aAAa,CAClC,YAAW,cAAc;IAEzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,cAAc,CAAQ;gBAElB,IAAI,EAAE,WAAW;IAY7B,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI;IAmBzD,KAAK,IAAI,IAAI;IAiBb,IAAI;IAIJ,OAAO,CAAC,WAAW;IAOnB,OAAO,IAAI,OAAO;CAYnB"}

package/dist/WeakMessagePortRef.js

@@ -7,7 +7,9 @@ export class WeakMessagePortRef extends EventEmitter {
         super();
         this.weakRef = new WeakRef(port);
         port.addEventListener("message", event => {
-            this.emit("message", event);
+            if (!this.isDisconnected) {
+                this.emit("message", event);
+            }
         });
     }
     postMessage(message, transfer) {
@@ -16,6 +18,9 @@ export class WeakMessagePortRef extends EventEmitter {
             this.disconnnect();
             return;
         }
+        if (this.isDisconnected) {
+            return;
+        }
         try {
             port.postMessage(message, transfer);
         }
@@ -29,6 +34,7 @@ export class WeakMessagePortRef extends EventEmitter {
             this.disconnnect();
             return;
         }
+        this.isDisconnected = false;
         try {
             port.start();
         }
@@ -36,6 +42,9 @@ export class WeakMessagePortRef extends EventEmitter {
             this.disconnnect();
         }
     }
+    stop() {
+        this.isDisconnected = true;
+    }
     disconnnect() {
         if (!this.isDisconnected) {
             this.emit("close");

package/dist/index.d.ts

@@ -12,6 +12,8 @@ export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
     channels: {};
     /** @hidden */
     messagePortRef: MessagePortRef;
+    isReady(): boolean;
+    whenReady(): Promise<void>;
     constructor(messagePort: MessagePort, config?: MessageChannelNetworkAdapterConfig);
     connect(peerId: PeerId, peerMetadata?: PeerMetadata): void;
     send(message: RepoMessage): void;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EACL,KAAK,WAAW,EAChB,cAAc,EACd,KAAK,MAAM,EAEX,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;gBAI5B,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IAyEnD,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAQ7D,UAAU;CAIX;AAED,MAAM,WAAW,kCAAkC;IACjD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EACL,KAAK,WAAW,EAChB,cAAc,EACd,KAAK,MAAM,EAEX,YAAY,EACb,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc;IACd,cAAc,EAAE,cAAc,CAAA;IAS9B,OAAO;IAIP,SAAS;gBAYP,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY;IA4EnD,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAM7D,UAAU;CAUX;AAED,MAAM,WAAW,kCAAkC;IACjD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}

package/dist/index.js

@@ -14,7 +14,24 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     channels = {};
     /** @hidden */
     messagePortRef;
-    #startupComplete = false;
+    #ready = false;
+    #readyResolver;
+    #readyPromise = new Promise(resolve => {
+        this.#readyResolver = resolve;
+    });
+    #remotePeerId;
+    isReady() {
+        return this.#ready;
+    }
+    whenReady() {
+        return this.#readyPromise;
+    }
+    #forceReady() {
+        if (!this.#ready) {
+            this.#ready = true;
+            this.#readyResolver?.();
+        }
+    }
     constructor(messagePort, config = {}) {
         super();
         const useWeakRef = config.useWeakRef ?? false;
@@ -53,6 +70,11 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
                         this.announceConnection(senderId, peerMetadata);
                     }
                     break;
+                case "leave":
+                    if (this.#remotePeerId === senderId) {
+                        this.emit("peer-disconnected", { peerId: senderId });
+                    }
+                    break;
                 default:
                     if (!("data" in message)) {
                         this.emit("message", message);
@@ -78,10 +100,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         // must be something weird going on on the other end to cause us to receive
         // no response
         setTimeout(() => {
-            if (!this.#startupComplete) {
-                this.#startupComplete = true;
-                this.emit("ready", { network: this });
-            }
+            this.#forceReady();
         }, 100);
     }
     send(message) {
@@ -97,14 +116,18 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         }
     }
     announceConnection(peerId, peerMetadata) {
-        if (!this.#startupComplete) {
-            this.#startupComplete = true;
-            this.emit("ready", { network: this });
-        }
+        this.#remotePeerId = peerId;
+        this.#forceReady();
         this.emit("peer-candidate", { peerId, peerMetadata });
     }
     disconnect() {
-        // TODO
-        throw new Error("Unimplemented: leave on MessagePortNetworkAdapter");
+        if (this.#remotePeerId && this.peerId) {
+            this.messagePortRef.postMessage({
+                type: "leave",
+                senderId: this.peerId,
+            });
+            this.emit("peer-disconnected", { peerId: this.#remotePeerId });
+        }
+        this.messagePortRef.stop();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-messagechannel",
-  "version": "1.2.1",
+  "version": "2.0.0-alpha.0",
   "description": "MessageChannel network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-messagechannel",
   "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",
     "debug": "^4.3.4",
     "eventemitter3": "^5.0.1"
   },
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2108823d685e855977defb75a938838a3734818b"
+  "gitHead": "16356392fb2ed9245565ae04f6e6b49e61195e65"
 }

package/src/MessagePortRef.ts

@@ -7,6 +7,7 @@ export interface PortRefEvents {
 
 export interface MessagePortRef extends EventEmitter<PortRefEvents> {
   start(): void
+  stop(): void
   postMessage(message: any, transferable?: Transferable[]): void
   isAlive(): boolean
 }

package/src/StrongMessagePortRef.ts

@@ -5,22 +5,33 @@ export class StrongMessagePortRef
   extends EventEmitter<PortRefEvents>
   implements MessagePortRef
 {
+  isDisconnected: boolean = false
+
   constructor(private port: MessagePort) {
     port.addEventListener("message", event => {
-      this.emit("message", event)
+      if (!this.isDisconnected) {
+        this.emit("message", event)
+      }
     })
 
     super()
   }
 
   postMessage(message: any, transfer: Transferable[]): void {
-    this.port.postMessage(message, transfer)
+    if (!this.isDisconnected) {
+      this.port.postMessage(message, transfer)
+    }
   }
 
   start(): void {
+    this.isDisconnected = false
     this.port.start()
   }
 
+  stop() {
+    this.isDisconnected = true
+  }
+
   isAlive(): boolean {
     /* c8 ignore next */
     return true

package/src/WeakMessagePortRef.ts

@@ -15,7 +15,9 @@ export class WeakMessagePortRef
     this.weakRef = new WeakRef<MessagePort>(port)
 
     port.addEventListener("message", event => {
-      this.emit("message", event)
+      if (!this.isDisconnected) {
+        this.emit("message", event)
+      }
     })
   }
 
@@ -27,6 +29,10 @@ export class WeakMessagePortRef
       return
     }
 
+    if (this.isDisconnected) {
+      return
+    }
+
     try {
       port.postMessage(message, transfer)
     } catch (err) {
@@ -42,6 +48,8 @@ export class WeakMessagePortRef
       return
     }
 
+    this.isDisconnected = false
+
     try {
       port.start()
     } catch (err) {
@@ -49,6 +57,10 @@ export class WeakMessagePortRef
     }
   }
 
+  stop() {
+    this.isDisconnected = true
+  }
+
   private disconnnect() {
     if (!this.isDisconnected) {
       this.emit("close")

package/src/index.ts

@@ -23,7 +23,28 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
   channels = {}
   /** @hidden */
   messagePortRef: MessagePortRef
-  #startupComplete = false
+
+  #ready = false
+  #readyResolver?: () => void
+  #readyPromise: Promise<void> = new Promise<void>(resolve => {
+    this.#readyResolver = resolve
+  })
+  #remotePeerId?: PeerId
+
+  isReady() {
+    return this.#ready
+  }
+
+  whenReady() {
+    return this.#readyPromise
+  }
+
+  #forceReady() {
+    if (!this.#ready) {
+      this.#ready = true
+      this.#readyResolver?.()
+    }
+  }
 
   constructor(
     messagePort: MessagePort,
@@ -42,6 +63,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     log("messageport connecting")
     this.peerId = peerId
     this.peerMetadata = peerMetadata
+
     this.messagePortRef.start()
     this.messagePortRef.addListener(
       "message",
@@ -76,6 +98,11 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
               this.announceConnection(senderId, peerMetadata)
             }
             break
+          case "leave":
+            if (this.#remotePeerId === senderId) {
+              this.emit("peer-disconnected", { peerId: senderId })
+            }
+            break
           default:
             if (!("data" in message)) {
               this.emit("message", message)
@@ -104,10 +131,7 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     // must be something weird going on on the other end to cause us to receive
     // no response
     setTimeout(() => {
-      if (!this.#startupComplete) {
-        this.#startupComplete = true
-        this.emit("ready", { network: this })
-      }
+      this.#forceReady()
     }, 100)
   }
 
@@ -131,16 +155,20 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
   }
 
   announceConnection(peerId: PeerId, peerMetadata: PeerMetadata) {
-    if (!this.#startupComplete) {
-      this.#startupComplete = true
-      this.emit("ready", { network: this })
-    }
+    this.#remotePeerId = peerId
+    this.#forceReady()
     this.emit("peer-candidate", { peerId, peerMetadata })
   }
 
   disconnect() {
-    // TODO
-    throw new Error("Unimplemented: leave on MessagePortNetworkAdapter")
+    if (this.#remotePeerId && this.peerId) {
+      this.messagePortRef.postMessage({
+        type: "leave",
+        senderId: this.peerId,
+      })
+      this.emit("peer-disconnected", { peerId: this.#remotePeerId })
+    }
+    this.messagePortRef.stop()
   }
 }