@automerge/automerge-repo-network-websocket 1.1.0-alpha.1 → 1.1.0-alpha.2

package/dist/BrowserWebSocketClientAdapter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="ws" />
-import { NetworkAdapter, type PeerId, type StorageId } from "@automerge/automerge-repo";
+import { NetworkAdapter, type PeerId, type PeerMetadata } from "@automerge/automerge-repo";
 import WebSocket from "isomorphic-ws";
 import { FromClientMessage } from "./messages.js";
 declare abstract class WebSocketNetworkAdapter extends NetworkAdapter {
@@ -11,14 +11,14 @@ export declare class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapt
     remotePeerId?: PeerId;
     url: string;
     constructor(url: string);
-    connect(peerId: PeerId, storageId: StorageId | undefined, isEphemeral: boolean): void;
+    connect(peerId: PeerId, peerMetadata: PeerMetadata): void;
     onOpen: () => void;
     onClose: () => void;
     onMessage: (event: WebSocket.MessageEvent) => void;
     join(): void;
     disconnect(): void;
     send(message: FromClientMessage): void;
-    announceConnection(peerId: PeerId, storageId: StorageId | undefined, isEphemeral: boolean): void;
+    announceConnection(peerId: PeerId, peerMetadata: PeerMetadata): void;
     receiveMessage(message: Uint8Array): void;
 }
 export {};

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,KAAK,MAAM,EAEX,KAAK,SAAS,EACf,MAAM,2BAA2B,CAAA;AAClC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAIlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;;IAGxE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IACvC,YAAY,CAAC,EAAE,MAAM,CAAA;IAGrB,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CACL,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,WAAW,EAAE,OAAO;IAwCtB,MAAM,aAKL;IAGD,OAAO,aAYN;IAED,SAAS,UAAW,sBAAsB,UAEzC;IAED,IAAI;IAWJ,UAAU;IAOV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAwB/B,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,WAAW,EAAE,OAAO;IAetB,cAAc,CAAC,OAAO,EAAE,UAAU;CA4BnC"}
+{"version":3,"file":"BrowserWebSocketClientAdapter.d.ts","sourceRoot":"","sources":["../src/BrowserWebSocketClientAdapter.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,cAAc,EACd,KAAK,MAAM,EACX,KAAK,YAAY,EAElB,MAAM,2BAA2B,CAAA;AAClC,OAAO,SAAS,MAAM,eAAe,CAAA;AAIrC,OAAO,EACL,iBAAiB,EAIlB,MAAM,eAAe,CAAA;AAKtB,uBAAe,uBAAwB,SAAQ,cAAc;IAC3D,MAAM,CAAC,EAAE,SAAS,CAAA;CACnB;AAED,qBAAa,6BAA8B,SAAQ,uBAAuB;;IAGxE,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;IACvC,YAAY,CAAC,EAAE,MAAM,CAAA;IAGrB,GAAG,EAAE,MAAM,CAAA;gBAEC,GAAG,EAAE,MAAM;IAKvB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAmClD,MAAM,aAKL;IAGD,OAAO,aAYN;IAED,SAAS,UAAW,sBAAsB,UAEzC;IAED,IAAI;IAWJ,UAAU;IAOV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAwB/B,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAc7D,cAAc,CAAC,OAAO,EAAE,UAAU;CA4BnC"}

package/dist/BrowserWebSocketClientAdapter.js

@@ -17,7 +17,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         super();
         this.url = url;
     }
