@automerge/automerge-repo-network-messagechannel 1.1.0-alpha.1 → 1.1.0-alpha.13

package/dist/MessagePortRef.d.ts

@@ -1,4 +1,4 @@
-import type { EventEmitter } from "eventemitter3";
+import { EventEmitter } from "eventemitter3";
 export interface PortRefEvents {
     message: (event: MessageEvent) => void;
     close: () => void;

package/dist/MessagePortRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessagePortRef.d.ts","sourceRoot":"","sources":["../src/MessagePortRef.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAEjD,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,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.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;CAGnB"}
+{"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"}

package/dist/StrongMessagePortRef.js

@@ -15,6 +15,7 @@ export class StrongMessagePortRef extends EventEmitter {
         this.port.start();
     }
     isAlive() {
+        /* c8 ignore next */
         return true;
     }
 }

package/dist/WeakMessagePortRef.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeakMessagePortRef.d.ts","sourceRoot":"","sources":["../src/WeakMessagePortRef.ts"],"names":[],"mappings":"AAAA,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;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"}

package/dist/WeakMessagePortRef.js

@@ -1,3 +1,4 @@
+/* c8 ignore start */
 import { EventEmitter } from "eventemitter3";
 export class WeakMessagePortRef extends EventEmitter {
     weakRef;
@@ -52,3 +53,4 @@ export class WeakMessagePortRef extends EventEmitter {
         return true;
     }
 }
+/* c8 ignore end */

package/dist/index.d.ts

@@ -5,7 +5,7 @@
  *
  * @module
  */
-import { type RepoMessage, NetworkAdapter, type PeerId, type StorageId } from "@automerge/automerge-repo";
+import { type RepoMessage, NetworkAdapter, type PeerId, PeerMetadata } from "@automerge/automerge-repo";
 import { MessagePortRef } from "./MessagePortRef.js";
 export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
     #private;
@@ -13,9 +13,9 @@ export declare class MessageChannelNetworkAdapter extends NetworkAdapter {
     /** @hidden */
     messagePortRef: MessagePortRef;
     constructor(messagePort: MessagePort, config?: MessageChannelNetworkAdapterConfig);
-    connect(peerId: PeerId, storageId: StorageId | undefined, isEphemeral: boolean): void;
+    connect(peerId: PeerId, peerMetadata: PeerMetadata): void;
     send(message: RepoMessage): void;
-    announceConnection(peerId: PeerId, storageId: StorageId | undefined, isEphemeral: boolean): void;
+    announceConnection(peerId: PeerId, peerMetadata: PeerMetadata): void;
     disconnect(): void;
 }
 export interface MessageChannelNetworkAdapterConfig {

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,KAAK,SAAS,EACf,MAAM,2BAA2B,CAAA;AAClC,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,CACL,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,WAAW,EAAE,OAAO;IA2EtB,IAAI,CAAC,OAAO,EAAE,WAAW;IAmBzB,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,WAAW,EAAE,OAAO;IAStB,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,2BAA2B,CAAA;AAClC,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,EAAE,YAAY;IAwElD,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"}

package/dist/index.js

@@ -22,14 +22,13 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
             ? new WeakMessagePortRef(messagePort)
             : new StrongMessagePortRef(messagePort);
     }
