@dxos/messaging 0.6.13 → 0.6.14-main.2b6a0f3

package/dist/lib/node/index.cjs

@@ -29,462 +29,60 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   EdgeSignalManager: () => EdgeSignalManager,
-  MemorySignalManager: () => MemorySignalManager,
-  MemorySignalManagerContext: () => MemorySignalManagerContext,
-  Messenger: () => Messenger,
-  PeerInfoHash: () => PeerInfoHash,
+  MemorySignalManager: () => import_chunk_WDA7H2PO.MemorySignalManager,
+  MemorySignalManagerContext: () => import_chunk_WDA7H2PO.MemorySignalManagerContext,
+  Messenger: () => import_chunk_WDA7H2PO.Messenger,
+  PeerInfoHash: () => import_chunk_WDA7H2PO.PeerInfoHash,
   SignalClient: () => SignalClient,
   WebsocketSignalManager: () => WebsocketSignalManager,
   setIdentityTags: () => setIdentityTags
 });
 module.exports = __toCommonJS(node_exports);
+var import_chunk_WDA7H2PO = require("./chunk-WDA7H2PO.cjs");
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
-var import_proto = require("@dxos/protocols/proto");
-var import_util = require("@dxos/util");
+var import_signal = require("@dxos/protocols/proto/dxos/mesh/signal");
 var import_tracing = require("@dxos/tracing");
 var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
-var import_invariant2 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
 var import_log2 = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
-var import_signal = require("@dxos/protocols/proto/dxos/mesh/signal");
-var import_tracing2 = require("@dxos/tracing");
+var import_util = require("@dxos/util");
+var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
 var import_async3 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
+var import_invariant2 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
-var import_util2 = require("@dxos/util");
-var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
+var import_protocols2 = require("@dxos/protocols");
+var import_proto = require("@dxos/protocols/proto");
+var import_rpc = require("@dxos/rpc");
+var import_tracing2 = require("@dxos/tracing");
 var import_async4 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
-var import_proto2 = require("@dxos/protocols/proto");
-var import_rpc = require("@dxos/rpc");
+var import_util2 = require("@dxos/util");
 var import_tracing3 = require("@dxos/tracing");
 var import_async5 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
+var import_edge_client = require("@dxos/edge-client");
 var import_invariant4 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
-var import_proto3 = require("@dxos/protocols/proto");
+var import_protocols4 = require("@dxos/protocols");
+var import_buf = require("@dxos/protocols/buf");
+var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
 var import_util3 = require("@dxos/util");
-var import_async6 = require("@dxos/async");
-var import_context6 = require("@dxos/context");
 var import_invariant5 = require("@dxos/invariant");