-    connect(peerId, storageId, isEphemeral) {
+    connect(peerId, peerMetadata) {
         // If we're reconnecting  make sure we remove the old event listeners
         // before creating a new connection.
         if (this.socket) {
@@ -26,11 +26,10 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
             this.socket.removeEventListener("message", this.onMessage);
         }
         if (!this.timerId) {
-            this.timerId = setInterval(() => this.connect(peerId, storageId, isEphemeral), 5000);
+            this.timerId = setInterval(() => this.connect(peerId, peerMetadata), 5000);
         }
         this.peerId = peerId;
-        this.storageId = storageId;
-        this.isEphemeral = isEphemeral;
+        this.peerMetadata = peerMetadata;
         this.socket = new WebSocket(this.url);
         this.socket.binaryType = "arraybuffer";
         this.socket.addEventListener("open", this.onOpen);
@@ -51,7 +50,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         log(`@ ${this.url}: open`);
         clearInterval(this.timerId);
         this.timerId = undefined;
-        this.send(joinMessage(this.peerId, this.storageId, this.isEphemeral));
+        this.send(joinMessage(this.peerId, this.peerMetadata));
     };
     // When a socket closes, or disconnects, remove it from the array.
     onClose = () => {
@@ -61,7 +60,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         }
         if (!this.timerId) {
             if (this.peerId) {
-                this.connect(this.peerId, this.storageId, this.isEphemeral);
+                this.connect(this.peerId, this.peerMetadata);
             }
         }
     };
@@ -73,7 +72,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
             throw new Error("WTF, get a socket");
         }
         if (this.socket.readyState === WebSocket.OPEN) {
-            this.send(joinMessage(this.peerId, this.storageId, this.isEphemeral));
+            this.send(joinMessage(this.peerId, this.peerMetadata));
         }
         else {
             // The onOpen handler automatically sends a join message
@@ -101,7 +100,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         const arrayBuf = encoded.buffer.slice(encoded.byteOffset, encoded.byteOffset + encoded.byteLength);
         this.socket?.send(arrayBuf);
     }
-    announceConnection(peerId, storageId, isEphemeral) {
+    announceConnection(peerId, peerMetadata) {
         // return a peer object
         const myPeerId = this.peerId;
         if (!myPeerId) {
@@ -112,7 +111,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
             this.emit("ready", { network: this });
         }
         this.remotePeerId = peerId;
-        this.emit("peer-candidate", { peerId, storageId, isEphemeral });
+        this.emit("peer-candidate", { peerId, peerMetadata });
     }
     receiveMessage(message) {
         const decoded = cbor.decode(new Uint8Array(message));
@@ -126,9 +125,9 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         }
         switch (type) {
             case "peer": {
-                const { storageId, isEphemeral } = decoded;
+                const { peerMetadata } = decoded;
                 log(`peer: ${senderId}`);
-                this.announceConnection(senderId, storageId, isEphemeral);
+                this.announceConnection(senderId, peerMetadata);
                 break;
             }
             case "error":
@@ -139,12 +138,11 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
         }
     }
 }