-    connect(peerId, storageId, isEphemeral) {
+    connect(peerId, peerMetadata) {
         log("messageport connecting");
         this.peerId = peerId;
-        this.storageId = storageId;
-        this.isEphemeral = isEphemeral;
+        this.peerMetadata = peerMetadata;
         this.messagePortRef.start();
         this.messagePortRef.addListener("message", (e) => {
-            log("message port received", e.data);
+            log("message port received %o", e.data);
             const message = e.data;
             if ("targetId" in message && message.targetId !== this.peerId) {
                 throw new Error("MessagePortNetwork should never receive messages for a different peer.");
@@ -38,21 +37,20 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
             switch (type) {
                 case "arrive":
                     {
-                        const { storageId, isEphemeral } = message;
+                        const { peerMetadata } = message;
                         this.messagePortRef.postMessage({
+                            type: "welcome",
                             senderId: this.peerId,
-                            storageId: this.storageId,
-                            isEphemeral: this.isEphemeral,
+                            peerMetadata: this.peerMetadata,
                             targetId: senderId,
-                            type: "welcome",
                         });
-                        this.announceConnection(senderId, storageId, isEphemeral);
+                        this.announceConnection(senderId, peerMetadata);
                     }
                     break;
                 case "welcome":
                     {
-                        const { storageId, isEphemeral } = message;
-                        this.announceConnection(senderId, storageId, isEphemeral);
+                        const { peerMetadata } = message;
+                        this.announceConnection(senderId, peerMetadata);
                     }
                     break;
                 default:
@@ -97,12 +95,12 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
             this.messagePortRef.postMessage(message);
         }
     }
-    announceConnection(peerId, storageId, isEphemeral) {
+    announceConnection(peerId, peerMetadata) {
         if (!this.#startupComplete) {
             this.#startupComplete = true;
             this.emit("ready", { network: this });
         }
-        this.emit("peer-candidate", { peerId, storageId, isEphemeral });
+        this.emit("peer-candidate", { peerId, peerMetadata });
     }
     disconnect() {
         // TODO

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-messagechannel",
-  "version": "1.1.0-alpha.1",
+  "version": "1.1.0-alpha.13",
   "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,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@automerge/automerge-repo": "^1.1.0-alpha.1"
+    "@automerge/automerge-repo": "1.1.0-alpha.13",
+    "debug": "^4.3.4",
+    "eventemitter3": "^5.0.1"
   },
   "watch": {
     "build": {
@@ -26,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "11805d698f860bd6ffb3ca028d3b57e718690b5a"
+  "gitHead": "f4ce1376d900ad98f00a638626be9611077460b5"
 }

package/src/MessagePortRef.ts

@@ -1,4 +1,4 @@
-import type { EventEmitter } from "eventemitter3"
+import { EventEmitter } from "eventemitter3"
 
 export interface PortRefEvents {
   message: (event: MessageEvent) => void

package/src/StrongMessagePortRef.ts

@@ -22,6 +22,7 @@ export class StrongMessagePortRef
   }
 
   isAlive(): boolean {
+    /* c8 ignore next */
     return true
   }
 }

package/src/WeakMessagePortRef.ts

@@ -1,3 +1,4 @@
+/* c8 ignore start */
 import { EventEmitter } from "eventemitter3"
 import { PortRefEvents, MessagePortRef } from "./MessagePortRef.js"
 
@@ -68,3 +69,5 @@ export class WeakMessagePortRef
     return true
   }
 }
+
+/* c8 ignore end */

package/src/index.ts

@@ -10,7 +10,7 @@ import {
   NetworkAdapter,
   type PeerId,
   type Message,
-  type StorageId,
+  PeerMetadata,
 } from "@automerge/automerge-repo"
 import { MessagePortRef } from "./MessagePortRef.js"
 import { StrongMessagePortRef } from "./StrongMessagePortRef.js"
@@ -38,20 +38,15 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
       : new StrongMessagePortRef(messagePort)
   }
 
-  connect(
-    peerId: PeerId,
-    storageId: StorageId | undefined,
-    isEphemeral: boolean
-  ) {
+  connect(peerId: PeerId, peerMetadata: PeerMetadata) {
     log("messageport connecting")
     this.peerId = peerId
-    this.storageId = storageId
-    this.isEphemeral = isEphemeral
+    this.peerMetadata = peerMetadata
     this.messagePortRef.start()
     this.messagePortRef.addListener(
       "message",
       (e: { data: MessageChannelMessage }) => {
-        log("message port received", e.data)
+        log("message port received %o", e.data)
 
         const message = e.data
         if ("targetId" in message && message.targetId !== this.peerId) {
@@ -65,21 +60,20 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
         switch (type) {
           case "arrive":
             {
-              const { storageId, isEphemeral } = message
+              const { peerMetadata } = message as ArriveMessage
               this.messagePortRef.postMessage({
+                type: "welcome",
                 senderId: this.peerId,
-                storageId: this.storageId,
-                isEphemeral: this.isEphemeral,
+                peerMetadata: this.peerMetadata,
                 targetId: senderId,
-                type: "welcome",
               })
-              this.announceConnection(senderId, storageId, isEphemeral)
+              this.announceConnection(senderId, peerMetadata)
             }
             break
           case "welcome":
             {
-              const { storageId, isEphemeral } = message
-              this.announceConnection(senderId, storageId, isEphemeral)
+              const { peerMetadata } = message as WelcomeMessage
+              this.announceConnection(senderId, peerMetadata)
             }
             break
           default:
@@ -135,16 +129,12 @@ export class MessageChannelNetworkAdapter extends NetworkAdapter {
     }
   }
 
-  announceConnection(
-    peerId: PeerId,
-    storageId: StorageId | undefined,
-    isEphemeral: boolean
-  ) {
+  announceConnection(peerId: PeerId, peerMetadata: PeerMetadata) {
     if (!this.#startupComplete) {
       this.#startupComplete = true
       this.emit("ready", { network: this })
     }
-    this.emit("peer-candidate", { peerId, storageId, isEphemeral })
+    this.emit("peer-candidate", { peerId, peerMetadata })
   }
 
   disconnect() {
@@ -172,12 +162,8 @@ type ArriveMessage = {
   /** The peer ID of the sender of this message */
   senderId: PeerId
 
-  /** Unique ID of the storage that the sender peer is using, is persistent across sessions */
-  storageId?: StorageId
-
-  /** Indicates whether other peers should persist the sync state of the sender peer.
-   * Sync state is only persisted for non-ephemeral peers */
-  isEphemeral: boolean
+  /** The peer metadata of the sender of this message */
+  peerMetadata: PeerMetadata
 
   /** Arrive messages don't have a targetId */
   targetId: never
@@ -190,12 +176,8 @@ type WelcomeMessage = {
   /** The peer ID of the recipient sender this message */
   senderId: PeerId
 
-  /** Unique ID of the storage that the sender peer is using, is persistent across sessions */
-  storageId?: StorageId
-
-  /** Indicates whether other peers should persist the sync state of the sender peer.
-   * Sync state is only persisted for non-ephemeral peers */
-  isEphemeral: boolean
+  /** The peer metadata of the sender of this message */
+  peerMetadata: PeerMetadata
 
   /** The peer ID of the recipient of this message */
   targetId: PeerId