@dxos/messaging 0.6.8-main.046e6cf → 0.6.8-staging.63bcb81

package/dist/lib/browser/index.mjs

@@ -44,9 +44,9 @@ var Messenger = class {
   constructor({ signalManager, retryDelay = 300 }) {
     this._monitor = new MessengerMonitor();
     // { peerId, payloadType } => listeners set
-    this._listeners = new ComplexMap(({ peerId, payloadType }) => peerId.toHex() + payloadType);
+    this._listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
     // peerId => listeners set
-    this._defaultListeners = new ComplexMap(PublicKey.hash);
+    this._defaultListeners = /* @__PURE__ */ new Map();
     this._onAckCallbacks = new ComplexMap(PublicKey.hash);
     this._receivedMessages = new ComplexSet(PublicKey.hash);
     /**
@@ -214,7 +214,7 @@ var Messenger = class {
   * Subscribes onMessage function to messages that contains payload with payloadType.
   * @param payloadType if not specified, onMessage will be subscribed to all types of messages.
   */
-  async listen({ peerId, payloadType, onMessage }) {
+  async listen({ peer, payloadType, onMessage }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
       L: 177,
@@ -224,23 +224,32 @@ var Messenger = class {
         "'Closed'"
       ]
     });
-    await this._signalManager.subscribeMessages(peerId);
+    await this._signalManager.subscribeMessages(peer);
     let listeners;
+    invariant(peer.peerKey, "Peer key is required", {
+      F: __dxlog_file,
+      L: 181,
+      S: this,
+      A: [
+        "peer.peerKey",
+        "'Peer key is required'"
+      ]
+    });
     if (!payloadType) {
-      listeners = this._defaultListeners.get(peerId);
+      listeners = this._defaultListeners.get(peer.peerKey);
       if (!listeners) {
         listeners = /* @__PURE__ */ new Set();
-        this._defaultListeners.set(peerId, listeners);
+        this._defaultListeners.set(peer.peerKey, listeners);
       }
     } else {
       listeners = this._listeners.get({
-        peerId,
+        peerId: peer.peerKey,
         payloadType
       });
       if (!listeners) {
         listeners = /* @__PURE__ */ new Set();
         this._listeners.set({
-          peerId,
+          peerId: peer.peerKey,
           payloadType
         }, listeners);
       }
@@ -281,7 +290,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
       F: __dxlog_file,
-      L: 238,
+      L: 239,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -295,7 +304,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 241,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -322,7 +331,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 269,
+      L: 270,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
@@ -338,7 +347,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 282,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -355,7 +364,16 @@ var Messenger = class {
   }
   async _callListeners(message) {
     {
-      const defaultListenerMap = this._defaultListeners.get(message.recipient);
+      invariant(message.recipient.peerKey, "Peer key is required", {
+        F: __dxlog_file,
+        L: 297,
+        S: this,
+        A: [
+          "message.recipient.peerKey",
+          "'Peer key is required'"
+        ]
+      });
+      const defaultListenerMap = this._defaultListeners.get(message.recipient.peerKey);
       if (defaultListenerMap) {
         for (const listener of defaultListenerMap) {
           await listener(message);
@@ -364,7 +382,7 @@ var Messenger = class {
     }
     {
       const listenerMap = this._listeners.get({
-        peerId: message.recipient,
+        peerId: message.recipient.peerKey,
         payloadType: message.payload.type_url
       });
       if (listenerMap) {
@@ -389,7 +407,7 @@ var Messenger = class {
         elapsed
       }, {
         F: __dxlog_file,
-        L: 330,
+        L: 332,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -497,11 +515,11 @@ var SignalClientMonitor = class {
   }
 };
 var getByteCount = (message) => {
-  return message.author.asUint8Array().byteLength + message.recipient.asUint8Array().byteLength + message.payload.type_url.length + message.payload.value.length;
+  return message.author.peerKey.length + message.recipient.peerKey.length + message.payload.type_url.length + message.payload.value.length;
 };
 var createIdentityTags = (message) => {
   return {
-    peer: message.author.toHex()
+    peer: message.author.peerKey
   };
 };
 
@@ -565,7 +583,7 @@ var SignalLocalState = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 76,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -617,14 +635,28 @@ var SignalLocalState = class {
             swarmEvent
           }, {
             F: __dxlog_file2,
-            L: 112,
+            L: 115,
             S: this,
             C: (f, a) => f(...a)
           });
-          await this._onSwarmEvent({
+          const event = swarmEvent.peerAvailable ? {
             topic,
-            swarmEvent
-          });
+            peerAvailable: {
+              ...swarmEvent.peerAvailable,
+              peer: {
+                peerKey: PublicKey2.from(swarmEvent.peerAvailable.peer).toHex()
+              }
+            }
+          } : {
+            topic,
+            peerLeft: {
+              ...swarmEvent.peerLeft,
+              peer: {
+                peerKey: PublicKey2.from(swarmEvent.peerLeft.peer).toHex()
+              }
+            }
+          };
+          await this._onSwarmEvent(event);
         }
       });
       this._swarmStreams.set({
@@ -653,8 +685,12 @@ var SignalLocalState = class {
           peerId
         })) {
           const message = {
-            author: PublicKey2.from(signalMessage.author),
-            recipient: PublicKey2.from(signalMessage.recipient),
+            author: {
+              peerKey: PublicKey2.from(signalMessage.author).toHex()
+            },
+            recipient: {
+              peerKey: PublicKey2.from(signalMessage.recipient).toHex()
+            },
             payload: signalMessage.payload
           };
           await this._onMessage(message);
@@ -967,7 +1003,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 86,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -985,7 +1021,7 @@ var SignalClient = class extends Resource {
         }));
         invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file4,
-          L: 96,
+          L: 102,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1028,7 +1064,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 129,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1040,7 +1076,7 @@ var SignalClient = class extends Resource {
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
       log4.warn("SignalClient error:", err, {
         F: __dxlog_file4,
-        L: 138,
+        L: 144,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1050,7 +1086,7 @@ var SignalClient = class extends Resource {
   async _close() {
     log4("closing...", void 0, {
       F: __dxlog_file4,
-      L: 144,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1063,7 +1099,7 @@ var SignalClient = class extends Resource {
     await this._safeResetClient();
     log4("closed", void 0, {
       F: __dxlog_file4,
-      L: 152,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1080,67 +1116,113 @@ var SignalClient = class extends Resource {
   async join(args) {
     log4("joining", {
       topic: args.topic,
-      peerId: args.peerId
+      peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 166,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
     this._monitor.recordJoin();
-    this.localState.join(args);
+    this.localState.join({
+      topic: args.topic,
+      peerId: PublicKey4.from(args.peer.peerKey)
+    });
     this._reconcileTask?.schedule();
   }
   async leave(args) {
     log4("leaving", {
       topic: args.topic,
-      peerId: args.peerId
+      peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 173,
+      L: 179,
       S: this,
       C: (f, a) => f(...a)
     });
     this._monitor.recordLeave();
-    this.localState.leave(args);
+    this.localState.leave({
+      topic: args.topic,
+      peerId: PublicKey4.from(args.peer.peerKey)
+    });
   }
   async sendMessage(msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
       invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
         F: __dxlog_file4,
-        L: 181,
+        L: 187,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
           "'Not connected to Signal Server'"
         ]
       });
-      await this._client.sendMessage(msg);
+      invariant3(msg.author.peerKey, "Author key required", {
+        F: __dxlog_file4,
+        L: 188,
+        S: this,
+        A: [
+          "msg.author.peerKey",
+          "'Author key required'"
+        ]
+      });
+      invariant3(msg.recipient.peerKey, "Recipient key required", {
+        F: __dxlog_file4,
+        L: 189,
+        S: this,
+        A: [
+          "msg.recipient.peerKey",
+          "'Recipient key required'"
+        ]
+      });
+      await this._client.sendMessage({
+        author: PublicKey4.from(msg.author.peerKey),
+        recipient: PublicKey4.from(msg.recipient.peerKey),
+        payload: msg.payload
+      });
     });
   }
-  async subscribeMessages(peerId) {
+  async subscribeMessages(peer) {
+    invariant3(peer.peerKey, "Peer key required", {
+      F: __dxlog_file4,
+      L: 199,
+      S: this,
+      A: [
+        "peer.peerKey",
+        "'Peer key required'"
+      ]
+    });
     log4("subscribing to messages", {
-      peerId
+      peer
     }, {
       F: __dxlog_file4,
-      L: 187,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.subscribeMessages(peerId);
+    this.localState.subscribeMessages(PublicKey4.from(peer.peerKey));
     this._reconcileTask?.schedule();
   }
-  async unsubscribeMessages(peerId) {
+  async unsubscribeMessages(peer) {
+    invariant3(peer.peerKey, "Peer key required", {
+      F: __dxlog_file4,
+      L: 206,
+      S: this,
+      A: [
+        "peer.peerKey",
+        "'Peer key required'"
+      ]
+    });
     log4("unsubscribing from messages", {
-      peerId
+      peer
     }, {
       F: __dxlog_file4,
-      L: 193,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.unsubscribeMessages(peerId);
+    this.localState.unsubscribeMessages(PublicKey4.from(peer.peerKey));
   }
   _scheduleReconcileAfterError() {
     scheduleTask2(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
@@ -1151,13 +1233,13 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 202,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file4,
-      L: 203,
+      L: 217,
       S: this,
       A: [
         "!this._client",
@@ -1169,7 +1251,7 @@ var SignalClient = class extends Resource {
     this._connectionCtx.onDispose(async () => {
       log4("connection context disposed", void 0, {
         F: __dxlog_file4,
-        L: 210,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1184,7 +1266,7 @@ var SignalClient = class extends Resource {
             if (client === this._client) {
               log4("socket connected", void 0, {
                 F: __dxlog_file4,
-                L: 221,
+                L: 235,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1199,7 +1281,7 @@ var SignalClient = class extends Resource {
               state: this._state
             }, {
               F: __dxlog_file4,
-              L: 230,
+              L: 244,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1216,7 +1298,7 @@ var SignalClient = class extends Resource {
                 state: this._state
               }, {
                 F: __dxlog_file4,
-                L: 242,
+                L: 256,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1241,14 +1323,14 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 257,
+      L: 271,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === SignalState.RECONNECTING) {
       log4.info("Signal api already reconnecting.", void 0, {
         F: __dxlog_file4,
-        L: 260,
+        L: 274,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1290,7 +1372,7 @@ var SignalClient = class extends Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file4,
-      L: 301,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1320,6 +1402,11 @@ import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
+
+// packages/core/mesh/messaging/src/signal-methods.ts
+var PeerInfoHash = ({ peerKey }) => peerKey;
+
+// packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
   constructor() {
@@ -1328,7 +1415,7 @@ var MemorySignalManagerContext = class {
     // Mapping from topic to set of peers.
     this.swarms = new ComplexMap3(PublicKey5.hash);
     // Map of connections for each peer for signaling.
-    this.connections = new ComplexMap3(PublicKey5.hash);
+    this.connections = new ComplexMap3(PeerInfoHash);
   }
 };
 var MemorySignalManager = class {
@@ -1337,11 +1424,11 @@ var MemorySignalManager = class {
     this.statusChanged = new Event3();
     this.swarmEvent = new Event3();
     this.onMessage = new Event3();
-    this._joinedSwarms = new ComplexSet3(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+    this._joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
     this._freezeTrigger = new Trigger3().wake();
     this._ctx = new Context3(void 0, {
       F: __dxlog_file5,
-      L: 62
+      L: 51
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
   }
@@ -1351,7 +1438,7 @@ var MemorySignalManager = class {
     }
     this._ctx = new Context3(void 0, {
       F: __dxlog_file5,
-      L: 71
+      L: 60
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
     await Promise.all([
@@ -1362,7 +1449,7 @@ var MemorySignalManager = class {
     if (this._ctx.disposed) {
       return;
     }
-    const joinedSwarmsCopy = new ComplexSet3(({ topic, peerId }) => topic.toHex() + peerId.toHex(), [
+    const joinedSwarmsCopy = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey, [
       ...this._joinedSwarms.values()
     ]);
     await Promise.all([
@@ -1374,10 +1461,10 @@ var MemorySignalManager = class {
   getStatus() {
     return [];
   }
-  async join({ topic, peerId }) {
+  async join({ topic, peer }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 100,
+      L: 89,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1386,39 +1473,35 @@ var MemorySignalManager = class {
     });
     this._joinedSwarms.add({
       topic,
-      peerId
+      peer
     });
     if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new ComplexSet3(PublicKey5.hash));
+      this._context.swarms.set(topic, new ComplexSet3(PeerInfoHash));
     }
-    this._context.swarms.get(topic).add(peerId);
+    this._context.swarms.get(topic).add(peer);
     this._context.swarmEvent.emit({
       topic,
-      swarmEvent: {
-        peerAvailable: {
-          peer: peerId.asUint8Array(),
-          since: /* @__PURE__ */ new Date()
-        }
+      peerAvailable: {
+        peer,
+        since: /* @__PURE__ */ new Date()
       }
     });
-    for (const [topic2, peerIds] of this._context.swarms) {
-      Array.from(peerIds).forEach((peerId2) => {
+    for (const [topic2, peers] of this._context.swarms) {
+      Array.from(peers).forEach((peer2) => {
         this.swarmEvent.emit({
           topic: topic2,
-          swarmEvent: {
-            peerAvailable: {
-              peer: peerId2.asUint8Array(),
-              since: /* @__PURE__ */ new Date()
-            }
+          peerAvailable: {
+            peer: peer2,
+            since: /* @__PURE__ */ new Date()
           }
         });
       });
     }
   }
-  async leave({ topic, peerId }) {
+  async leave({ topic, peer }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 136,
+      L: 121,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1427,21 +1510,19 @@ var MemorySignalManager = class {
     });
     this._joinedSwarms.delete({
       topic,
-      peerId
+      peer
     });
     if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new ComplexSet3(PublicKey5.hash));
+      this._context.swarms.set(topic, new ComplexSet3(PeerInfoHash));
     }
-    this._context.swarms.get(topic).delete(peerId);
+    this._context.swarms.get(topic).delete(peer);
     const swarmEvent = {
+      topic,
       peerLeft: {
-        peer: peerId.asUint8Array()
+        peer
       }
     };
-    this._context.swarmEvent.emit({
-      topic,
-      swarmEvent
-    });
+    this._context.swarmEvent.emit(swarmEvent);
   }
   async sendMessage({ author, recipient, payload }) {
     log5("send message", {
@@ -1450,13 +1531,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file5,
-      L: 156,
+      L: 142,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant4(recipient, void 0, {
       F: __dxlog_file5,
-      L: 158,
+      L: 144,
       S: this,
       A: [
         "recipient",
@@ -1465,7 +1546,7 @@ var MemorySignalManager = class {
     });
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 159,
+      L: 145,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1480,7 +1561,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 165,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1492,7 +1573,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 170,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1505,7 +1586,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file5,
-          L: 178,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1517,7 +1598,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file5,
-        L: 182,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1531,33 +1612,33 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file5,
-        L: 187,
+        L: 173,
         S: this,
         C: (f, a) => f(...a)
       });
     });
   }
-  async subscribeMessages(peerId) {
+  async subscribeMessages(peerInfo) {
     log5("subscribing", {
-      peerId
+      peerInfo
     }, {
       F: __dxlog_file5,
-      L: 192,
+      L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._context.connections.set(peerId, this);
+    this._context.connections.set(peerInfo, this);
   }
-  async unsubscribeMessages(peerId) {
+  async unsubscribeMessages(peerInfo) {
     log5("unsubscribing", {
-      peerId
+      peerInfo
     }, {
       F: __dxlog_file5,
-      L: 197,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._context.connections.delete(peerId);
+    this._context.connections.delete(peerInfo);
   }
   freeze() {
     this._freezeTrigger.reset();
@@ -1582,7 +1663,7 @@ var dec = (payload) => {
 
 // packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts
 import { Event as Event4, sleep as sleep2, synchronized } from "@dxos/async";
-import { Context as Context4 } from "@dxos/context";
+import { LifecycleState, Resource as Resource2 } from "@dxos/context";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
@@ -1619,13 +1700,13 @@ function _ts_decorate(decorators, target, key, desc) {
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
 var MAX_SERVER_FAILURES = 5;
 var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
-var WebsocketSignalManager = class {
+var WebsocketSignalManager = class extends Resource2 {
   constructor(_hosts, _getMetadata) {
+    super();
     this._hosts = _hosts;
     this._getMetadata = _getMetadata;
     this._servers = /* @__PURE__ */ new Map();
     this._monitor = new WebsocketSignalManagerMonitor();
-    this._opened = false;
     this.failureCount = /* @__PURE__ */ new Map();
     this.statusChanged = new Event4();
     this.swarmEvent = new Event4();
@@ -1635,7 +1716,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 58,
+      L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1652,15 +1733,12 @@ var WebsocketSignalManager = class {
     }
     this._failedServersBitfield = BitField.zeros(this._hosts.length);
   }
-  async open() {
-    if (this._opened) {
-      return;
-    }
+  async _open() {
     log6("open signal manager", {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 82,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1668,28 +1746,21 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 83,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._initContext();
     await safeAwaitAll2(this._servers.values(), (server) => server.open());
-    this._opened = true;
     log6.trace("dxos.mesh.websocket-signal-manager.open", trace8.end({
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 90,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
-    if (!this._opened) {
-      return;
-    }
-    this._opened = false;
-    await this._ctx.dispose();
+  async _close() {
     await safeAwaitAll2(this._servers.values(), (server) => server.close());
   }
   async restartServer(serverName) {
@@ -1697,23 +1768,23 @@ var WebsocketSignalManager = class {
       serverName
     }, {
       F: __dxlog_file6,
-      L: 104,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "server already closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 105,
+      L: 88,
       S: this,
       A: [
-        "this._opened",
-        "'server already closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file6,
-      L: 108,
+      L: 91,
       S: this,
       A: [
         "server",
@@ -1727,52 +1798,52 @@ var WebsocketSignalManager = class {
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
-  async join({ topic, peerId }) {
+  async join({ topic, peer }) {
     log6("join", {
       topic,
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 121,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "Closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 122,
+      L: 105,
       S: this,
       A: [
-        "this._opened",
-        "'Closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
     await this._forEachServer((server) => server.join({
       topic,
-      peerId
+      peer
     }));
   }
-  async leave({ topic, peerId }) {
+  async leave({ topic, peer }) {
     log6("leaving", {
       topic,
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 128,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "Closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 129,
+      L: 112,
       S: this,
       A: [
-        "this._opened",
-        "'Closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
     await this._forEachServer((server) => server.leave({
       topic,
-      peerId
+      peer
     }));
   }
   async sendMessage({ author, recipient, payload }) {
@@ -1780,17 +1851,17 @@ var WebsocketSignalManager = class {
       recipient
     }, {
       F: __dxlog_file6,
-      L: 142,
+      L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "Closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 143,
+      L: 118,
       S: this,
       A: [
-        "this._opened",
-        "'Closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
     void this._forEachServer(async (server, serverName, index) => {
@@ -1804,7 +1875,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 151,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1814,7 +1885,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 154,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1824,7 +1895,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 157,
+            L: 132,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1847,7 +1918,7 @@ var WebsocketSignalManager = class {
           failureCount
         }, {
           F: __dxlog_file6,
-          L: 171,
+          L: 146,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1865,7 +1936,7 @@ var WebsocketSignalManager = class {
         serverName
       }, {
         F: __dxlog_file6,
-        L: 184,
+        L: 159,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1873,69 +1944,50 @@ var WebsocketSignalManager = class {
       this.failureCount.set(serverName, 0);
     }
   }
-  async subscribeMessages(peerId) {
+  async subscribeMessages(peer) {
     log6("subscribed for message stream", {
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 191,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "Closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 192,
+      L: 167,
       S: this,
       A: [
-        "this._opened",
-        "'Closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
-    await this._forEachServer(async (server) => server.subscribeMessages(peerId));
+    await this._forEachServer(async (server) => server.subscribeMessages(peer));
   }
-  async unsubscribeMessages(peerId) {
+  async unsubscribeMessages(peer) {
     log6("subscribed for message stream", {
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 198,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._opened, "Closed", {
+    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 199,
+      L: 174,
       S: this,
       A: [
-        "this._opened",
-        "'Closed'"
+        "this._lifecycleState === LifecycleState.OPEN",
+        ""
       ]
     });
-    await this._forEachServer(async (server) => server.unsubscribeMessages(peerId));
-  }
-  _initContext() {
-    this._ctx = new Context4({
-      onError: (err) => log6.catch(err, void 0, {
-        F: __dxlog_file6,
-        L: 206,
-        S: this,
-        C: (f, a) => f(...a)
-      })
-    }, {
-      F: __dxlog_file6,
-      L: 205
-    });
+    await this._forEachServer(async (server) => server.unsubscribeMessages(peer));
   }
   async _forEachServer(fn) {
     return Promise.all(Array.from(this._servers.entries()).map(([serverName, server], idx) => fn(server, serverName, idx)));
   }
 };
-_ts_decorate([
-  synchronized
-], WebsocketSignalManager.prototype, "open", null);
-_ts_decorate([
-  synchronized
-], WebsocketSignalManager.prototype, "close", null);
 _ts_decorate([
   synchronized
 ], WebsocketSignalManager.prototype, "join", null);
@@ -1946,18 +1998,231 @@ _ts_decorate([
   synchronized
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
 
-// packages/core/mesh/messaging/src/signal-manager/utils.ts
+// packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts
+import { AnySchema } from "@bufbuild/protobuf/wkt";
+import { Event as Event5 } from "@dxos/async";
+import { Resource as Resource3 } from "@dxos/context";
+import { protocol } from "@dxos/edge-client";
 import { invariant as invariant6 } from "@dxos/invariant";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
+import { EdgeService } from "@dxos/protocols";
+import { SwarmRequestSchema, SwarmRequest_Action as SwarmRequestAction, SwarmResponseSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet4 } from "@dxos/util";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
+var EdgeSignalManager = class extends Resource3 {
+  constructor({ edgeConnection }) {
+    super();
+    this.swarmEvent = new Event5();
+    this.onMessage = new Event5();
+    /**
+    * swarm key -> peerKeys in the swarm
+    */
+    // TODO(mykola): This class should not contain swarm state. Temporary before network-manager API changes to accept list of peers.
+    this._swarmPeers = new ComplexMap4(PublicKey7.hash);
+    this._edgeConnection = edgeConnection;
+  }
+  async _open() {
+    this._ctx.onDispose(this._edgeConnection.addListener((message) => this._onMessage(message)));
+  }
+  /**
+  * Warning: PeerInfo is inferred from edgeConnection.
+  */
+  async join({ topic, peer }) {
+    if (!this._matchSelfPeerInfo(peer)) {
+      log7.warn("ignoring peer info on join request", {
+        peer,
+        expected: {
+          peerKey: this._edgeConnection.deviceKey.toHex(),
+          identityKey: this._edgeConnection.identityKey.toHex()
+        }
+      }, {
+        F: __dxlog_file7,
+        L: 51,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    this._swarmPeers.set(topic, new ComplexSet4(PeerInfoHash));
+    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+      serviceId: EdgeService.SWARM_SERVICE_ID,
+      payload: {
+        action: SwarmRequestAction.JOIN,
+        swarmKeys: [
+          topic.toHex()
+        ]
+      }
+    }));
+  }
+  async leave({ topic, peer }) {
+    this._swarmPeers.delete(topic);
+    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+      serviceId: EdgeService.SWARM_SERVICE_ID,
+      payload: {
+        action: SwarmRequestAction.LEAVE,
+        swarmKeys: [
+          topic.toHex()
+        ]
+      }
+    }));
+  }
+  async sendMessage(message) {
+    if (!this._matchSelfPeerInfo(message.author)) {
+      log7.warn("ignoring author on send request", {
+        author: message.author,
+        expected: {
+          peerKey: this._edgeConnection.deviceKey,
+          identityKey: this._edgeConnection.identityKey
+        }
+      }, {
+        F: __dxlog_file7,
+        L: 82,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    await this._edgeConnection.send(protocol.createMessage(AnySchema, {
+      serviceId: EdgeService.SIGNAL_SERVICE_ID,
+      source: message.author,
+      target: [
+        message.recipient
+      ],
+      payload: {
+        typeUrl: message.payload.type_url,
+        value: message.payload.value
+      }
+    }));
+  }
+  async subscribeMessages(peerInfo) {
+  }
+  async unsubscribeMessages(peerInfo) {
+  }
+  _onMessage(message) {
+    switch (message.serviceId) {
+      case EdgeService.SWARM_SERVICE_ID: {
+        this._processSwarmResponse(message);
+        break;
+      }
+      case EdgeService.SIGNAL_SERVICE_ID: {
+        this._processMessage(message);
+      }
+    }
+  }
+  _processSwarmResponse(message) {
+    invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
+      F: __dxlog_file7,
+      L: 119,
+      S: this,
+      A: [
+        "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
+        "'Wrong payload type'"
+      ]
+    });
+    const payload = protocol.getPayload(message, SwarmResponseSchema);
+    const topic = PublicKey7.from(payload.swarmKey);
+    if (!this._swarmPeers.has(topic)) {
+      log7.warn("Received message from wrong topic", {
+        topic
+      }, {
+        F: __dxlog_file7,
+        L: 123,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    const oldPeers = this._swarmPeers.get(topic);
+    const timestamp = new Date(Date.parse(message.timestamp));
+    const newPeers = new ComplexSet4(PeerInfoHash, payload.peers);
+    for (const peer of newPeers) {
+      if (oldPeers.has(peer)) {
+        continue;
+      }
+      this.swarmEvent.emit({
+        topic,
+        peerAvailable: {
+          peer,
+          since: timestamp
+        }
+      });
+    }
+    for (const peer of oldPeers) {
+      if (newPeers.has(peer)) {
+        continue;
+      }
+      this.swarmEvent.emit({
+        topic,
+        peerLeft: {
+          peer
+        }
+      });
+    }
+    this._swarmPeers.set(topic, newPeers);
+  }
+  _processMessage(message) {
+    invariant6(protocol.getPayloadType(message) === AnySchema.typeName, "Wrong payload type", {
+      F: __dxlog_file7,
+      L: 156,
+      S: this,
+      A: [
+        "protocol.getPayloadType(message) === AnySchema.typeName",
+        "'Wrong payload type'"
+      ]
+    });
+    const payload = protocol.getPayload(message, AnySchema);
+    invariant6(message.source, "source is missing", {
+      F: __dxlog_file7,
+      L: 158,
+      S: this,
+      A: [
+        "message.source",
+        "'source is missing'"
+      ]
+    });
+    invariant6(message.target, "target is missing", {
+      F: __dxlog_file7,
+      L: 159,
+      S: this,
+      A: [
+        "message.target",
+        "'target is missing'"
+      ]
+    });
+    invariant6(message.target.length === 1, "target should have exactly one item", {
+      F: __dxlog_file7,
+      L: 160,
+      S: this,
+      A: [
+        "message.target.length === 1",
+        "'target should have exactly one item'"
+      ]
+    });
+    this.onMessage.emit({
+      author: message.source,
+      recipient: message.target[0],
+      payload: {
+        type_url: payload.typeUrl,
+        value: payload.value
+      }
+    });
+  }
+  _matchSelfPeerInfo(peer) {
+    return peer && (peer.peerKey === this._edgeConnection.deviceKey.toHex() || peer.identityKey === this._edgeConnection.identityKey.toHex());
+  }
+};
+
+// packages/core/mesh/messaging/src/signal-manager/utils.ts
+import { invariant as invariant7 } from "@dxos/invariant";
+import { log as log8 } from "@dxos/log";
 import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
 var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   identityService.queryIdentity().subscribe((idqr) => {
     if (!idqr?.identity?.identityKey) {
-      log7("empty response from identity service", {
+      log8("empty response from identity service", {
         idqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 21,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1968,18 +2233,18 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   });
   devicesService.queryDevices().subscribe((dqr) => {
     if (!dqr || !dqr.devices || dqr.devices.length === 0) {
-      log7("empty response from device service", {
+      log8("empty response from device service", {
         device: dqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 30,
         S: void 0,
         C: (f, a) => f(...a)
       });
       return;
     }
-    invariant6(dqr, "empty response from device service", {
-      F: __dxlog_file7,
+    invariant7(dqr, "empty response from device service", {
+      F: __dxlog_file8,
       L: 33,
       S: void 0,
       A: [
@@ -1989,10 +2254,10 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     });
     const thisDevice = dqr.devices.find((device) => device.kind === DeviceKind.CURRENT);
     if (!thisDevice) {
-      log7("no current device", {
+      log8("no current device", {
         device: dqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2003,9 +2268,11 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   });
 };
 export {
+  EdgeSignalManager,
   MemorySignalManager,
   MemorySignalManagerContext,
   Messenger,
+  PeerInfoHash,
   SignalClient,
   WebsocketSignalManager,
   setIdentityTags