-function joinMessage(senderId, storageId, isEphemeral) {
+function joinMessage(senderId, peerMetadata) {
     return {
         type: "join",
         senderId,
-        storageId,
-        isEphemeral,
+        peerMetadata,
         supportedProtocolVersions: [ProtocolV1],
     };
 }

package/dist/NodeWSServerAdapter.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="ws" />
 import WebSocket from "isomorphic-ws";
 import { type WebSocketServer } from "isomorphic-ws";
-import { NetworkAdapter, type PeerId, type StorageId } from "@automerge/automerge-repo";
+import { NetworkAdapter, type PeerMetadata, type PeerId } from "@automerge/automerge-repo";
 import { FromServerMessage } from "./messages.js";
 export declare class NodeWSServerAdapter extends NetworkAdapter {
     server: WebSocketServer;
@@ -9,7 +9,7 @@ export declare class NodeWSServerAdapter extends NetworkAdapter {
         [peerId: PeerId]: WebSocket;
     };
     constructor(server: WebSocketServer);
-    connect(peerId: PeerId, storageId: StorageId | undefined, isEphemeral: boolean): void;
+    connect(peerId: PeerId, peerMetadata: PeerMetadata): void;
     disconnect(): void;
     send(message: FromServerMessage): void;
     receiveMessage(message: Uint8Array, socket: WebSocket): 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,MAAM,EACX,KAAK,SAAS,EACf,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAqB,iBAAiB,EAAE,MAAM,eAAe,CAAA;AASpE,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;gBAEjC,MAAM,EAAE,eAAe;IAKnC,OAAO,CACL,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,WAAW,EAAE,OAAO;IAuDtB,UAAU;IAIV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAyB/B,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CAwEtD"}
+{"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,2BAA2B,CAAA;AAClC,OAAO,EAAqB,iBAAiB,EAAE,MAAM,eAAe,CAAA;AASpE,qBAAa,mBAAoB,SAAQ,cAAc;IACrD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAK;gBAEjC,MAAM,EAAE,eAAe;IAKnC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IAqDlD,UAAU;IAIV,IAAI,CAAC,OAAO,EAAE,iBAAiB;IAyB/B,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS;CAsEtD"}

package/dist/NodeWSServerAdapter.js

@@ -11,10 +11,9 @@ export class NodeWSServerAdapter extends NetworkAdapter {
         super();
         this.server = server;
     }
-    connect(peerId, storageId, isEphemeral) {
+    connect(peerId, peerMetadata) {
         this.peerId = peerId;
-        this.storageId = storageId;
-        this.isEphemeral = isEphemeral;
+        this.peerMetadata = peerMetadata;
         this.server.on("close", function close() {
             clearInterval(interval);
         });
@@ -94,12 +93,11 @@ export class NodeWSServerAdapter extends NetworkAdapter {
                         }
                         this.emit("peer-disconnected", { peerId: senderId });
                     }
-                    const { storageId, isEphemeral } = cbor;
+                    const { peerMetadata } = cbor;
                     // Let the rest of the system know that we have a new connection.
                     this.emit("peer-candidate", {
                         peerId: senderId,
-                        storageId,
-                        isEphemeral,
+                        peerMetadata,
                     });
                     this.sockets[senderId] = socket;
                     // In this client-server connection, there's only ever one peer: us!
@@ -119,8 +117,7 @@ export class NodeWSServerAdapter extends NetworkAdapter {
                         this.send({
                             type: "peer",
                             senderId: this.peerId,
-                            storageId: this.storageId,
-                            isEphemeral: this.isEphemeral,
+                            peerMetadata: this.peerMetadata,
                             selectedProtocolVersion: ProtocolV1,
                             targetId: senderId,
                         });

package/dist/messages.d.ts

@@ -1,4 +1,4 @@
-import type { Message, PeerId, StorageId } from "@automerge/automerge-repo";
+import type { Message, PeerId, PeerMetadata } from "@automerge/automerge-repo";
 import type { ProtocolVersion } from "./protocolVersion.js";
 /** The sender is disconnecting */
 export type LeaveMessage = {
@@ -10,11 +10,8 @@ export type JoinMessage = {
     type: "join";
     /** The PeerID of the client */
     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;
+    /** Metadata presented by the peer  */
+    peerMetadata: PeerMetadata;
     /** The protocol version the client supports */
     supportedProtocolVersions: ProtocolVersion[];
 };
@@ -23,11 +20,8 @@ export type PeerMessage = {
     type: "peer";
     /** The PeerID of the server */
     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;
+    /** Metadata presented by the peer  */
+    peerMetadata: PeerMetadata;
     /** The protocol version the server selected for this connection */
     selectedProtocolVersion: ProtocolVersion;
     /** The PeerID of the client */

package/dist/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAC3E,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,4FAA4F;IAC5F,SAAS,CAAC,EAAE,SAAS,CAAA;IAErB;8DAC0D;IAC1D,WAAW,EAAE,OAAO,CAAA;IAEpB,+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,4FAA4F;IAC5F,SAAS,CAAC,EAAE,SAAS,CAAA;IAErB;8DAC0D;IAC1D,WAAW,EAAE,OAAO,CAAA;IAEpB,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;AAKD,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"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC9E,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;AAKD,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automerge/automerge-repo-network-websocket",
-  "version": "1.1.0-alpha.1",
+  "version": "1.1.0-alpha.2",
   "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.1.0-alpha.1",
+    "@automerge/automerge-repo": "^1.1.0-alpha.2",
     "cbor-x": "^1.3.0",
     "eventemitter3": "^5.0.1",
     "isomorphic-ws": "^5.0.0",
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "11805d698f860bd6ffb3ca028d3b57e718690b5a"
+  "gitHead": "d73e71588c3835a172fdf4d19e56a1f946c041ed"
 }

package/src/BrowserWebSocketClientAdapter.ts

@@ -1,8 +1,8 @@
 import {
   NetworkAdapter,
   type PeerId,
+  type PeerMetadata,
   cbor,
-  type StorageId,
 } from "@automerge/automerge-repo"
 import WebSocket from "isomorphic-ws"
 
@@ -36,11 +36,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     this.url = url
   }
 
-  connect(
-    peerId: PeerId,
-    storageId: StorageId | undefined,
-    isEphemeral: boolean
-  ) {
+  connect(peerId: PeerId, peerMetadata: PeerMetadata) {
     // If we're reconnecting  make sure we remove the old event listeners
     // before creating a new connection.
     if (this.socket) {
@@ -50,15 +46,11 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     }
 
     if (!this.timerId) {
-      this.timerId = setInterval(
-        () => this.connect(peerId, storageId, isEphemeral),
-        5000
-      )
+      this.timerId = setInterval(() => this.connect(peerId, peerMetadata), 5000)
     }
 
     this.peerId = peerId
-    this.storageId = storageId
-    this.isEphemeral = isEphemeral
+    this.peerMetadata = peerMetadata
     this.socket = new WebSocket(this.url)
     this.socket.binaryType = "arraybuffer"
 
@@ -83,7 +75,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     log(`@ ${this.url}: open`)
     clearInterval(this.timerId)
     this.timerId = undefined
-    this.send(joinMessage(this.peerId!, this.storageId, this.isEphemeral))
+    this.send(joinMessage(this.peerId!, this.peerMetadata!))
   }
 
   // When a socket closes, or disconnects, remove it from the array.
@@ -96,7 +88,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
 
     if (!this.timerId) {
       if (this.peerId) {
-        this.connect(this.peerId, this.storageId, this.isEphemeral)
+        this.connect(this.peerId, this.peerMetadata!)
       }
     }
   }
@@ -110,7 +102,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
       throw new Error("WTF, get a socket")
     }
     if (this.socket.readyState === WebSocket.OPEN) {
-      this.send(joinMessage(this.peerId!, this.storageId, this.isEphemeral))
+      this.send(joinMessage(this.peerId!, this.peerMetadata!))
     } else {
       // The onOpen handler automatically sends a join message
     }
@@ -147,11 +139,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
     this.socket?.send(arrayBuf)
   }
 
-  announceConnection(
-    peerId: PeerId,
-    storageId: StorageId | undefined,
-    isEphemeral: boolean
-  ) {
+  announceConnection(peerId: PeerId, peerMetadata: PeerMetadata) {
     // return a peer object
     const myPeerId = this.peerId
     if (!myPeerId) {
@@ -162,7 +150,7 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
       this.emit("ready", { network: this })
     }
     this.remotePeerId = peerId
-    this.emit("peer-candidate", { peerId, storageId, isEphemeral })
+    this.emit("peer-candidate", { peerId, peerMetadata })
   }
 
   receiveMessage(message: Uint8Array) {
@@ -181,9 +169,9 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
 
     switch (type) {
       case "peer": {
-        const { storageId, isEphemeral } = decoded
+        const { peerMetadata } = decoded
         log(`peer: ${senderId}`)
-        this.announceConnection(senderId, storageId, isEphemeral)
+        this.announceConnection(senderId, peerMetadata)
         break
       }
       case "error":
@@ -197,14 +185,12 @@ export class BrowserWebSocketClientAdapter extends WebSocketNetworkAdapter {
 
 function joinMessage(
   senderId: PeerId,
-  storageId: StorageId | undefined,
-  isEphemeral: boolean
+  peerMetadata: PeerMetadata
 ): JoinMessage {
   return {
     type: "join",
     senderId,
-    storageId,
-    isEphemeral,
+    peerMetadata,
     supportedProtocolVersions: [ProtocolV1],
   }
 }

package/src/NodeWSServerAdapter.ts

@@ -7,8 +7,8 @@ const log = debug("WebsocketServer")
 import {
   cbor as cborHelpers,
   NetworkAdapter,
+  type PeerMetadata,
   type PeerId,
-  type StorageId,
 } from "@automerge/automerge-repo"
 import { FromClientMessage, FromServerMessage } from "./messages.js"
 import { ProtocolV1, ProtocolVersion } from "./protocolVersion.js"
@@ -28,14 +28,9 @@ export class NodeWSServerAdapter extends NetworkAdapter {
     this.server = server
   }
 
-  connect(
-    peerId: PeerId,
-    storageId: StorageId | undefined,
-    isEphemeral: boolean
-  ) {
+  connect(peerId: PeerId, peerMetadata: PeerMetadata) {
     this.peerId = peerId
-    this.storageId = storageId
-    this.isEphemeral = isEphemeral
+    this.peerMetadata = peerMetadata
 
     this.server.on("close", function close() {
       clearInterval(interval)
@@ -140,12 +135,11 @@ export class NodeWSServerAdapter extends NetworkAdapter {
             this.emit("peer-disconnected", { peerId: senderId })
           }
 
-          const { storageId, isEphemeral } = cbor
+          const { peerMetadata } = cbor
           // Let the rest of the system know that we have a new connection.
           this.emit("peer-candidate", {
             peerId: senderId,
-            storageId,
-            isEphemeral,
+            peerMetadata,
           })
           this.sockets[senderId] = socket
 
@@ -167,8 +161,7 @@ export class NodeWSServerAdapter extends NetworkAdapter {
             this.send({
               type: "peer",
               senderId: this.peerId!,
-              storageId: this.storageId,
-              isEphemeral: this.isEphemeral,
+              peerMetadata: this.peerMetadata!,
               selectedProtocolVersion: ProtocolV1,
               targetId: senderId,
             })

package/src/messages.ts

@@ -1,4 +1,4 @@
-import type { Message, PeerId, StorageId } from "@automerge/automerge-repo"
+import type { Message, PeerId, PeerMetadata } from "@automerge/automerge-repo"
 import type { ProtocolVersion } from "./protocolVersion.js"
 
 /** The sender is disconnecting */
@@ -13,12 +13,8 @@ export type JoinMessage = {
   /** The PeerID of the client */
   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
+  /** Metadata presented by the peer  */
+  peerMetadata: PeerMetadata
 
   /** The protocol version the client supports */
   supportedProtocolVersions: ProtocolVersion[]
@@ -30,12 +26,8 @@ export type PeerMessage = {
   /** The PeerID of the server */
   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
+  /** Metadata presented by the peer  */
+  peerMetadata: PeerMetadata
 
   /** The protocol version the server selected for this connection */
   selectedProtocolVersion: ProtocolVersion

package/test/Websocket.test.ts

@@ -80,8 +80,7 @@ describe("Websocket adapters", () => {
       assert.deepEqual(message, {
         type: "join",
         senderId: "browser",
-        storageId: undefined,
-        isEphemeral: true,
+        peerMetadata: { storageId: undefined, isEphemeral: true },
         supportedProtocolVersions: ["1"],
       })
     })
@@ -185,8 +184,7 @@ describe("Websocket adapters", () => {
       assert.deepEqual(response, {
         type: "peer",
         senderId: "server",
-        storageId: undefined,
-        isEphemeral: true,
+        peerMetadata: { storageId: undefined, isEphemeral: true },
         targetId: "browser",
         selectedProtocolVersion: "1",
       })
@@ -214,8 +212,7 @@ describe("Websocket adapters", () => {
       assert.deepEqual(response, {
         type: "peer",
         senderId: "server",
-        storageId: undefined,
-        isEphemeral: true,
+        peerMetadata: { storageId: undefined, isEphemeral: true },
         targetId: "browser",
         selectedProtocolVersion: "1",
       })