@dxos/messaging 0.6.8-main.3be982f → 0.6.8-staging.77f93a3

package/dist/lib/node/index.cjs

@@ -28,9 +28,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
+  EdgeSignalManager: () => EdgeSignalManager,
   MemorySignalManager: () => MemorySignalManager,
   MemorySignalManagerContext: () => MemorySignalManagerContext,
   Messenger: () => Messenger,
+  PeerInfoHash: () => PeerInfoHash,
   SignalClient: () => SignalClient,
   WebsocketSignalManager: () => WebsocketSignalManager,
   setIdentityTags: () => setIdentityTags
@@ -81,8 +83,18 @@ var import_log6 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
 var import_util4 = require("@dxos/util");
 var import_tracing4 = require("@dxos/tracing");
+var import_wkt = require("@bufbuild/protobuf/wkt");
+var import_async7 = require("@dxos/async");
+var import_context7 = require("@dxos/context");
+var import_edge_client = require("@dxos/edge-client");
 var import_invariant6 = require("@dxos/invariant");
+var import_keys7 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
+var import_protocols6 = require("@dxos/protocols");
+var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
+var import_util5 = require("@dxos/util");
+var import_invariant7 = require("@dxos/invariant");
+var import_log8 = require("@dxos/log");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var MessengerMonitor = class {
   recordMessageAckFailed() {
@@ -105,8 +117,8 @@ var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
 var Messenger = class {
   constructor({ signalManager, retryDelay = 300 }) {
     this._monitor = new MessengerMonitor();
-    this._listeners = new import_util.ComplexMap(({ peerId, payloadType }) => peerId.toHex() + payloadType);
-    this._defaultListeners = new import_util.ComplexMap(import_keys.PublicKey.hash);
+    this._listeners = new import_util.ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
+    this._defaultListeners = /* @__PURE__ */ new Map();
     this._onAckCallbacks = new import_util.ComplexMap(import_keys.PublicKey.hash);
     this._receivedMessages = new import_util.ComplexSet(import_keys.PublicKey.hash);
     this._toClear = new import_util.ComplexSet(import_keys.PublicKey.hash);
@@ -271,7 +283,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 }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
       L: 177,
@@ -281,23 +293,32 @@ var Messenger = class {
         "'Closed'"
       ]
     });
-    await this._signalManager.subscribeMessages(peerId);
+    await this._signalManager.subscribeMessages(peer);
     let listeners;
+    (0, import_invariant.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);
       }
