@automerge/automerge-repo-network-messagechannel 1.0.0-alpha.3 → 1.0.0-alpha.5

package/dist/index.d.ts

@@ -1,14 +1,14 @@
 import { type Message, NetworkAdapter, type PeerId } from "@automerge/automerge-repo";
 import { MessagePortRef } from "./MessagePortRef.js";
 export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
+    #private;
     channels: {};
     messagePortRef: MessagePortRef;
     constructor(messagePort: MessagePort, config?: MessageChannelNetworkAdapterConfig);
     connect(peerId: PeerId): void;
     send(message: Message): void;
     announceConnection(peerId: PeerId): void;
-    join(): void;
-    leave(): void;
+    disconnect(): void;
 }
 interface MessageChannelNetworkAdapterConfig {
     /**

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,cAAc,EACd,KAAK,MAAM,EAEZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;IAC9D,QAAQ,KAAK;IACb,cAAc,EAAE,cAAc,CAAA;gBAG5B,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM;IAiDtB,IAAI,CAAC,OAAO,EAAE,OAAO;IAmBrB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAIjC,IAAI;IAOJ,KAAK;CAIN;AAED,UAAU,kCAAkC;IAC1C;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,cAAc,EACd,KAAK,MAAM,EAEZ,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAOpD,qBAAa,4BAA6B,SAAQ,cAAc;;IAC9D,QAAQ,KAAK;IACb,cAAc,EAAE,cAAc,CAAA;gBAI5B,WAAW,EAAE,WAAW,EACxB,MAAM,GAAE,kCAAuC;IAWjD,OAAO,CAAC,MAAM,EAAE,MAAM;IAgEtB,IAAI,CAAC,OAAO,EAAE,OAAO;IAmBrB,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAQjC,UAAU;CAIX;AAED,UAAU,kCAAkC;IAC1C;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB"}

package/dist/index.js

@@ -6,6 +6,7 @@ const log = debug("automerge-repo:messagechannel");
 export class MessageChannelNetworkAdapter extends NetworkAdapter {
     channels = {};
     messagePortRef;
+    #startupComplete = false;
     constructor(messagePort, config = {}) {
         super();
         const useWeakRef = config.useWeakRef ?? false;
@@ -52,6 +53,19 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         this.messagePortRef.addListener("close", () => {
             this.emit("close");
         });
+        this.messagePortRef.postMessage({
+            senderId: this.peerId,
+            type: "arrive",
+        });
+        // Mark this messagechannel as ready after 50 ms, at this point there
+        // 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 });
+            }
+        }, 100);
     }
     send(message) {
         if ("data" in message) {
@@ -66,15 +80,13 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         }
     }
     announceConnection(peerId) {
+        if (!this.#startupComplete) {
+            this.#startupComplete = true;
+            this.emit("ready", { network: this });
+        }
         this.emit("peer-candidate", { peerId });
     }
-    join() {
-        this.messagePortRef.postMessage({
-            senderId: this.peerId,
-            type: "arrive",
-        });
-    }
-    leave() {
+    disconnect() {
         // TODO
         throw new Error("Unimplemented: leave on MessagePortNetworkAdapter");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-messagechannel",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "description": "MessageChannel network adapter for Automerge Repo",
   "repository": "https://github.com/automerge/automerge-repo",
   "author": "Peter van Hardenberg <pvh@pvh.ca>",
@@ -14,10 +14,10 @@
     "test": "mocha --no-warnings --experimental-specifier-resolution=node --exit"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.0.0-alpha.3"
+    "@automerge/automerge-repo": "^1.0.0-alpha.5"
   },
   "peerDependencies": {
-    "@automerge/automerge": "^2.1.0-alpha.10"
+    "@automerge/automerge": "^2.1.0-alpha.13"
   },
   "watch": {
     "build": {
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0ed108273084319aeea64ceccb49c3d58709f107"
+  "gitHead": "9cd9be160ebda37c8f0d70f2d5cadea5b951a3c3"
 }

package/src/index.ts

@@ -14,6 +14,7 @@ const log = debug("automerge-repo:messagechannel")
 export class MessageChannelNetworkAdapter extends NetworkAdapter {
   channels = {}
   messagePortRef: MessagePortRef
+  #startupComplete = false
 
   constructor(
     messagePort: MessagePort,
@@ -75,6 +76,21 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     this.messagePortRef.addListener("close", () => {
       this.emit("close")
     })
+
+    this.messagePortRef.postMessage({
+      senderId: this.peerId,
+      type: "arrive",
+    })
+
+    // Mark this messagechannel as ready after 50 ms, at this point there
+    // 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 })
+      }
+    }, 100)
   }
 
   send(message: Message) {
@@ -97,17 +113,14 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
   }
 
   announceConnection(peerId: PeerId) {
+    if (!this.#startupComplete) {
+      this.#startupComplete = true
+      this.emit("ready", { network: this })
+    }
     this.emit("peer-candidate", { peerId })
   }
 
-  join() {
-    this.messagePortRef.postMessage({
-      senderId: this.peerId,
-      type: "arrive",
-    })
-  }
-
-  leave() {
+  disconnect() {
     // TODO
     throw new Error("Unimplemented: leave on MessagePortNetworkAdapter")
   }

package/test/index.test.ts

@@ -1,5 +1,5 @@
-import { runAdapterTests } from "../../automerge-repo/src/helpers/tests/network-adapter-tests"
-import { MessageChannelNetworkAdapter as Adapter } from "../src"
+import { runAdapterTests } from "../../automerge-repo/src/helpers/tests/network-adapter-tests.js"
+import { MessageChannelNetworkAdapter as Adapter } from "../src/index.js"
 
 // bob is the hub, alice and charlie are spokes
 describe("MessageChannelNetworkAdapter", () => {

package/tsconfig.json

@@ -2,8 +2,8 @@
   "compilerOptions": {
     "target": "ESNext",
     "jsx": "react",
-    "module": "ESNext",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "Node16",
     "declaration": true,
     "declarationMap": true,
     "outDir": "./dist",