-var import_keys6 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
-var import_protocols4 = 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_protocols5 = 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() {
-    import_tracing.trace.metrics.increment("dxos.mesh.signal.messenger.failed-ack", 1);
-  }
-  recordReliableMessage(params) {
-    import_tracing.trace.metrics.increment("dxos.mesh.signal.messenger.reliable-send", 1, {
-      tags: {
-        success: params.sent,
-        attempts: params.sendAttempts
-      }
-    });
-  }
-};
-var MESSAGE_TIMEOUT = 1e4;
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
-var ReliablePayload = import_proto.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
-var Acknowledgement = import_proto.schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
-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 + 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);
-    this._closed = true;
-    this._signalManager = signalManager;
-    this._retryDelay = retryDelay;
-    this.open();
-  }
-  open() {
-    if (!this._closed) {
-      return;
-    }
-    const traceId = import_keys.PublicKey.random().toHex();
-    import_log.log.trace("dxos.mesh.messenger.open", import_protocols.trace.begin({
-      id: traceId
-    }), {
-      F: __dxlog_file,
-      L: 72,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._ctx = new import_context.Context({
-      onError: (err) => import_log.log.catch(err, void 0, {
-        F: __dxlog_file,
-        L: 74,
-        S: this,
-        C: (f, a) => f(...a)
-      })
-    }, {
-      F: __dxlog_file,
-      L: 73
-    });
-    this._ctx.onDispose(this._signalManager.onMessage.on(async (message) => {
-      (0, import_log.log)("received message", {
-        from: message.author
-      }, {
-        F: __dxlog_file,
-        L: 78,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._handleMessage(message);
-    }));
-    (0, import_async.scheduleTaskInterval)(this._ctx, async () => {
-      this._performGc();
-    }, RECEIVED_MESSAGES_GC_INTERVAL);
-    this._closed = false;
-    import_log.log.trace("dxos.mesh.messenger.open", import_protocols.trace.end({
-      id: traceId
-    }), {
-      F: __dxlog_file,
-      L: 93,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  async close() {
-    if (this._closed) {
-      return;
-    }
-    this._closed = true;
-    await this._ctx.dispose();
-  }
-  async sendMessage({ author, recipient, payload }) {
-    (0, import_invariant.invariant)(!this._closed, "Closed", {
-      F: __dxlog_file,
-      L: 105,
-      S: this,
-      A: [
-        "!this._closed",
-        "'Closed'"
-      ]
-    });
-    const messageContext = this._ctx.derive();
-    const reliablePayload = {
-      messageId: import_keys.PublicKey.random(),
-      payload
-    };
-    (0, import_invariant.invariant)(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
-      F: __dxlog_file,
-      L: 112,
-      S: this,
-      A: [
-        "!this._onAckCallbacks.has(reliablePayload.messageId!)",
-        ""
-      ]
-    });
-    (0, import_log.log)("send message", {
-      messageId: reliablePayload.messageId,
-      author,
-      recipient
-    }, {
-      F: __dxlog_file,
-      L: 113,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    let messageReceived;
-    let timeoutHit;
-    let sendAttempts = 0;
-    const promise = new Promise((resolve, reject) => {
-      messageReceived = resolve;
-      timeoutHit = reject;
-    });
-    (0, import_async.scheduleExponentialBackoffTaskInterval)(messageContext, async () => {
-      (0, import_log.log)("retrying message", {
-        messageId: reliablePayload.messageId
-      }, {
-        F: __dxlog_file,
-        L: 128,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      sendAttempts++;
-      await this._encodeAndSend({
-        author,
-        recipient,
-        reliablePayload
-      }).catch((err) => (0, import_log.log)("failed to send message", {
-        err
-      }, {
-        F: __dxlog_file,
-        L: 131,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
-    }, this._retryDelay);
-    (0, import_async.scheduleTask)(messageContext, () => {
-      (0, import_log.log)("message not delivered", {
-        messageId: reliablePayload.messageId
-      }, {
-        F: __dxlog_file,
-        L: 140,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._onAckCallbacks.delete(reliablePayload.messageId);
-      timeoutHit(new import_protocols.TimeoutError("signaling message not delivered", new import_async.TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
-      void messageContext.dispose();
-      this._monitor.recordReliableMessage({
-        sendAttempts,
-        sent: false
-      });
-    }, MESSAGE_TIMEOUT);
-    this._onAckCallbacks.set(reliablePayload.messageId, () => {
-      messageReceived();
-      this._onAckCallbacks.delete(reliablePayload.messageId);
-      void messageContext.dispose();
-      this._monitor.recordReliableMessage({
-        sendAttempts,
-        sent: true
-      });
-    });
-    await this._encodeAndSend({
-      author,
-      recipient,
-      reliablePayload
-    });
-    return promise;
-  }
-  /**
-  * 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({ peer, payloadType, onMessage }) {
-    (0, import_invariant.invariant)(!this._closed, "Closed", {
-      F: __dxlog_file,
-      L: 178,
-      S: this,
-      A: [
-        "!this._closed",
-        "'Closed'"
-      ]
-    });
-    await this._signalManager.subscribeMessages(peer);
-    let listeners;
-    (0, import_invariant.invariant)(peer.peerKey, "Peer key is required", {
-      F: __dxlog_file,
-      L: 182,
-      S: this,
-      A: [
-        "peer.peerKey",
-        "'Peer key is required'"
-      ]
-    });
-    if (!payloadType) {
-      listeners = this._defaultListeners.get(peer.peerKey);
-      if (!listeners) {
-        listeners = /* @__PURE__ */ new Set();
-        this._defaultListeners.set(peer.peerKey, listeners);
-      }
-    } else {
-      listeners = this._listeners.get({
-        peerId: peer.peerKey,
-        payloadType
-      });
-      if (!listeners) {
-        listeners = /* @__PURE__ */ new Set();
-        this._listeners.set({
-          peerId: peer.peerKey,
-          payloadType
-        }, listeners);
-      }
-    }
-    listeners.add(onMessage);
-    return {
-      unsubscribe: async () => {
-        listeners.delete(onMessage);
-      }
-    };
-  }
-  async _encodeAndSend({ author, recipient, reliablePayload }) {
-    await this._signalManager.sendMessage({
-      author,
-      recipient,
-      payload: {
-        type_url: "dxos.mesh.messaging.ReliablePayload",
-        value: ReliablePayload.encode(reliablePayload, {
-          preserveAny: true
-        })
-      }
-    });
-  }
-  async _handleMessage(message) {
-    switch (message.payload.type_url) {
-      case "dxos.mesh.messaging.ReliablePayload": {
-        await this._handleReliablePayload(message);
-        break;
-      }
-      case "dxos.mesh.messaging.Acknowledgement": {
-        await this._handleAcknowledgement({
-          payload: message.payload
-        });
-        break;
-      }
-    }
-  }
-  async _handleReliablePayload({ author, recipient, payload }) {
-    (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
-      F: __dxlog_file,
-      L: 240,
-      S: this,
-      A: [
-        "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
-        ""
-      ]
-    });
-    const reliablePayload = ReliablePayload.decode(payload.value, {
-      preserveAny: true
-    });
-    (0, import_log.log)("handling message", {
-      messageId: reliablePayload.messageId
-    }, {
-      F: __dxlog_file,
-      L: 243,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    try {
-      await this._sendAcknowledgement({
-        author,
-        recipient,
-        messageId: reliablePayload.messageId
-      });
-    } catch (err) {
-      this._monitor.recordMessageAckFailed();
-      throw err;
-    }
-    if (this._receivedMessages.has(reliablePayload.messageId)) {
-      return;
-    }
-    this._receivedMessages.add(reliablePayload.messageId);
-    await this._callListeners({
-      author,
-      recipient,
-      payload: reliablePayload.payload
-    });
-  }
-  async _handleAcknowledgement({ payload }) {
-    (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
-      F: __dxlog_file,
-      L: 271,
-      S: this,
-      A: [
-        "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
-        ""
-      ]
-    });
-    this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)?.();
-  }
-  async _sendAcknowledgement({ author, recipient, messageId }) {
-    (0, import_log.log)("sending ACK", {
-      messageId,
-      from: recipient,
-      to: author
-    }, {
-      F: __dxlog_file,
-      L: 284,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    await this._signalManager.sendMessage({
-      author: recipient,
-      recipient: author,
-      payload: {
-        type_url: "dxos.mesh.messaging.Acknowledgement",
-        value: Acknowledgement.encode({
-          messageId
-        })
-      }
-    });
-  }
-  async _callListeners(message) {
-    {
-      (0, import_invariant.invariant)(message.recipient.peerKey, "Peer key is required", {
-        F: __dxlog_file,
-        L: 298,
-        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);
-        }
-      }
-    }
-    {
-      const listenerMap = this._listeners.get({
-        peerId: message.recipient.peerKey,
-        payloadType: message.payload.type_url
-      });
-      if (listenerMap) {
-        for (const listener of listenerMap) {
-          await listener(message);
-        }
-      }
-    }
-  }
-  _performGc() {
-    const start = performance.now();
-    for (const key of this._toClear.keys()) {
-      this._receivedMessages.delete(key);
-    }
-    this._toClear.clear();
-    for (const key of this._receivedMessages.keys()) {
-      this._toClear.add(key);
-    }
-    const elapsed = performance.now() - start;
-    if (elapsed > 100) {
-      import_log.log.warn("GC took too long", {
-        elapsed
-      }, {
-        F: __dxlog_file,
-        L: 333,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-};
 var SignalClientMonitor = class {
   constructor() {
     this._performance = {
@@ -511,7 +109,7 @@ var SignalClientMonitor = class {
   }
   recordReconnect(params) {
     this._performance.reconnectCounter++;
-    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-client.reconnect", 1, {
+    import_tracing.trace.metrics.increment("dxos.mesh.signal.signal-client.reconnect", 1, {
       tags: {
         success: params.success
       }
@@ -525,10 +123,10 @@ var SignalClientMonitor = class {
   }
   recordMessageReceived(message) {
     this._performance.receivedMessages++;
-    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-client.received-total", 1, {
+    import_tracing.trace.metrics.increment("dxos.mesh.signal.signal-client.received-total", 1, {
       tags: createIdentityTags(message)
     });
-    import_tracing2.trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-in", getByteCount(message), {
+    import_tracing.trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-in", getByteCount(message), {
       tags: createIdentityTags(message)
     });
   }
@@ -540,16 +138,16 @@ var SignalClientMonitor = class {
       const reqStart = Date.now();
       await sendMessage();
       const reqDuration = Date.now() - reqStart;
-      import_tracing2.trace.metrics.distribution("dxos.mesh.signal.signal-client.send-duration", reqDuration, {
+      import_tracing.trace.metrics.distribution("dxos.mesh.signal.signal-client.send-duration", reqDuration, {
         tags
       });
-      import_tracing2.trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-out", getByteCount(message), {
+      import_tracing.trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-out", getByteCount(message), {
         tags
       });
     } catch (err) {
       success = false;
     }
-    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-client.sent-total", 1, {
+    import_tracing.trace.metrics.increment("dxos.mesh.signal.signal-client.sent-total", 1, {
       tags: {
         ...tags,
         success
@@ -557,10 +155,10 @@ var SignalClientMonitor = class {
     });
   }
   recordStreamCloseErrors(count) {
-    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-client.stream-close-errors", count);
+    import_tracing.trace.metrics.increment("dxos.mesh.signal.signal-client.stream-close-errors", count);
   }
   recordReconciliation(params) {
-    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-client.reconciliation", 1, {
+    import_tracing.trace.metrics.increment("dxos.mesh.signal.signal-client.reconciliation", 1, {
       tags: {
         success: params.success
       }
@@ -575,16 +173,16 @@ var createIdentityTags = (message) => {
     peer: message.author.peerKey
   };
 };
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
 var SignalLocalState = class {
   constructor(_onMessage, _onSwarmEvent) {
     this._onMessage = _onMessage;
     this._onSwarmEvent = _onSwarmEvent;
-    this._swarmStreams = new import_util2.ComplexMap(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._joinedTopics = new import_util2.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._subscribedMessages = new import_util2.ComplexSet(({ peerId }) => peerId.toHex());
-    this.messageStreams = new import_util2.ComplexMap((key) => key.toHex());
-    this.reconciled = new import_async3.Event();
+    this._swarmStreams = new import_util.ComplexMap(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+    this._joinedTopics = new import_util.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+    this._subscribedMessages = new import_util.ComplexSet(({ peerId }) => peerId.toHex());
+    this.messageStreams = new import_util.ComplexMap((key) => key.toHex());
+    this.reconciled = new import_async2.Event();
   }
   async safeCloseStreams() {
     const streams = [
@@ -594,7 +192,7 @@ var SignalLocalState = class {
     ]);
     this._swarmStreams.clear();
     this.messageStreams.clear();
-    const failureCount = (await (0, import_util2.safeAwaitAll)(streams, (s) => s.close())).length;
+    const failureCount = (await (0, import_util.safeAwaitAll)(streams, (s) => s.close())).length;
     return {
       failureCount
     };
@@ -625,10 +223,10 @@ var SignalLocalState = class {
     });
   }
   unsubscribeMessages(peerId) {
-    (0, import_log3.log)("unsubscribing from messages", {
+    (0, import_log2.log)("unsubscribing from messages", {
       peerId
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 79,
       S: this,
       C: (f, a) => f(...a)
@@ -668,7 +266,7 @@ var SignalLocalState = class {
       })) {
         continue;
       }
-      const swarmStream = await (0, import_async3.asyncTimeout)((0, import_context3.cancelWithContext)(ctx, client.join({
+      const swarmStream = await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(ctx, client.join({
         topic,
         peerId
       })), 5e3);
@@ -677,10 +275,10 @@ var SignalLocalState = class {
           topic,
           peerId
         })) {
-          (0, import_log3.log)("swarm event", {
+          (0, import_log2.log)("swarm event", {
             swarmEvent
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file,
             L: 115,
             S: this,
             C: (f, a) => f(...a)
@@ -690,7 +288,7 @@ var SignalLocalState = class {
             peerAvailable: {
               ...swarmEvent.peerAvailable,
               peer: {
-                peerKey: import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer).toHex()
+                peerKey: import_keys2.PublicKey.from(swarmEvent.peerAvailable.peer).toHex()
               }
             }
           } : {
@@ -698,7 +296,7 @@ var SignalLocalState = class {
             peerLeft: {
               ...swarmEvent.peerLeft,
               peer: {
-                peerKey: import_keys3.PublicKey.from(swarmEvent.peerLeft.peer).toHex()
+                peerKey: import_keys2.PublicKey.from(swarmEvent.peerLeft.peer).toHex()
               }
             }
           };
@@ -725,17 +323,17 @@ var SignalLocalState = class {
       if (this.messageStreams.has(peerId)) {
         continue;
       }
-      const messageStream = await (0, import_async3.asyncTimeout)((0, import_context3.cancelWithContext)(ctx, client.receiveMessages(peerId)), 5e3);
+      const messageStream = await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(ctx, client.receiveMessages(peerId)), 5e3);
       messageStream.subscribe(async (signalMessage) => {
         if (this._subscribedMessages.has({
           peerId
         })) {
           const message = {
             author: {
-              peerKey: import_keys3.PublicKey.from(signalMessage.author).toHex()
+              peerKey: import_keys2.PublicKey.from(signalMessage.author).toHex()
             },
             recipient: {
-              peerKey: import_keys3.PublicKey.from(signalMessage.recipient).toHex()
+              peerKey: import_keys2.PublicKey.from(signalMessage.recipient).toHex()
             },
             payload: signalMessage.payload
           };
@@ -748,26 +346,26 @@ var SignalLocalState = class {
 };
 var SignalRpcClientMonitor = class {
   recordClientCloseFailure(params) {
-    import_tracing3.trace.metrics.increment("dxos.mesh.signal.signal-rpc-client.close-failure", 1, {
+    import_tracing2.trace.metrics.increment("dxos.mesh.signal.signal-rpc-client.close-failure", 1, {
       tags: {
         reason: params.failureReason
       }
     });
   }
 };
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
 var SIGNAL_KEEPALIVE_INTERVAL = 1e4;
 var SignalRPCClient = class {
   constructor({ url, callbacks = {} }) {
-    this._connectTrigger = new import_async4.Trigger();
+    this._connectTrigger = new import_async3.Trigger();
     this._closed = false;
-    this._closeComplete = new import_async4.Trigger();
+    this._closeComplete = new import_async3.Trigger();
     this._monitor = new SignalRpcClientMonitor();
-    const traceId = import_keys4.PublicKey.random().toHex();
-    import_log4.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols3.trace.begin({
+    const traceId = import_keys3.PublicKey.random().toHex();
+    import_log3.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols2.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 61,
       S: this,
       C: (f, a) => f(...a)
@@ -777,7 +375,7 @@ var SignalRPCClient = class {
     this._socket = new import_isomorphic_ws.default(this._url);
     this._rpc = (0, import_rpc.createProtoRpcPeer)({
       requested: {
-        Signal: import_proto2.schema.getService("dxos.mesh.signal.Signal")
+        Signal: import_proto.schema.getService("dxos.mesh.signal.Signal")
       },
       noHandshake: true,
       port: {
@@ -788,8 +386,8 @@ var SignalRPCClient = class {
           try {
             this._socket.send(msg);
           } catch (err) {
-            import_log4.log.warn("send error", err, {
-              F: __dxlog_file3,
+            import_log3.log.warn("send error", err, {
+              F: __dxlog_file2,
               L: 80,
               S: this,
               C: (f, a) => f(...a)
@@ -817,19 +415,19 @@ var SignalRPCClient = class {
           await this._safeCloseRpc();
           return;
         }
-        (0, import_log4.log)(`RPC open ${this._url}`, void 0, {
-          F: __dxlog_file3,
+        (0, import_log3.log)(`RPC open ${this._url}`, void 0, {
+          F: __dxlog_file2,
           L: 105,
           S: this,
           C: (f, a) => f(...a)
         });
         this._callbacks.onConnected?.();
         this._connectTrigger.wake();
-        this._keepaliveCtx = new import_context4.Context(void 0, {
-          F: __dxlog_file3,
+        this._keepaliveCtx = new import_context3.Context(void 0, {
+          F: __dxlog_file2,
           L: 108
         });
-        (0, import_async4.scheduleTaskInterval)(this._keepaliveCtx, async () => {
+        (0, import_async3.scheduleTaskInterval)(this._keepaliveCtx, async () => {
           this._socket?.send("__ping__");
         }, SIGNAL_KEEPALIVE_INTERVAL);
       } catch (err) {
@@ -839,8 +437,8 @@ var SignalRPCClient = class {
       }
     };
     this._socket.onclose = async () => {
-      (0, import_log4.log)(`Disconnected ${this._url}`, void 0, {
-        F: __dxlog_file3,
+      (0, import_log3.log)(`Disconnected ${this._url}`, void 0, {
+        F: __dxlog_file2,
         L: 128,
         S: this,
         C: (f, a) => f(...a)
@@ -857,20 +455,20 @@ var SignalRPCClient = class {
       this._closed = true;
       this._callbacks.onError?.(event.error ?? new Error(event.message));
       await this._safeCloseRpc();
-      import_log4.log.warn(`Socket ${event.type ?? "unknown"} error`, {
+      import_log3.log.warn(`Socket ${event.type ?? "unknown"} error`, {
         message: event.message,
         url: this._url
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
       });
     };
-    import_log4.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols3.trace.end({
+    import_log3.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols2.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 147,
       S: this,
       C: (f, a) => f(...a)
@@ -891,25 +489,25 @@ var SignalRPCClient = class {
         timeout: 1e3
       });
     } catch (err) {
-      const failureReason = err instanceof import_async4.TimeoutError ? "timeout" : err?.constructor?.name ?? "unknown";
+      const failureReason = err instanceof import_async3.TimeoutError ? "timeout" : err?.constructor?.name ?? "unknown";
       this._monitor.recordClientCloseFailure({
         failureReason
       });
     }
   }
   async join({ topic, peerId }) {
-    (0, import_log4.log)("join", {
+    (0, import_log3.log)("join", {
       topic,
       peerId,
       metadata: this._callbacks?.getMetadata?.()
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 174,
       S: this,
       A: [
@@ -927,16 +525,16 @@ var SignalRPCClient = class {
     return swarmStream;
   }
   async receiveMessages(peerId) {
-    (0, import_log4.log)("receiveMessages", {
+    (0, import_log3.log)("receiveMessages", {
       peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 187,
       S: this,
       A: [
@@ -952,19 +550,19 @@ var SignalRPCClient = class {
     return messageStream;
   }
   async sendMessage({ author, recipient, payload }) {
-    (0, import_log4.log)("sendMessage", {
+    (0, import_log3.log)("sendMessage", {
       author,
       recipient,
       payload,
       metadata: this._callbacks?.getMetadata?.()
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 198,
       S: this,
       A: [
@@ -985,8 +583,8 @@ var SignalRPCClient = class {
       this._connectTrigger.reset();
       await this._rpc.close();
     } catch (err) {
-      import_log4.log.catch(err, void 0, {
-        F: __dxlog_file3,
+      import_log3.log.catch(err, void 0, {
+        F: __dxlog_file2,
         L: 213,
         S: this,
         C: (f, a) => f(...a)
@@ -994,12 +592,12 @@ var SignalRPCClient = class {
     }
   }
 };
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
 var DEFAULT_RECONNECT_TIMEOUT = 100;
 var MAX_RECONNECT_TIMEOUT = 5e3;
 var ERROR_RECONCILE_DELAY = 1e3;
 var RECONCILE_INTERVAL = 5e3;
-var SignalClient = class extends import_context2.Resource {
+var SignalClient = class extends import_context.Resource {
   /**
   * @param _host Signal server websocket URL.
   * @param onMessage called when a new message is received.
@@ -1013,12 +611,12 @@ var SignalClient = class extends import_context2.Resource {
     this._monitor = new SignalClientMonitor();
     this._state = import_signal.SignalState.CLOSED;
     this._lastReconciliationFailed = false;
-    this._clientReady = new import_async2.Trigger();
+    this._clientReady = new import_async.Trigger();
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
-    this._instanceId = import_keys2.PublicKey.random().toHex();
-    this.statusChanged = new import_async2.Event();
-    this.onMessage = new import_async2.Event();
-    this.swarmEvent = new import_async2.Event();
+    this._instanceId = import_keys.PublicKey.random().toHex();
+    this.statusChanged = new import_async.Event();
+    this.onMessage = new import_async.Event();
+    this.swarmEvent = new import_async.Event();
     if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
@@ -1028,10 +626,10 @@ var SignalClient = class extends import_context2.Resource {
     }, async (event) => this.swarmEvent.emit(event));
   }
   async _open() {
-    import_log2.log.trace("dxos.mesh.signal-client.open", import_protocols2.trace.begin({
+    import_log.log.trace("dxos.mesh.signal-client.open", import_protocols.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 92,
       S: this,
       C: (f, a) => f(...a)
@@ -1043,13 +641,13 @@ var SignalClient = class extends import_context2.Resource {
       return;
     }
     this._setState(import_signal.SignalState.CONNECTING);
-    this._reconcileTask = new import_async2.DeferredTask(this._ctx, async () => {
+    this._reconcileTask = new import_async.DeferredTask(this._ctx, async () => {
       try {
-        await (0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait({
+        await (0, import_context.cancelWithContext)(this._connectionCtx, this._clientReady.wait({
           timeout: 5e3
         }));
-        (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
-          F: __dxlog_file4,
+        (0, import_invariant.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
+          F: __dxlog_file3,
           L: 102,
           S: this,
           A: [
@@ -1070,12 +668,12 @@ var SignalClient = class extends import_context2.Resource {
         throw err;
       }
     });
-    (0, import_async2.scheduleTaskInterval)(this._ctx, async () => {
+    (0, import_async.scheduleTaskInterval)(this._ctx, async () => {
       if (this._state === import_signal.SignalState.CONNECTED) {
         this._reconcileTask.schedule();
       }
     }, RECONCILE_INTERVAL);
-    this._reconnectTask = new import_async2.DeferredTask(this._ctx, async () => {
+    this._reconnectTask = new import_async.DeferredTask(this._ctx, async () => {
       try {
         await this._reconnect();
         this._monitor.recordReconnect({
@@ -1089,10 +687,10 @@ var SignalClient = class extends import_context2.Resource {
       }
     });
     this._createClient();
-    import_log2.log.trace("dxos.mesh.signal-client.open", import_protocols2.trace.end({
+    import_log.log.trace("dxos.mesh.signal-client.open", import_protocols.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 135,
       S: this,
       C: (f, a) => f(...a)
@@ -1103,8 +701,8 @@ var SignalClient = class extends import_context2.Resource {
       return;
     }
     if (this._state === import_signal.SignalState.CONNECTED && !this._lastReconciliationFailed) {
-      import_log2.log.warn("SignalClient error:", err, {
-        F: __dxlog_file4,
+      import_log.log.warn("SignalClient error:", err, {
+        F: __dxlog_file3,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -1113,8 +711,8 @@ var SignalClient = class extends import_context2.Resource {
     this._scheduleReconcileAfterError();
   }
   async _close() {
-    (0, import_log2.log)("closing...", void 0, {
-      F: __dxlog_file4,
+    (0, import_log.log)("closing...", void 0, {
+      F: __dxlog_file3,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -1126,8 +724,8 @@ var SignalClient = class extends import_context2.Resource {
     }
     this._setState(import_signal.SignalState.CLOSED);
     await this._safeResetClient();
-    (0, import_log2.log)("closed", void 0, {
-      F: __dxlog_file4,
+    (0, import_log.log)("closed", void 0, {
+      F: __dxlog_file3,
       L: 158,
       S: this,
       C: (f, a) => f(...a)
@@ -1143,11 +741,11 @@ var SignalClient = class extends import_context2.Resource {
     };
   }
   async join(args) {
-    (0, import_log2.log)("joining", {
+    (0, import_log.log)("joining", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 172,
       S: this,
       C: (f, a) => f(...a)
@@ -1155,16 +753,16 @@ var SignalClient = class extends import_context2.Resource {
     this._monitor.recordJoin();
     this.localState.join({
       topic: args.topic,
-      peerId: import_keys2.PublicKey.from(args.peer.peerKey)
+      peerId: import_keys.PublicKey.from(args.peer.peerKey)
     });
     this._reconcileTask?.schedule();
   }
   async leave(args) {
-    (0, import_log2.log)("leaving", {
+    (0, import_log.log)("leaving", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 179,
       S: this,
       C: (f, a) => f(...a)
@@ -1172,14 +770,14 @@ var SignalClient = class extends import_context2.Resource {
     this._monitor.recordLeave();
     this.localState.leave({
       topic: args.topic,
-      peerId: import_keys2.PublicKey.from(args.peer.peerKey)
+      peerId: import_keys.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,
+      (0, import_invariant.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
+        F: __dxlog_file3,
         L: 187,
         S: this,
         A: [
@@ -1187,8 +785,8 @@ var SignalClient = class extends import_context2.Resource {
           "'Not connected to Signal Server'"
         ]
       });
-      (0, import_invariant2.invariant)(msg.author.peerKey, "Author key required", {
-        F: __dxlog_file4,
+      (0, import_invariant.invariant)(msg.author.peerKey, "Author key required", {
+        F: __dxlog_file3,
         L: 188,
         S: this,
         A: [
@@ -1196,8 +794,8 @@ var SignalClient = class extends import_context2.Resource {
           "'Author key required'"
         ]
       });
-      (0, import_invariant2.invariant)(msg.recipient.peerKey, "Recipient key required", {
-        F: __dxlog_file4,
+      (0, import_invariant.invariant)(msg.recipient.peerKey, "Recipient key required", {
+        F: __dxlog_file3,
         L: 189,
         S: this,
         A: [
@@ -1206,15 +804,15 @@ var SignalClient = class extends import_context2.Resource {
         ]
       });
       await this._client.sendMessage({
-        author: import_keys2.PublicKey.from(msg.author.peerKey),
-        recipient: import_keys2.PublicKey.from(msg.recipient.peerKey),
+        author: import_keys.PublicKey.from(msg.author.peerKey),
+        recipient: import_keys.PublicKey.from(msg.recipient.peerKey),
         payload: msg.payload
       });
     });
   }
   async subscribeMessages(peer) {
-    (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
-      F: __dxlog_file4,
+    (0, import_invariant.invariant)(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
       L: 199,
       S: this,
       A: [
@@ -1222,20 +820,20 @@ var SignalClient = class extends import_context2.Resource {
         "'Peer key required'"
       ]
     });
-    (0, import_log2.log)("subscribing to messages", {
+    (0, import_log.log)("subscribing to messages", {
       peer
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.subscribeMessages(import_keys2.PublicKey.from(peer.peerKey));
+    this.localState.subscribeMessages(import_keys.PublicKey.from(peer.peerKey));
     this._reconcileTask?.schedule();
   }
   async unsubscribeMessages(peer) {
-    (0, import_invariant2.invariant)(peer.peerKey, "Peer key required", {
-      F: __dxlog_file4,
+    (0, import_invariant.invariant)(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
       L: 206,
       S: this,
       A: [
@@ -1243,31 +841,31 @@ var SignalClient = class extends import_context2.Resource {
         "'Peer key required'"
       ]
     });
-    (0, import_log2.log)("unsubscribing from messages", {
+    (0, import_log.log)("unsubscribing from messages", {
       peer
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.unsubscribeMessages(import_keys2.PublicKey.from(peer.peerKey));
+    this.localState.unsubscribeMessages(import_keys.PublicKey.from(peer.peerKey));
   }
   _scheduleReconcileAfterError() {
-    (0, import_async2.scheduleTask)(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
+    (0, import_async.scheduleTask)(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
   }
   _createClient() {
-    (0, import_log2.log)("creating client", {
+    (0, import_log.log)("creating client", {
       host: this._host,
       state: this._state
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant2.invariant)(!this._client, "Client already created", {
-      F: __dxlog_file4,
+    (0, import_invariant.invariant)(!this._client, "Client already created", {
+      F: __dxlog_file3,
       L: 217,
       S: this,
       A: [
@@ -1278,8 +876,8 @@ var SignalClient = class extends import_context2.Resource {
     this._monitor.recordConnectionStartTime();
     this._connectionCtx = this._ctx.derive();
     this._connectionCtx.onDispose(async () => {
-      (0, import_log2.log)("connection context disposed", void 0, {
-        F: __dxlog_file4,
+      (0, import_log.log)("connection context disposed", void 0, {
+        F: __dxlog_file3,
         L: 224,
         S: this,
         C: (f, a) => f(...a)
@@ -1293,8 +891,8 @@ var SignalClient = class extends import_context2.Resource {
         callbacks: {
           onConnected: () => {
             if (client === this._client) {
-              (0, import_log2.log)("socket connected", void 0, {
-                F: __dxlog_file4,
+              (0, import_log.log)("socket connected", void 0, {
+                F: __dxlog_file3,
                 L: 235,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1306,10 +904,10 @@ var SignalClient = class extends import_context2.Resource {
             if (client !== this._client) {
               return;
             }
-            (0, import_log2.log)("socket disconnected", {
+            (0, import_log.log)("socket disconnected", {
               state: this._state
             }, {
-              F: __dxlog_file4,
+              F: __dxlog_file3,
               L: 244,
               S: this,
               C: (f, a) => f(...a)
@@ -1322,11 +920,11 @@ var SignalClient = class extends import_context2.Resource {
           },
           onError: (error) => {
             if (client === this._client) {
-              (0, import_log2.log)("socket error", {
+              (0, import_log.log)("socket error", {
                 error,
                 state: this._state
               }, {
-                F: __dxlog_file4,
+                F: __dxlog_file3,
                 L: 256,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1348,17 +946,17 @@ var SignalClient = class extends import_context2.Resource {
     }
   }
   async _reconnect() {
-    (0, import_log2.log)(`reconnecting in ${this._reconnectAfter}ms`, {
+    (0, import_log.log)(`reconnecting in ${this._reconnectAfter}ms`, {
       state: this._state
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       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,
+      import_log.log.info("Signal api already reconnecting.", void 0, {
+        F: __dxlog_file3,
         L: 274,
         S: this,
         C: (f, a) => f(...a)
@@ -1370,7 +968,7 @@ var SignalClient = class extends import_context2.Resource {
     }
     this._setState(import_signal.SignalState.RECONNECTING);
     await this._safeResetClient();
-    await (0, import_context2.cancelWithContext)(this._ctx, (0, import_async2.sleep)(this._reconnectAfter));
+    await (0, import_context.cancelWithContext)(this._ctx, (0, import_async.sleep)(this._reconnectAfter));
     this._createClient();
   }
   _onConnected() {
@@ -1397,10 +995,10 @@ var SignalClient = class extends import_context2.Resource {
   _setState(newState) {
     this._state = newState;
     this._monitor.recordStateChangeTime();
-    (0, import_log2.log)("signal state changed", {
+    (0, import_log.log)("signal state changed", {
       status: this.getStatus()
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 315,
       S: this,
       C: (f, a) => f(...a)
@@ -1422,263 +1020,12 @@ 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(PeerInfoHash);
-  }
-};
-var MemorySignalManager = class {
-  constructor(_context) {
-    this._context = _context;
-    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, peer }) => topic.toHex() + peer.peerKey);
-    this._freezeTrigger = new import_async5.Trigger().wake();
-    this._ctx = new import_context5.Context(void 0, {
-      F: __dxlog_file5,
-      L: 51
-    });
-    this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
-  }
-  async open() {
-    if (!this._ctx.disposed) {
-      return;
-    }
-    this._ctx = new import_context5.Context(void 0, {
-      F: __dxlog_file5,
-      L: 60
-    });
-    this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
-    await Promise.all([
-      ...this._joinedSwarms.values()
-    ].map((value) => this.join(value)));
-  }
-  async close() {
-    if (this._ctx.disposed) {
-      return;
-    }
-    const joinedSwarmsCopy = new import_util3.ComplexSet(({ topic, peer }) => topic.toHex() + peer.peerKey, [
-      ...this._joinedSwarms.values()
-    ]);
-    await Promise.all([
-      ...this._joinedSwarms.values()
-    ].map((value) => this.leave(value)));
-    this._joinedSwarms = joinedSwarmsCopy;
-    await this._ctx.dispose();
-  }
-  getStatus() {
-    return [];
-  }
-  async join({ topic, peer }) {
-    (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 89,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    this._joinedSwarms.add({
-      topic,
-      peer
-    });
-    if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new import_util3.ComplexSet(PeerInfoHash));
-    }
-    this._context.swarms.get(topic).add(peer);
-    this._context.swarmEvent.emit({
-      topic,
-      peerAvailable: {
-        peer,
-        since: /* @__PURE__ */ new Date()
-      }
-    });
-    for (const [topic2, peers] of this._context.swarms) {
-      Array.from(peers).forEach((peer2) => {
-        this.swarmEvent.emit({
-          topic: topic2,
-          peerAvailable: {
-            peer: peer2,
-            since: /* @__PURE__ */ new Date()
-          }
-        });
-      });
-    }
-  }
-  async leave({ topic, peer }) {
-    (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 121,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    this._joinedSwarms.delete({
-      topic,
-      peer
-    });
-    if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new import_util3.ComplexSet(PeerInfoHash));
-    }
-    this._context.swarms.get(topic).delete(peer);
-    const swarmEvent = {
-      topic,
-      peerLeft: {
-        peer
-      }
-    };
-    this._context.swarmEvent.emit(swarmEvent);
-  }
-  async sendMessage({ author, recipient, payload }) {
-    (0, import_log5.log)("send message", {
-      author,
-      recipient,
-      ...dec(payload)
-    }, {
-      F: __dxlog_file5,
-      L: 142,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    (0, import_invariant4.invariant)(recipient, void 0, {
-      F: __dxlog_file5,
-      L: 144,
-      S: this,
-      A: [
-        "recipient",
-        ""
-      ]
-    });
-    (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 145,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    await this._freezeTrigger.wait();
-    const remote = this._context.connections.get(recipient);
-    if (!remote) {
-      import_log5.log.warn("recipient is not subscribed for messages", {
-        author,
-        recipient
-      }, {
-        F: __dxlog_file5,
-        L: 151,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    if (remote._ctx.disposed) {
-      import_log5.log.warn("recipient is disposed", {
-        author,
-        recipient
-      }, {
-        F: __dxlog_file5,
-        L: 156,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    remote._freezeTrigger.wait().then(() => {
-      if (remote._ctx.disposed) {
-        import_log5.log.warn("recipient is disposed", {
-          author,
-          recipient
-        }, {
-          F: __dxlog_file5,
-          L: 164,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      (0, import_log5.log)("receive message", {
-        author,
-        recipient,
-        ...dec(payload)
-      }, {
-        F: __dxlog_file5,
-        L: 168,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      remote.onMessage.emit({
-        author,
-        recipient,
-        payload
-      });
-    }).catch((err) => {
-      import_log5.log.error("error while waiting for freeze", {
-        err
-      }, {
-        F: __dxlog_file5,
-        L: 173,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    });
-  }
-  async subscribeMessages(peerInfo) {
-    (0, import_log5.log)("subscribing", {
-      peerInfo
-    }, {
-      F: __dxlog_file5,
-      L: 178,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._context.connections.set(peerInfo, this);
-  }
-  async unsubscribeMessages(peerInfo) {
-    (0, import_log5.log)("unsubscribing", {
-      peerInfo
-    }, {
-      F: __dxlog_file5,
-      L: 183,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._context.connections.delete(peerInfo);
-  }
-  freeze() {
-    this._freezeTrigger.reset();
-  }
-  unfreeze() {
-    this._freezeTrigger.wake();
-  }
-};
-var dec = (payload) => {
-  if (!payload.type_url.endsWith("ReliablePayload")) {
-    return {};
-  }
-  const relPayload = import_proto3.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload").decode(payload.value);
-  if (typeof relPayload?.payload?.data === "object") {
-    return {
-      payload: Object.keys(relPayload?.payload?.data)[0],
-      sessionId: relPayload?.payload?.sessionId
-    };
-  }
-  return {};
-};
 var WebsocketSignalManagerMonitor = class {
   recordRateLimitExceeded() {
-    import_tracing4.trace.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
+    import_tracing3.trace.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
   }
   recordServerFailure(params) {
-    import_tracing4.trace.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
+    import_tracing3.trace.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
       tags: {
         server: params.serverName,
         restarted: params.willRestart
@@ -1692,10 +1039,10 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
+var __dxlog_file4 = "/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 extends import_context6.Resource {
+var WebsocketSignalManager = class extends import_context4.Resource {
   constructor(_hosts, _getMetadata) {
     super();
     this._hosts = _hosts;
@@ -1703,14 +1050,14 @@ var WebsocketSignalManager = class extends import_context6.Resource {
     this._servers = /* @__PURE__ */ new Map();
     this._monitor = new WebsocketSignalManagerMonitor();
     this.failureCount = /* @__PURE__ */ new Map();
-    this.statusChanged = new import_async6.Event();
-    this.swarmEvent = new import_async6.Event();
-    this.onMessage = new import_async6.Event();
-    this._instanceId = import_keys6.PublicKey.random().toHex();
-    (0, import_log6.log)("Created WebsocketSignalManager", {
+    this.statusChanged = new import_async4.Event();
+    this.swarmEvent = new import_async4.Event();
+    this.onMessage = new import_async4.Event();
+    this._instanceId = import_keys4.PublicKey.random().toHex();
+    (0, import_log4.log)("Created WebsocketSignalManager", {
       hosts: this._hosts
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 54,
       S: this,
       C: (f, a) => f(...a)
@@ -1726,49 +1073,49 @@ var WebsocketSignalManager = class extends import_context6.Resource {
       this._servers.set(host.server, server);
       this.failureCount.set(host.server, 0);
     }
-    this._failedServersBitfield = import_util4.BitField.zeros(this._hosts.length);
+    this._failedServersBitfield = import_util2.BitField.zeros(this._hosts.length);
   }
   async _open() {
-    (0, import_log6.log)("open signal manager", {
+    (0, import_log4.log)("open signal manager", {
       hosts: this._hosts
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log6.log.trace("dxos.mesh.websocket-signal-manager.open", import_protocols4.trace.begin({
+    import_log4.log.trace("dxos.mesh.websocket-signal-manager.open", import_protocols3.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 75,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util4.safeAwaitAll)(this._servers.values(), (server) => server.open());
-    import_log6.log.trace("dxos.mesh.websocket-signal-manager.open", import_protocols4.trace.end({
+    await (0, import_util2.safeAwaitAll)(this._servers.values(), (server) => server.open());
+    import_log4.log.trace("dxos.mesh.websocket-signal-manager.open", import_protocols3.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close() {
-    await (0, import_util4.safeAwaitAll)(this._servers.values(), (server) => server.close());
+    await (0, import_util2.safeAwaitAll)(this._servers.values(), (server) => server.close());
   }
   async restartServer(serverName) {
-    (0, import_log6.log)("restarting server", {
+    (0, import_log4.log)("restarting server", {
       serverName
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 88,
       S: this,
       A: [
@@ -1777,8 +1124,8 @@ var WebsocketSignalManager = class extends import_context6.Resource {
       ]
     });
     const server = this._servers.get(serverName);
-    (0, import_invariant5.invariant)(server, "server not found", {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(server, "server not found", {
+      F: __dxlog_file4,
       L: 91,
       S: this,
       A: [
@@ -1787,24 +1134,24 @@ var WebsocketSignalManager = class extends import_context6.Resource {
       ]
     });
     await server.close();
-    await (0, import_async6.sleep)(WSS_SIGNAL_SERVER_REBOOT_DELAY);
+    await (0, import_async4.sleep)(WSS_SIGNAL_SERVER_REBOOT_DELAY);
     await server.open();
   }
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
   async join({ topic, peer }) {
-    (0, import_log6.log)("join", {
+    (0, import_log4.log)("join", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 105,
       S: this,
       A: [
@@ -1818,17 +1165,17 @@ var WebsocketSignalManager = class extends import_context6.Resource {
     }));
   }
   async leave({ topic, peer }) {
-    (0, import_log6.log)("leaving", {
+    (0, import_log4.log)("leaving", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 112,
       S: this,
       A: [
@@ -1842,16 +1189,16 @@ var WebsocketSignalManager = class extends import_context6.Resource {
     }));
   }
   async sendMessage({ author, recipient, payload }) {
-    (0, import_log6.log)("signal", {
+    (0, import_log4.log)("signal", {
       recipient
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 118,
       S: this,
       A: [
@@ -1865,31 +1212,31 @@ var WebsocketSignalManager = class extends import_context6.Resource {
         recipient,
         payload
       }).then(() => this._clearServerFailedFlag(serverName, index)).catch((err) => {
-        if (err instanceof import_protocols4.RateLimitExceededError) {
-          import_log6.log.info("WSS rate limit exceeded", {
+        if (err instanceof import_protocols3.RateLimitExceededError) {
+          import_log4.log.info("WSS rate limit exceeded", {
             err
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file4,
             L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
           this._monitor.recordRateLimitExceeded();
-        } else if (err instanceof import_protocols4.TimeoutError || err.constructor.name === "TimeoutError") {
-          import_log6.log.info("WSS sendMessage timeout", {
+        } else if (err instanceof import_protocols3.TimeoutError || err.constructor.name === "TimeoutError") {
+          import_log4.log.info("WSS sendMessage timeout", {
             err
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file4,
             L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
           void this.checkServerFailure(serverName, index);
         } else {
-          import_log6.log.warn(`error sending to ${serverName}`, {
+          import_log4.log.warn(`error sending to ${serverName}`, {
             err
           }, {
-            F: __dxlog_file6,
+            F: __dxlog_file4,
             L: 132,
             S: this,
             C: (f, a) => f(...a)
@@ -1907,17 +1254,17 @@ var WebsocketSignalManager = class extends import_context6.Resource {
       willRestart: isRestartRequired
     });
     if (isRestartRequired) {
-      if (!import_util4.BitField.get(this._failedServersBitfield, index)) {
-        import_log6.log.warn("too many failures for ws-server, restarting", {
+      if (!import_util2.BitField.get(this._failedServersBitfield, index)) {
+        import_log4.log.warn("too many failures for ws-server, restarting", {
           serverName,
           failureCount
         }, {
-          F: __dxlog_file6,
+          F: __dxlog_file4,
           L: 146,
           S: this,
           C: (f, a) => f(...a)
         });
-        import_util4.BitField.set(this._failedServersBitfield, index, true);
+        import_util2.BitField.set(this._failedServersBitfield, index, true);
       }
       await this.restartServer(serverName);
       this.failureCount.set(serverName, 0);
@@ -1926,30 +1273,30 @@ var WebsocketSignalManager = class extends import_context6.Resource {
     this.failureCount.set(serverName, (this.failureCount.get(serverName) ?? 0) + 1);
   }
   _clearServerFailedFlag(serverName, index) {
-    if (import_util4.BitField.get(this._failedServersBitfield, index)) {
-      import_log6.log.info("server connection restored", {
+    if (import_util2.BitField.get(this._failedServersBitfield, index)) {
+      import_log4.log.info("server connection restored", {
         serverName
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file4,
         L: 159,
         S: this,
         C: (f, a) => f(...a)
       });
-      import_util4.BitField.set(this._failedServersBitfield, index, false);
+      import_util2.BitField.set(this._failedServersBitfield, index, false);
       this.failureCount.set(serverName, 0);
     }
   }
   async subscribeMessages(peer) {
-    (0, import_log6.log)("subscribed for message stream", {
+    (0, import_log4.log)("subscribed for message stream", {
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 167,
       S: this,
       A: [
@@ -1960,16 +1307,16 @@ var WebsocketSignalManager = class extends import_context6.Resource {
     await this._forEachServer(async (server) => server.subscribeMessages(peer));
   }
   async unsubscribeMessages(peer) {
-    (0, import_log6.log)("subscribed for message stream", {
+    (0, import_log4.log)("subscribed for message stream", {
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant5.invariant)(this._lifecycleState === import_context6.LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    (0, import_invariant3.invariant)(this._lifecycleState === import_context4.LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 174,
       S: this,
       A: [
@@ -1984,21 +1331,21 @@ var WebsocketSignalManager = class extends import_context6.Resource {
   }
 };
 _ts_decorate([
-  import_async6.synchronized
+  import_async4.synchronized
 ], WebsocketSignalManager.prototype, "join", null);
 _ts_decorate([
-  import_async6.synchronized
+  import_async4.synchronized
 ], WebsocketSignalManager.prototype, "leave", null);
 _ts_decorate([
-  import_async6.synchronized
+  import_async4.synchronized
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
-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 {
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
+var EdgeSignalManager = class extends import_context5.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.swarmEvent = new import_async5.Event();
+    this.onMessage = new import_async5.Event();
+    this._swarmPeers = new import_util3.ComplexMap(import_keys5.PublicKey.hash);
     this._edgeConnection = edgeConnection;
   }
   async _open() {
@@ -2011,22 +1358,23 @@ var EdgeSignalManager = class extends import_context7.Resource {
   */
   async join({ topic, peer }) {
     if (!this._matchSelfPeerInfo(peer)) {
-      import_log7.log.warn("ignoring peer info on join request", {
+      import_log5.log.warn("ignoring peer info on join request", {
         peer,
         expected: {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file5,
         L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    this._swarmPeers.set(topic, new import_util5.ComplexSet(PeerInfoHash));
+    this._swarmPeers.set(topic, new import_util3.ComplexSet(import_chunk_WDA7H2PO.PeerInfoHash));
     await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
-      serviceId: import_protocols5.EdgeService.SWARM_SERVICE_ID,
+      serviceId: import_protocols4.EdgeService.SWARM_SERVICE_ID,
+      source: createMessageSource(topic, peer),
       payload: {
         action: import_messenger_pb.SwarmRequest_Action.JOIN,
         swarmKeys: [
@@ -2038,7 +1386,8 @@ var EdgeSignalManager = class extends import_context7.Resource {
   async leave({ topic, peer }) {
     this._swarmPeers.delete(topic);
     await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_messenger_pb.SwarmRequestSchema, {
-      serviceId: import_protocols5.EdgeService.SWARM_SERVICE_ID,
+      serviceId: import_protocols4.EdgeService.SWARM_SERVICE_ID,
+      source: createMessageSource(topic, peer),
       payload: {
         action: import_messenger_pb.SwarmRequest_Action.LEAVE,
         swarmKeys: [
@@ -2049,21 +1398,21 @@ var EdgeSignalManager = class extends import_context7.Resource {
   }
   async sendMessage(message) {
     if (!this._matchSelfPeerInfo(message.author)) {
-      import_log7.log.warn("ignoring author on send request", {
+      import_log5.log.warn("ignoring author on send request", {
         author: message.author,
         expected: {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
       }, {
-        F: __dxlog_file7,
-        L: 84,
+        F: __dxlog_file5,
+        L: 86,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_wkt.AnySchema, {
-      serviceId: import_protocols5.EdgeService.SIGNAL_SERVICE_ID,
+    await this._edgeConnection.send(import_edge_client.protocol.createMessage(import_buf.bufWkt.AnySchema, {
+      serviceId: import_protocols4.EdgeService.SIGNAL_SERVICE_ID,
       source: message.author,
       target: [
         message.recipient
@@ -2080,19 +1429,19 @@ var EdgeSignalManager = class extends import_context7.Resource {
   }
   _onMessage(message) {
     switch (message.serviceId) {
-      case import_protocols5.EdgeService.SWARM_SERVICE_ID: {
+      case import_protocols4.EdgeService.SWARM_SERVICE_ID: {
         this._processSwarmResponse(message);
         break;
       }
-      case import_protocols5.EdgeService.SIGNAL_SERVICE_ID: {
+      case import_protocols4.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: 121,
+    (0, import_invariant4.invariant)(import_edge_client.protocol.getPayloadType(message) === import_messenger_pb.SwarmResponseSchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
+      L: 123,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2100,21 +1449,21 @@ var EdgeSignalManager = class extends import_context7.Resource {
       ]
     });
     const payload = import_edge_client.protocol.getPayload(message, import_messenger_pb.SwarmResponseSchema);
-    const topic = import_keys7.PublicKey.from(payload.swarmKey);
+    const topic = import_keys5.PublicKey.from(payload.swarmKey);
     if (!this._swarmPeers.has(topic)) {
-      import_log7.log.warn("Received message from wrong topic", {
+      import_log5.log.warn("Received message from wrong topic", {
         topic
       }, {
-        F: __dxlog_file7,
-        L: 125,
+        F: __dxlog_file5,
+        L: 127,
         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);
+    const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : /* @__PURE__ */ new Date();
+    const newPeers = new import_util3.ComplexSet(import_chunk_WDA7H2PO.PeerInfoHash, payload.peers);
     for (const peer of newPeers) {
       if (oldPeers.has(peer)) {
         continue;
@@ -2141,37 +1490,37 @@ var EdgeSignalManager = class extends import_context7.Resource {
     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: 158,
+    (0, import_invariant4.invariant)(import_edge_client.protocol.getPayloadType(message) === import_buf.bufWkt.AnySchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
+      L: 160,
       S: this,
       A: [
-        "protocol.getPayloadType(message) === AnySchema.typeName",
+        "protocol.getPayloadType(message) === bufWkt.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: 160,
+    const payload = import_edge_client.protocol.getPayload(message, import_buf.bufWkt.AnySchema);
+    (0, import_invariant4.invariant)(message.source, "source is missing", {
+      F: __dxlog_file5,
+      L: 162,
       S: this,
       A: [
         "message.source",
         "'source is missing'"
       ]
     });
-    (0, import_invariant6.invariant)(message.target, "target is missing", {
-      F: __dxlog_file7,
-      L: 161,
+    (0, import_invariant4.invariant)(message.target, "target is missing", {
+      F: __dxlog_file5,
+      L: 163,
       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: 162,
+    (0, import_invariant4.invariant)(message.target.length === 1, "target should have exactly one item", {
+      F: __dxlog_file5,
+      L: 164,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2191,11 +1540,11 @@ var EdgeSignalManager = class extends import_context7.Resource {
     return peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityKey === this._edgeConnection.identityKey);
   }
   async _rejoinAllSwarms() {
-    (0, import_log7.log)("rejoin swarms", {
+    (0, import_log5.log)("rejoin swarms", {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
-      F: __dxlog_file7,
-      L: 181,
+      F: __dxlog_file5,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2210,14 +1559,21 @@ var EdgeSignalManager = class extends import_context7.Resource {
     }
   }
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
+var createMessageSource = (topic, peerInfo) => {
+  return {
+    swarmKey: topic.toHex(),
+    identityKey: peerInfo.identityKey,
+    peerKey: peerInfo.peerKey
+  };
+};
+var __dxlog_file6 = "/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_log8.log)("empty response from identity service", {
+      (0, import_log6.log)("empty response from identity service", {
         idqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 21,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2228,18 +1584,18 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   });
   devicesService.queryDevices().subscribe((dqr) => {
     if (!dqr || !dqr.devices || dqr.devices.length === 0) {
-      (0, import_log8.log)("empty response from device service", {
+      (0, import_log6.log)("empty response from device service", {
         device: dqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 30,
         S: void 0,
         C: (f, a) => f(...a)
       });
       return;
     }
-    (0, import_invariant7.invariant)(dqr, "empty response from device service", {
-      F: __dxlog_file8,
+    (0, import_invariant5.invariant)(dqr, "empty response from device service", {
+      F: __dxlog_file6,
       L: 33,
       S: void 0,
       A: [
@@ -2249,10 +1605,10 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     });
     const thisDevice = dqr.devices.find((device) => device.kind === import_services.DeviceKind.CURRENT);
     if (!thisDevice) {
-      (0, import_log8.log)("no current device", {
+      (0, import_log6.log)("no current device", {
         device: dqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)