@@ -338,7 +359,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     (0, import_invariant.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'",
@@ -352,7 +373,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 241,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -379,7 +400,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     (0, import_invariant.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'",
@@ -395,7 +416,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 282,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -412,7 +433,16 @@ var Messenger = class {
   }
   async _callListeners(message) {
     {
-      const defaultListenerMap = this._defaultListeners.get(message.recipient);
+      (0, import_invariant.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);
@@ -421,7 +451,7 @@ var Messenger = class {
     }
     {
       const listenerMap = this._listeners.get({
-        peerId: message.recipient,
+        peerId: message.recipient.peerKey,
         payloadType: message.payload.type_url
       });
       if (listenerMap) {
@@ -446,7 +476,7 @@ var Messenger = class {
         elapsed
       }, {
         F: __dxlog_file,
-        L: 330,
+        L: 332,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -536,11 +566,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
   };
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
@@ -597,7 +627,7 @@ var SignalLocalState = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 76,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -649,14 +679,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: import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer).toHex()
+              }
+            }
+          } : {
+            topic,
+            peerLeft: {
+              ...swarmEvent.peerLeft,
+              peer: {
+                peerKey: import_keys3.PublicKey.from(swarmEvent.peerLeft.peer).toHex()
+              }
+            }
+          };
+          await this._onSwarmEvent(event);
         }
       });
       this._swarmStreams.set({
@@ -685,8 +729,12 @@ var SignalLocalState = class {
           peerId
         })) {
           const message = {
-            author: import_keys3.PublicKey.from(signalMessage.author),
-            recipient: import_keys3.PublicKey.from(signalMessage.recipient),
+            author: {
+              peerKey: import_keys3.PublicKey.from(signalMessage.author).toHex()
+            },
+            recipient: {
+              peerKey: import_keys3.PublicKey.from(signalMessage.recipient).toHex()
+            },
             payload: signalMessage.payload
           };
           await this._onMessage(message);
@@ -982,7 +1030,7 @@ var SignalClient = class extends import_context2.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 86,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1000,7 +1048,7 @@ var SignalClient = class extends import_context2.Resource {
         }));
         (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file4,
-          L: 96,
+          L: 102,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1043,7 +1091,7 @@ var SignalClient = class extends import_context2.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 129,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1055,7 +1103,7 @@ var SignalClient = class extends import_context2.Resource {
     if (this._state === import_signal.SignalState.CONNECTED && !this._lastReconciliationFailed) {
       import_log2.log.warn("SignalClient error:", err, {
         F: __dxlog_file4,
-        L: 138,
+        L: 144,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1065,7 +1113,7 @@ var SignalClient = class extends import_context2.Resource {
   async _close() {
     (0, import_log2.log)("closing...", void 0, {
       F: __dxlog_file4,
-      L: 144,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1078,7 +1126,7 @@ var SignalClient = class extends import_context2.Resource {
     await this._safeResetClient();
     (0, import_log2.log)("closed", void 0, {
       F: __dxlog_file4,
-      L: 152,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1095,67 +1143,113 @@ var SignalClient = class extends import_context2.Resource {
   async join(args) {
     (0, import_log2.log)("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: import_keys2.PublicKey.from(args.peer.peerKey)
+    });
     this._reconcileTask?.schedule();
   }
   async leave(args) {
     (0, import_log2.log)("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: import_keys2.PublicKey.from(args.peer.peerKey)
+    });
   }
   async sendMessage(msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
       (0, import_invariant2.invariant)(this._state === import_signal.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);
+      (0, import_invariant2.invariant)(msg.author.peerKey, "Author key required", {
+        F: __dxlog_file4,
+        L: 188,
+        S: this,
+        A: [
+          "msg.author.peerKey",
+          "'Author key required'"
+        ]
+      });
+      (0, import_invariant2.invariant)(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: import_keys2.PublicKey.from(msg.author.peerKey),
+        recipient: import_keys2.PublicKey.from(msg.recipient.peerKey),
+        payload: msg.payload
+      });
     });
   }
-  async subscribeMessages(peerId) {
+  async subscribeMessages(peer) {
+    (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
+      F: __dxlog_file4,
+      L: 199,
+      S: this,
+      A: [
+        "peer.peerKey",
+        "'Peer key required'"
+      ]
+    });
     (0, import_log2.log)("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(import_keys2.PublicKey.from(peer.peerKey));
     this._reconcileTask?.schedule();
   }
-  async unsubscribeMessages(peerId) {
+  async unsubscribeMessages(peer) {
+    (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
+      F: __dxlog_file4,
+      L: 206,
+      S: this,
+      A: [
+        "peer.peerKey",
+        "'Peer key required'"
+      ]
+    });
     (0, import_log2.log)("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(import_keys2.PublicKey.from(peer.peerKey));
   }
   _scheduleReconcileAfterError() {
     (0, import_async2.scheduleTask)(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
@@ -1166,13 +1260,13 @@ var SignalClient = class extends import_context2.Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 202,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this._client, "Client already created", {
       F: __dxlog_file4,
-      L: 203,
+      L: 217,
       S: this,
       A: [
         "!this._client",
@@ -1184,7 +1278,7 @@ var SignalClient = class extends import_context2.Resource {
     this._connectionCtx.onDispose(async () => {
       (0, import_log2.log)("connection context disposed", void 0, {
         F: __dxlog_file4,
-        L: 210,
+        L: 224,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1199,7 +1293,7 @@ var SignalClient = class extends import_context2.Resource {
             if (client === this._client) {
               (0, import_log2.log)("socket connected", void 0, {
                 F: __dxlog_file4,
-                L: 221,
+                L: 235,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1214,7 +1308,7 @@ var SignalClient = class extends import_context2.Resource {
               state: this._state
             }, {
               F: __dxlog_file4,
-              L: 230,
+              L: 244,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1231,7 +1325,7 @@ var SignalClient = class extends import_context2.Resource {
                 state: this._state
               }, {
                 F: __dxlog_file4,
-                L: 242,
+                L: 256,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1256,14 +1350,14 @@ var SignalClient = class extends import_context2.Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 257,
+      L: 271,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === import_signal.SignalState.RECONNECTING) {
       import_log2.log.info("Signal api already reconnecting.", void 0, {
         F: __dxlog_file4,
-        L: 260,
+        L: 274,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1305,7 +1399,7 @@ var SignalClient = class extends import_context2.Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file4,
-      L: 301,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1326,12 +1420,13 @@ var SignalClient = class extends import_context2.Resource {
     this._client = void 0;
   }
 };
+var PeerInfoHash = ({ peerKey }) => peerKey;
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
   constructor() {
     this.swarmEvent = new import_async5.Event();
     this.swarms = new import_util3.ComplexMap(import_keys5.PublicKey.hash);
-    this.connections = new import_util3.ComplexMap(import_keys5.PublicKey.hash);
+    this.connections = new import_util3.ComplexMap(PeerInfoHash);
   }
 };
 var MemorySignalManager = class {
@@ -1340,11 +1435,11 @@ var MemorySignalManager = class {
     this.statusChanged = new import_async5.Event();
     this.swarmEvent = new import_async5.Event();
     this.onMessage = new import_async5.Event();
-    this._joinedSwarms = new import_util3.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+    this._joinedSwarms = new import_util3.ComplexSet(({ topic, peer }) => topic.toHex() + peer.peerKey);
     this._freezeTrigger = new import_async5.Trigger().wake();
     this._ctx = new import_context5.Context(void 0, {
       F: __dxlog_file5,
-      L: 62
+      L: 51
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
   }
@@ -1354,7 +1449,7 @@ var MemorySignalManager = class {
     }
     this._ctx = new import_context5.Context(void 0, {
       F: __dxlog_file5,
-      L: 71
+      L: 60
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
     await Promise.all([
@@ -1365,7 +1460,7 @@ var MemorySignalManager = class {
     if (this._ctx.disposed) {
       return;
     }
-    const joinedSwarmsCopy = new import_util3.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex(), [
+    const joinedSwarmsCopy = new import_util3.ComplexSet(({ topic, peer }) => topic.toHex() + peer.peerKey, [
       ...this._joinedSwarms.values()
     ]);
     await Promise.all([
@@ -1377,10 +1472,10 @@ var MemorySignalManager = class {
   getStatus() {
     return [];
   }
-  async join({ topic, peerId }) {
+  async join({ topic, peer }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 100,
+      L: 89,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1389,39 +1484,35 @@ var MemorySignalManager = class {
     });
     this._joinedSwarms.add({
       topic,
-      peerId
+      peer
     });
     if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new import_util3.ComplexSet(import_keys5.PublicKey.hash));
+      this._context.swarms.set(topic, new import_util3.ComplexSet(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 }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 136,
+      L: 121,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1430,21 +1521,19 @@ var MemorySignalManager = class {
     });
     this._joinedSwarms.delete({
       topic,
-      peerId
+      peer
     });
     if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new import_util3.ComplexSet(import_keys5.PublicKey.hash));
+      this._context.swarms.set(topic, new import_util3.ComplexSet(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 }) {
     (0, import_log5.log)("send message", {
@@ -1453,13 +1542,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file5,
-      L: 156,
+      L: 142,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(recipient, void 0, {
       F: __dxlog_file5,
-      L: 158,
+      L: 144,
       S: this,
       A: [
         "recipient",
@@ -1468,7 +1557,7 @@ var MemorySignalManager = class {
     });
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 159,
+      L: 145,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1483,7 +1572,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 165,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1495,7 +1584,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 170,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1508,7 +1597,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file5,
-          L: 178,
+          L: 164,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1520,7 +1609,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file5,
-        L: 182,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1534,33 +1623,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) {
     (0, import_log5.log)("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) {
     (0, import_log5.log)("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();
@@ -1608,13 +1697,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 import_context6.Resource {
   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 import_async6.Event();
     this.swarmEvent = new import_async6.Event();
@@ -1624,7 +1713,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 58,
+      L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1641,15 +1730,12 @@ var WebsocketSignalManager = class {
     }
     this._failedServersBitfield = import_util4.BitField.zeros(this._hosts.length);
   }
-  async open() {
-    if (this._opened) {
-      return;
-    }
+  async _open() {
     (0, import_log6.log)("open signal manager", {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 82,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1657,28 +1743,21 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 83,
+      L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._initContext();
     await (0, import_util4.safeAwaitAll)(this._servers.values(), (server) => server.open());
-    this._opened = true;
     import_log6.log.trace("dxos.mesh.websocket-signal-manager.open", import_protocols5.trace.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 (0, import_util4.safeAwaitAll)(this._servers.values(), (server) => server.close());
   }
   async restartServer(serverName) {
@@ -1686,23 +1765,23 @@ var WebsocketSignalManager = class {
       serverName
     }, {
       F: __dxlog_file6,
-      L: 104,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "server already closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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);
     (0, import_invariant5.invariant)(server, "server not found", {
       F: __dxlog_file6,
-      L: 108,
+      L: 91,
       S: this,
       A: [
         "server",
@@ -1716,52 +1795,52 @@ var WebsocketSignalManager = class {
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
-  async join({ topic, peerId }) {
+  async join({ topic, peer }) {
     (0, import_log6.log)("join", {
       topic,
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 121,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "Closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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 }) {
     (0, import_log6.log)("leaving", {
       topic,
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 128,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "Closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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 }) {
@@ -1769,17 +1848,17 @@ var WebsocketSignalManager = class {
       recipient
     }, {
       F: __dxlog_file6,
-      L: 142,
+      L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "Closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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) => {
@@ -1793,7 +1872,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 151,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1803,7 +1882,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 154,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1813,7 +1892,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 157,
+            L: 132,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1836,7 +1915,7 @@ var WebsocketSignalManager = class {
           failureCount
         }, {
           F: __dxlog_file6,
-          L: 171,
+          L: 146,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1854,7 +1933,7 @@ var WebsocketSignalManager = class {
         serverName
       }, {
         F: __dxlog_file6,
-        L: 184,
+        L: 159,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1862,69 +1941,50 @@ var WebsocketSignalManager = class {
       this.failureCount.set(serverName, 0);
     }
   }
-  async subscribeMessages(peerId) {
+  async subscribeMessages(peer) {
     (0, import_log6.log)("subscribed for message stream", {
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 191,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "Closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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) {
     (0, import_log6.log)("subscribed for message stream", {
-      peerId
+      peer
     }, {
       F: __dxlog_file6,
-      L: 198,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._opened, "Closed", {
+    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.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 import_context6.Context({
-      onError: (err) => import_log6.log.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([
-  import_async6.synchronized
-], WebsocketSignalManager.prototype, "open", null);
-_ts_decorate([
-  import_async6.synchronized
-], WebsocketSignalManager.prototype, "close", null);
 _ts_decorate([
   import_async6.synchronized
 ], WebsocketSignalManager.prototype, "join", null);
@@ -1934,14 +1994,211 @@ _ts_decorate([
 _ts_decorate([
   import_async6.synchronized
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
+var EdgeSignalManager = class extends import_context7.Resource {
+  constructor({ edgeConnection }) {
+    super();
+    this.swarmEvent = new import_async7.Event();
+    this.onMessage = new import_async7.Event();
+    this._swarmPeers = new import_util5.ComplexMap(import_keys7.PublicKey.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)) {
+      import_log7.log.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 import_util5.ComplexSet(PeerInfoHash));
+    await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
+      serviceId: import_protocols6.EdgeService.SWARM_SERVICE_ID,
+      payload: {
+        action: import_messenger_pb.SwarmRequest_Action.JOIN,
+        swarmKeys: [
+          topic.toHex()
+        ]
+      }
+    }));
+  }
+  async leave({ topic, peer }) {
+    this._swarmPeers.delete(topic);
+    await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
+      serviceId: import_protocols6.EdgeService.SWARM_SERVICE_ID,
+      payload: {
+        action: import_messenger_pb.SwarmRequest_Action.LEAVE,
+        swarmKeys: [
+          topic.toHex()
+        ]
+      }
+    }));
+  }
+  async sendMessage(message) {
+    if (!this._matchSelfPeerInfo(message.author)) {
+      import_log7.log.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(import_edge_client.protocol.createMessage(import_wkt.AnySchema, {
+      serviceId: import_protocols6.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 import_protocols6.EdgeService.SWARM_SERVICE_ID: {
+        this._processSwarmResponse(message);
+        break;
+      }
+      case import_protocols6.EdgeService.SIGNAL_SERVICE_ID: {
+        this._processMessage(message);
+      }
+    }
+  }
+  _processSwarmResponse(message) {
+    (0, import_invariant6.invariant)(import_edge_client.protocol.getPayloadType(message) === import_messenger_pb.SwarmResponseSchema.typeName, "Wrong payload type", {
+      F: __dxlog_file7,
+      L: 119,
+      S: this,
+      A: [
+        "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
+        "'Wrong payload type'"
+      ]
+    });
+    const payload = import_edge_client.protocol.getPayload(message, import_messenger_pb.SwarmResponseSchema);
+    const topic = import_keys7.PublicKey.from(payload.swarmKey);
+    if (!this._swarmPeers.has(topic)) {
+      import_log7.log.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 import_util5.ComplexSet(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) {
+    (0, import_invariant6.invariant)(import_edge_client.protocol.getPayloadType(message) === import_wkt.AnySchema.typeName, "Wrong payload type", {
+      F: __dxlog_file7,
+      L: 156,
+      S: this,
+      A: [
+        "protocol.getPayloadType(message) === AnySchema.typeName",
+        "'Wrong payload type'"
+      ]
+    });
+    const payload = import_edge_client.protocol.getPayload(message, import_wkt.AnySchema);
+    (0, import_invariant6.invariant)(message.source, "source is missing", {
+      F: __dxlog_file7,
+      L: 158,
+      S: this,
+      A: [
+        "message.source",
+        "'source is missing'"
+      ]
+    });
+    (0, import_invariant6.invariant)(message.target, "target is missing", {
+      F: __dxlog_file7,
+      L: 159,
+      S: this,
+      A: [
+        "message.target",
+        "'target is missing'"
+      ]
+    });
+    (0, import_invariant6.invariant)(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());
+  }
+};
+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) {
-      (0, import_log7.log)("empty response from identity service", {
+      (0, import_log8.log)("empty response from identity service", {
         idqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 21,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1952,18 +2209,18 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   });
   devicesService.queryDevices().subscribe((dqr) => {
     if (!dqr || !dqr.devices || dqr.devices.length === 0) {
-      (0, import_log7.log)("empty response from device service", {
+      (0, import_log8.log)("empty response from device service", {
         device: dqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 30,
         S: void 0,
         C: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_invariant6.invariant)(dqr, "empty response from device service", {
-      F: __dxlog_file7,
+    (0, import_invariant7.invariant)(dqr, "empty response from device service", {
+      F: __dxlog_file8,
       L: 33,
       S: void 0,
       A: [
@@ -1973,10 +2230,10 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     });
     const thisDevice = dqr.devices.find((device) => device.kind === import_services.DeviceKind.CURRENT);
     if (!thisDevice) {
-      (0, import_log7.log)("no current device", {
+      (0, import_log8.log)("no current device", {
         device: dqr
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1988,9 +2245,11 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  EdgeSignalManager,
   MemorySignalManager,
   MemorySignalManagerContext,
   Messenger,
+  PeerInfoHash,
   SignalClient,
   WebsocketSignalManager,
   setIdentityTags