@dxos/messaging 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

package/dist/lib/{browser/chunk-TPBTNKLU.mjs → neutral/index.mjs}

@@ -1,428 +1,22 @@
 import "@dxos/node-std/globals";
-
-// src/messenger.ts
-import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask, scheduleTaskInterval } from "@dxos/async";
-import { Context } from "@dxos/context";
-import { invariant } from "@dxos/invariant";
-import { PublicKey } from "@dxos/keys";
-import { log } from "@dxos/log";
-import { TimeoutError as ProtocolTimeoutError, trace as trace2 } from "@dxos/protocols";
-import { schema } from "@dxos/protocols/proto";
-import { ComplexMap, ComplexSet } from "@dxos/util";
-
-// src/messenger-monitor.ts
-import { trace } from "@dxos/tracing";
-var MessengerMonitor = class {
-  recordMessageAckFailed() {
-    trace.metrics.increment("dxos.mesh.signal.messenger.failed-ack", 1);
-  }
-  recordReliableMessage(params) {
-    trace.metrics.increment("dxos.mesh.signal.messenger.reliable-send", 1, {
-      tags: {
-        success: params.sent,
-        attempts: params.sendAttempts
-      }
-    });
-  }
-};
-
-// src/timeouts.ts
-var MESSAGE_TIMEOUT = 1e4;
-
-// src/messenger.ts
-var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
-var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
-var Acknowledgement = schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
-var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
-var Messenger = class {
-  _monitor = new MessengerMonitor();
-  _signalManager;
-  // { peerId, payloadType } => listeners set
-  _listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
-  // peerId => listeners set
-  _defaultListeners = /* @__PURE__ */ new Map();
-  _onAckCallbacks = new ComplexMap(PublicKey.hash);
-  _receivedMessages = new ComplexSet(PublicKey.hash);
-  /**
-  * Keys scheduled to be cleared from _receivedMessages on the next iteration.
-  */
-  _toClear = new ComplexSet(PublicKey.hash);
-  _ctx;
-  _closed = true;
-  _retryDelay;
-  constructor({ signalManager, retryDelay = 1e3 }) {
-    this._signalManager = signalManager;
-    this._retryDelay = retryDelay;
-    this.open();
-  }
-  open() {
-    if (!this._closed) {
-      return;
-    }
-    const traceId = PublicKey.random().toHex();
-    log.trace("dxos.mesh.messenger.open", trace2.begin({
-      id: traceId
-    }), {
-      F: __dxlog_file,
-      L: 72,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._ctx = new Context({
-      onError: (err) => 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) => {
-      log("received message", {
-        from: message.author
-      }, {
-        F: __dxlog_file,
-        L: 78,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._handleMessage(message);
-    }));
-    scheduleTaskInterval(this._ctx, async () => {
-      this._performGc();
-    }, RECEIVED_MESSAGES_GC_INTERVAL);
-    this._closed = false;
-    log.trace("dxos.mesh.messenger.open", trace2.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 }) {
-    invariant(!this._closed, "Closed", {
-      F: __dxlog_file,
-      L: 105,
-      S: this,
-      A: [
-        "!this._closed",
-        "'Closed'"
-      ]
-    });
-    const messageContext = this._ctx.derive();
-    const reliablePayload = {
-      messageId: PublicKey.random(),
-      payload
-    };
-    invariant(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
-      F: __dxlog_file,
-      L: 112,
-      S: this,
-      A: [
-        "!this._onAckCallbacks.has(reliablePayload.messageId!)",
-        ""
-      ]
-    });
-    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;
-    });
-    scheduleExponentialBackoffTaskInterval(messageContext, async () => {
-      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) => log("failed to send message", {
-        err
-      }, {
-        F: __dxlog_file,
-        L: 131,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
-    }, this._retryDelay);
-    scheduleTask(messageContext, () => {
-      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 ProtocolTimeoutError("signaling message not delivered", new 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 }) {
-    invariant(!this._closed, "Closed", {
-      F: __dxlog_file,
-      L: 178,
-      S: this,
-      A: [
-        "!this._closed",
-        "'Closed'"
-      ]
-    });
-    await this._signalManager.subscribeMessages(peer);
-    let listeners;
-    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 }) {
-    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
-    });
-    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 }) {
-    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 }) {
-    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) {
-    {
-      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) {
-      log.warn("GC took too long", {
-        elapsed
-      }, {
-        F: __dxlog_file,
-        L: 333,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-};
+import {
+  MemorySignalManager,
+  MemorySignalManagerContext,
+  Messenger,
+  PeerInfoHash
+} from "./chunk-ZNKR3G44.mjs";
 
 // src/signal-client/signal-client.ts
-import { DeferredTask, Event as Event2, Trigger as Trigger2, scheduleTask as scheduleTask2, scheduleTaskInterval as scheduleTaskInterval3, sleep } from "@dxos/async";
+import { DeferredTask, Event as Event2, Trigger as Trigger2, scheduleTask, scheduleTaskInterval as scheduleTaskInterval2, sleep } from "@dxos/async";
 import { Resource, cancelWithContext as cancelWithContext2 } from "@dxos/context";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log4 } from "@dxos/log";
-import { trace as trace6 } from "@dxos/protocols";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { PublicKey as PublicKey3 } from "@dxos/keys";
+import { log as log3 } from "@dxos/log";
+import { trace as trace4 } from "@dxos/protocols";
 import { SignalState } from "@dxos/protocols/proto/dxos/mesh/signal";
 
 // src/signal-client/signal-client-monitor.ts
-import { trace as trace3 } from "@dxos/tracing";
+import { trace } from "@dxos/tracing";
 var SignalClientMonitor = class {
   _performance = {
     sentMessages: 0,
@@ -453,7 +47,7 @@ var SignalClientMonitor = class {
   }
   recordReconnect(params) {
     this._performance.reconnectCounter++;
-    trace3.metrics.increment("dxos.mesh.signal.signal-client.reconnect", 1, {
+    trace.metrics.increment("dxos.mesh.signal.signal-client.reconnect", 1, {
       tags: {
         success: params.success
       }
@@ -467,10 +61,10 @@ var SignalClientMonitor = class {
   }
   recordMessageReceived(message) {
     this._performance.receivedMessages++;
-    trace3.metrics.increment("dxos.mesh.signal.signal-client.received-total", 1, {
+    trace.metrics.increment("dxos.mesh.signal.signal-client.received-total", 1, {
       tags: createIdentityTags(message)
     });
-    trace3.metrics.distribution("dxos.mesh.signal.signal-client.bytes-in", getByteCount(message), {
+    trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-in", getByteCount(message), {
       tags: createIdentityTags(message)
     });
   }
@@ -482,16 +76,16 @@ var SignalClientMonitor = class {
       const reqStart = Date.now();
       await sendMessage();
       const reqDuration = Date.now() - reqStart;
-      trace3.metrics.distribution("dxos.mesh.signal.signal-client.send-duration", reqDuration, {
+      trace.metrics.distribution("dxos.mesh.signal.signal-client.send-duration", reqDuration, {
         tags
       });
-      trace3.metrics.distribution("dxos.mesh.signal.signal-client.bytes-out", getByteCount(message), {
+      trace.metrics.distribution("dxos.mesh.signal.signal-client.bytes-out", getByteCount(message), {
         tags
       });
     } catch (err) {
       success = false;
     }
-    trace3.metrics.increment("dxos.mesh.signal.signal-client.sent-total", 1, {
+    trace.metrics.increment("dxos.mesh.signal.signal-client.sent-total", 1, {
       tags: {
         ...tags,
         success
@@ -499,10 +93,10 @@ var SignalClientMonitor = class {
     });
   }
   recordStreamCloseErrors(count) {
-    trace3.metrics.increment("dxos.mesh.signal.signal-client.stream-close-errors", count);
+    trace.metrics.increment("dxos.mesh.signal.signal-client.stream-close-errors", count);
   }
   recordReconciliation(params) {
-    trace3.metrics.increment("dxos.mesh.signal.signal-client.reconciliation", 1, {
+    trace.metrics.increment("dxos.mesh.signal.signal-client.reconciliation", 1, {
       tags: {
         success: params.success
       }
@@ -521,43 +115,38 @@ var createIdentityTags = (message) => {
 // src/signal-client/signal-local-state.ts
 import { Event, asyncTimeout } from "@dxos/async";
 import { cancelWithContext } from "@dxos/context";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { log as log2 } from "@dxos/log";
-import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, safeAwaitAll } from "@dxos/util";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
+import { PublicKey } from "@dxos/keys";
+import { log } from "@dxos/log";
+import { ComplexMap, ComplexSet, safeAwaitAll } from "@dxos/util";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
 var SignalLocalState = class {
   _onMessage;
   _onSwarmEvent;
   /**
   * Swarm events streams. Keys represent actually joined topic and peerId.
   */
-  _swarmStreams;
+  _swarmStreams = new ComplexMap(({ topic, peerId }) => topic.toHex() + peerId.toHex());
   /**
   * Represent desired joined topic and peerId.
   */
-  _joinedTopics;
+  _joinedTopics = new ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
   /**
   * Represent desired message subscriptions.
   */
-  _subscribedMessages;
+  _subscribedMessages = new ComplexSet(({ peerId }) => peerId.toHex());
   /**
   * Message streams. Keys represents actually subscribed peers.
   * @internal
   */
-  messageStreams;
+  messageStreams = new ComplexMap((key) => key.toHex());
   /**
   * Event to use in tests to wait till subscription is successfully established.
   * @internal
   */
-  reconciled;
+  reconciled = new Event();
   constructor(_onMessage, _onSwarmEvent) {
     this._onMessage = _onMessage;
     this._onSwarmEvent = _onSwarmEvent;
-    this._swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
-    this.messageStreams = new ComplexMap2((key) => key.toHex());
-    this.reconciled = new Event();
   }
   async safeCloseStreams() {
     const streams = [
@@ -598,11 +187,11 @@ var SignalLocalState = class {
     });
   }
   unsubscribeMessages(peerId) {
-    log2("unsubscribing from messages", {
+    log("unsubscribing from messages", {
       peerId
     }, {
-      F: __dxlog_file2,
-      L: 80,
+      F: __dxlog_file,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -650,11 +239,11 @@ var SignalLocalState = class {
           topic,
           peerId
         })) {
-          log2("swarm event", {
+          log("swarm event", {
             swarmEvent
           }, {
-            F: __dxlog_file2,
-            L: 116,
+            F: __dxlog_file,
+            L: 115,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -663,7 +252,7 @@ var SignalLocalState = class {
             peerAvailable: {
               ...swarmEvent.peerAvailable,
               peer: {
-                peerKey: PublicKey2.from(swarmEvent.peerAvailable.peer).toHex()
+                peerKey: PublicKey.from(swarmEvent.peerAvailable.peer).toHex()
               }
             }
           } : {
@@ -671,7 +260,7 @@ var SignalLocalState = class {
             peerLeft: {
               ...swarmEvent.peerLeft,
               peer: {
-                peerKey: PublicKey2.from(swarmEvent.peerLeft.peer).toHex()
+                peerKey: PublicKey.from(swarmEvent.peerLeft.peer).toHex()
               }
             }
           };
@@ -705,10 +294,10 @@ var SignalLocalState = class {
         })) {
           const message = {
             author: {
-              peerKey: PublicKey2.from(signalMessage.author).toHex()
+              peerKey: PublicKey.from(signalMessage.author).toHex()
             },
             recipient: {
-              peerKey: PublicKey2.from(signalMessage.recipient).toHex()
+              peerKey: PublicKey.from(signalMessage.recipient).toHex()
             },
             payload: signalMessage.payload
           };
@@ -722,20 +311,20 @@ var SignalLocalState = class {
 
 // src/signal-client/signal-rpc-client.ts
 import WebSocket from "isomorphic-ws";
-import { TimeoutError as TimeoutError2, Trigger, scheduleTaskInterval as scheduleTaskInterval2 } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
-import { trace as trace5 } from "@dxos/protocols";
-import { schema as schema2 } from "@dxos/protocols/proto";
+import { TimeoutError, Trigger, scheduleTaskInterval } from "@dxos/async";
+import { Context } from "@dxos/context";
+import { invariant } from "@dxos/invariant";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { log as log2 } from "@dxos/log";
+import { trace as trace3 } from "@dxos/protocols";
+import { schema } from "@dxos/protocols/proto";
 import { createProtoRpcPeer } from "@dxos/rpc";
 
 // src/signal-client/signal-rpc-client-monitor.ts
-import { trace as trace4 } from "@dxos/tracing";
+import { trace as trace2 } from "@dxos/tracing";
 var SignalRpcClientMonitor = class {
   recordClientCloseFailure(params) {
-    trace4.metrics.increment("dxos.mesh.signal.signal-rpc-client.close-failure", 1, {
+    trace2.metrics.increment("dxos.mesh.signal.signal-rpc-client.close-failure", 1, {
       tags: {
         reason: params.failureReason
       }
@@ -744,7 +333,7 @@ var SignalRpcClientMonitor = class {
 };
 
 // src/signal-client/signal-rpc-client.ts
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
 var SIGNAL_KEEPALIVE_INTERVAL = 1e4;
 var SignalRPCClient = class {
   _socket;
@@ -757,11 +346,11 @@ var SignalRPCClient = class {
   _closeComplete = new Trigger();
   _monitor = new SignalRpcClientMonitor();
   constructor({ url, callbacks = {} }) {
-    const traceId = PublicKey3.random().toHex();
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.begin({
+    const traceId = PublicKey2.random().toHex();
+    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.begin({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 66,
       S: this,
       C: (f, a) => f(...a)
@@ -771,7 +360,7 @@ var SignalRPCClient = class {
     this._socket = new WebSocket(this._url);
     this._rpc = createProtoRpcPeer({
       requested: {
-        Signal: schema2.getService("dxos.mesh.signal.Signal")
+        Signal: schema.getService("dxos.mesh.signal.Signal")
       },
       noHandshake: true,
       port: {
@@ -782,8 +371,8 @@ var SignalRPCClient = class {
           try {
             this._socket.send(msg);
           } catch (err) {
-            log3.warn("send error", err, {
-              F: __dxlog_file3,
+            log2.warn("send error", err, {
+              F: __dxlog_file2,
               L: 85,
               S: this,
               C: (f, a) => f(...a)
@@ -811,19 +400,19 @@ var SignalRPCClient = class {
           await this._safeCloseRpc();
           return;
         }
-        log3(`RPC open ${this._url}`, void 0, {
-          F: __dxlog_file3,
+        log2(`RPC open ${this._url}`, void 0, {
+          F: __dxlog_file2,
           L: 110,
           S: this,
           C: (f, a) => f(...a)
         });
         this._callbacks.onConnected?.();
         this._connectTrigger.wake();
-        this._keepaliveCtx = new Context2(void 0, {
-          F: __dxlog_file3,
+        this._keepaliveCtx = new Context(void 0, {
+          F: __dxlog_file2,
           L: 113
         });
-        scheduleTaskInterval2(this._keepaliveCtx, async () => {
+        scheduleTaskInterval(this._keepaliveCtx, async () => {
           this._socket?.send("__ping__");
         }, SIGNAL_KEEPALIVE_INTERVAL);
       } catch (err) {
@@ -833,8 +422,8 @@ var SignalRPCClient = class {
       }
     };
     this._socket.onclose = async () => {
-      log3(`Disconnected ${this._url}`, void 0, {
-        F: __dxlog_file3,
+      log2(`Disconnected ${this._url}`, void 0, {
+        F: __dxlog_file2,
         L: 133,
         S: this,
         C: (f, a) => f(...a)
@@ -851,20 +440,20 @@ var SignalRPCClient = class {
       this._closed = true;
       this._callbacks.onError?.(event.error ?? new Error(event.message));
       await this._safeCloseRpc();
-      log3.warn(`Socket ${event.type ?? "unknown"} error`, {
+      log2.warn(`Socket ${event.type ?? "unknown"} error`, {
         message: event.message,
         url: this._url
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 149,
         S: this,
         C: (f, a) => f(...a)
       });
     };
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.end({
+    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.end({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 152,
       S: this,
       C: (f, a) => f(...a)
@@ -885,25 +474,25 @@ var SignalRPCClient = class {
         timeout: 1e3
       });
     } catch (err) {
-      const failureReason = err instanceof TimeoutError2 ? "timeout" : err?.constructor?.name ?? "unknown";
+      const failureReason = err instanceof TimeoutError ? "timeout" : err?.constructor?.name ?? "unknown";
       this._monitor.recordClientCloseFailure({
         failureReason
       });
     }
   }
   async join({ topic, peerId }) {
-    log3("join", {
+    log2("join", {
       topic,
       peerId,
       metadata: this._callbacks?.getMetadata?.()
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant2(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    invariant(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 179,
       S: this,
       A: [
@@ -921,16 +510,16 @@ var SignalRPCClient = class {
     return swarmStream;
   }
   async receiveMessages(peerId) {
-    log3("receiveMessages", {
+    log2("receiveMessages", {
       peerId
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant2(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    invariant(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 192,
       S: this,
       A: [
@@ -946,19 +535,19 @@ var SignalRPCClient = class {
     return messageStream;
   }
   async sendMessage({ author, recipient, payload }) {
-    log3("sendMessage", {
+    log2("sendMessage", {
       author,
       recipient,
       payload,
       metadata: this._callbacks?.getMetadata?.()
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file2,
       L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant2(!this._closed, "SignalRPCClient is closed", {
-      F: __dxlog_file3,
+    invariant(!this._closed, "SignalRPCClient is closed", {
+      F: __dxlog_file2,
       L: 211,
       S: this,
       A: [
@@ -979,8 +568,8 @@ var SignalRPCClient = class {
       this._connectTrigger.reset();
       await this._rpc.close();
     } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file3,
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
         L: 226,
         S: this,
         C: (f, a) => f(...a)
@@ -990,7 +579,7 @@ var SignalRPCClient = class {
 };
 
 // src/signal-client/signal-client.ts
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
+var __dxlog_file3 = "/__w/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;
@@ -998,11 +587,11 @@ var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class extends Resource {
   _host;
   _getMetadata;
-  _monitor;
-  _state;
+  _monitor = new SignalClientMonitor();
+  _state = SignalState.CLOSED;
   _lastError;
-  _lastReconciliationFailed;
-  _clientReady;
+  _lastReconciliationFailed = false;
+  _clientReady = new Trigger2();
   _connectionCtx;
   _client;
   _reconcileTask;
@@ -1010,15 +599,15 @@ var SignalClient = class extends Resource {
   /**
   * Number of milliseconds after which the connection will be attempted again in case of error.
   */
-  _reconnectAfter;
-  _instanceId;
+  _reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
+  _instanceId = PublicKey3.random().toHex();
   /**
   * @internal
   */
   localState;
-  statusChanged;
-  onMessage;
-  swarmEvent;
+  statusChanged = new Event2();
+  onMessage = new Event2();
+  swarmEvent = new Event2();
   /**
   * @param _host Signal server websocket URL.
   * @param onMessage called when a new message is received.
@@ -1026,7 +615,7 @@ var SignalClient = class extends Resource {
   * @param _getMetadata signal-message metadata provider, called for every message.
   */
   constructor(_host, _getMetadata) {
-    super(), this._host = _host, this._getMetadata = _getMetadata, this._monitor = new SignalClientMonitor(), this._state = SignalState.CLOSED, this._lastReconciliationFailed = false, this._clientReady = new Trigger2(), this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT, this._instanceId = PublicKey4.random().toHex(), this.statusChanged = new Event2(), this.onMessage = new Event2(), this.swarmEvent = new Event2();
+    super(), this._host = _host, this._getMetadata = _getMetadata;
     if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
@@ -1036,11 +625,11 @@ var SignalClient = class extends Resource {
     }, async (event) => this.swarmEvent.emit(event));
   }
   async _open() {
-    log4.trace("dxos.mesh.signal-client.open", trace6.begin({
+    log3.trace("dxos.mesh.signal-client.open", trace4.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file4,
-      L: 97,
+      F: __dxlog_file3,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1056,9 +645,9 @@ var SignalClient = class extends Resource {
         await cancelWithContext2(this._connectionCtx, this._clientReady.wait({
           timeout: 5e3
         }));
-        invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
-          F: __dxlog_file4,
-          L: 107,
+        invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
+          F: __dxlog_file3,
+          L: 106,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1078,7 +667,7 @@ var SignalClient = class extends Resource {
         throw err;
       }
     });
-    scheduleTaskInterval3(this._ctx, async () => {
+    scheduleTaskInterval2(this._ctx, async () => {
       if (this._state === SignalState.CONNECTED) {
         this._reconcileTask.schedule();
       }
@@ -1097,11 +686,11 @@ var SignalClient = class extends Resource {
       }
     });
     this._createClient();
-    log4.trace("dxos.mesh.signal-client.open", trace6.end({
+    log3.trace("dxos.mesh.signal-client.open", trace4.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file4,
-      L: 140,
+      F: __dxlog_file3,
+      L: 139,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1111,9 +700,9 @@ var SignalClient = class extends Resource {
       return;
     }
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
-      log4.warn("SignalClient error:", err, {
-        F: __dxlog_file4,
-        L: 149,
+      log3.warn("SignalClient error:", err, {
+        F: __dxlog_file3,
+        L: 148,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1121,9 +710,9 @@ var SignalClient = class extends Resource {
     this._scheduleReconcileAfterError();
   }
   async _close() {
-    log4("closing...", void 0, {
-      F: __dxlog_file4,
-      L: 155,
+    log3("closing...", void 0, {
+      F: __dxlog_file3,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1134,9 +723,9 @@ var SignalClient = class extends Resource {
     }
     this._setState(SignalState.CLOSED);
     await this._safeResetClient();
-    log4("closed", void 0, {
-      F: __dxlog_file4,
-      L: 163,
+    log3("closed", void 0, {
+      F: __dxlog_file3,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1150,66 +739,66 @@ var SignalClient = class extends Resource {
       ...this._monitor.getRecordedTimestamps()
     };
   }
-  async join(args) {
-    log4("joining", {
+  async join(_ctx, args) {
+    log3("joining", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
-      L: 177,
+      F: __dxlog_file3,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
     this._monitor.recordJoin();
     this.localState.join({
       topic: args.topic,
-      peerId: PublicKey4.from(args.peer.peerKey)
+      peerId: PublicKey3.from(args.peer.peerKey)
     });
     this._reconcileTask?.schedule();
   }
-  async leave(args) {
-    log4("leaving", {
+  async leave(_ctx, args) {
+    log3("leaving", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
-      L: 184,
+      F: __dxlog_file3,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
     this._monitor.recordLeave();
     this.localState.leave({
       topic: args.topic,
-      peerId: PublicKey4.from(args.peer.peerKey)
+      peerId: PublicKey3.from(args.peer.peerKey)
     });
   }
-  async query(params) {
+  async query(_ctx, params) {
     throw new Error("Not implemented");
   }
-  async sendMessage(msg) {
+  async sendMessage(_ctx, msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
-      invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
-        F: __dxlog_file4,
-        L: 196,
+      invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
+        F: __dxlog_file3,
+        L: 195,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
           "'Not connected to Signal Server'"
         ]
       });
-      invariant3(msg.author.peerKey, "Author key required", {
-        F: __dxlog_file4,
-        L: 197,
+      invariant2(msg.author.peerKey, "Author key required", {
+        F: __dxlog_file3,
+        L: 196,
         S: this,
         A: [
           "msg.author.peerKey",
           "'Author key required'"
         ]
       });
-      invariant3(msg.recipient.peerKey, "Recipient key required", {
-        F: __dxlog_file4,
-        L: 198,
+      invariant2(msg.recipient.peerKey, "Recipient key required", {
+        F: __dxlog_file3,
+        L: 197,
         S: this,
         A: [
           "msg.recipient.peerKey",
@@ -1217,69 +806,69 @@ var SignalClient = class extends Resource {
         ]
       });
       await this._client.sendMessage({
-        author: PublicKey4.from(msg.author.peerKey),
-        recipient: PublicKey4.from(msg.recipient.peerKey),
+        author: PublicKey3.from(msg.author.peerKey),
+        recipient: PublicKey3.from(msg.recipient.peerKey),
         payload: msg.payload
       });
     });
   }
   async subscribeMessages(peer) {
-    invariant3(peer.peerKey, "Peer key required", {
-      F: __dxlog_file4,
-      L: 208,
+    invariant2(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
+      L: 207,
       S: this,
       A: [
         "peer.peerKey",
         "'Peer key required'"
       ]
     });
-    log4("subscribing to messages", {
+    log3("subscribing to messages", {
       peer
     }, {
-      F: __dxlog_file4,
-      L: 209,
+      F: __dxlog_file3,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.subscribeMessages(PublicKey4.from(peer.peerKey));
+    this.localState.subscribeMessages(PublicKey3.from(peer.peerKey));
     this._reconcileTask?.schedule();
   }
   async unsubscribeMessages(peer) {
-    invariant3(peer.peerKey, "Peer key required", {
-      F: __dxlog_file4,
-      L: 215,
+    invariant2(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
+      L: 214,
       S: this,
       A: [
         "peer.peerKey",
         "'Peer key required'"
       ]
     });
-    log4("unsubscribing from messages", {
+    log3("unsubscribing from messages", {
       peer
     }, {
-      F: __dxlog_file4,
-      L: 216,
+      F: __dxlog_file3,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    this.localState.unsubscribeMessages(PublicKey4.from(peer.peerKey));
+    this.localState.unsubscribeMessages(PublicKey3.from(peer.peerKey));
   }
   _scheduleReconcileAfterError() {
-    scheduleTask2(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
+    scheduleTask(this._ctx, () => this._reconcileTask.schedule(), ERROR_RECONCILE_DELAY);
   }
   _createClient() {
-    log4("creating client", {
+    log3("creating client", {
       host: this._host,
       state: this._state
     }, {
-      F: __dxlog_file4,
-      L: 225,
+      F: __dxlog_file3,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant3(!this._client, "Client already created", {
-      F: __dxlog_file4,
-      L: 226,
+    invariant2(!this._client, "Client already created", {
+      F: __dxlog_file3,
+      L: 225,
       S: this,
       A: [
         "!this._client",
@@ -1289,9 +878,9 @@ var SignalClient = class extends Resource {
     this._monitor.recordConnectionStartTime();
     this._connectionCtx = this._ctx.derive();
     this._connectionCtx.onDispose(async () => {
-      log4("connection context disposed", void 0, {
-        F: __dxlog_file4,
-        L: 233,
+      log3("connection context disposed", void 0, {
+        F: __dxlog_file3,
+        L: 232,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1304,9 +893,9 @@ var SignalClient = class extends Resource {
         callbacks: {
           onConnected: () => {
             if (client === this._client) {
-              log4("socket connected", void 0, {
-                F: __dxlog_file4,
-                L: 244,
+              log3("socket connected", void 0, {
+                F: __dxlog_file3,
+                L: 243,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1317,11 +906,11 @@ var SignalClient = class extends Resource {
             if (client !== this._client) {
               return;
             }
-            log4("socket disconnected", {
+            log3("socket disconnected", {
               state: this._state
             }, {
-              F: __dxlog_file4,
-              L: 253,
+              F: __dxlog_file3,
+              L: 252,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1333,12 +922,12 @@ var SignalClient = class extends Resource {
           },
           onError: (error) => {
             if (client === this._client) {
-              log4("socket error", {
+              log3("socket error", {
                 error,
                 state: this._state
               }, {
-                F: __dxlog_file4,
-                L: 265,
+                F: __dxlog_file3,
+                L: 264,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1359,18 +948,18 @@ var SignalClient = class extends Resource {
     }
   }
   async _reconnect() {
-    log4(`reconnecting in ${this._reconnectAfter}ms`, {
+    log3(`reconnecting in ${this._reconnectAfter}ms`, {
       state: this._state
     }, {
-      F: __dxlog_file4,
-      L: 280,
+      F: __dxlog_file3,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === SignalState.RECONNECTING) {
-      log4.info("Signal api already reconnecting.", void 0, {
-        F: __dxlog_file4,
-        L: 283,
+      log3.info("Signal api already reconnecting.", void 0, {
+        F: __dxlog_file3,
+        L: 282,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1408,11 +997,11 @@ var SignalClient = class extends Resource {
   _setState(newState) {
     this._state = newState;
     this._monitor.recordStateChangeTime();
-    log4("signal state changed", {
+    log3("signal state changed", {
       status: this.getStatus()
     }, {
-      F: __dxlog_file4,
-      L: 324,
+      F: __dxlog_file3,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1434,298 +1023,23 @@ var SignalClient = class extends Resource {
   }
 };
 
-// src/signal-methods.ts
-var PeerInfoHash = ({ peerKey }) => peerKey;
-
-// src/signal-manager/memory-signal-manager.ts
-import { Event as Event3, Trigger as Trigger3 } from "@dxos/async";
-import { Context as Context3 } from "@dxos/context";
-import { invariant as invariant4 } from "@dxos/invariant";
-import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
-import { schema as schema3 } from "@dxos/protocols/proto";
-import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
-var MemorySignalManagerContext = class {
-  // Swarm messages.
-  swarmEvent = new Event3();
-  // Mapping from topic to set of peers.
-  swarms = new ComplexMap3(PublicKey5.hash);
-  // Map of connections for each peer for signaling.
-  connections = new ComplexMap3(PeerInfoHash);
-};
-var MemorySignalManager = class {
-  _context;
-  statusChanged;
-  swarmEvent;
-  onMessage;
-  /**  Will be used to emit SwarmEvents on .open() and .close() */
-  _joinedSwarms;
-  _ctx;
-  // TODO(dmaretskyi): Replace with callback.
-  _freezeTrigger;
-  constructor(_context) {
-    this._context = _context;
-    this.statusChanged = new Event3();
-    this.swarmEvent = new Event3();
-    this.onMessage = new Event3();
-    this._joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
-    this._freezeTrigger = new Trigger3().wake();
-    this._ctx = new Context3(void 0, {
-      F: __dxlog_file5,
-      L: 54
-    });
-    this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
-  }
-  async open() {
-    if (!this._ctx.disposed) {
-      return;
-    }
-    this._ctx = new Context3(void 0, {
-      F: __dxlog_file5,
-      L: 63
-    });
-    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 ComplexSet3(({ 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 }) {
-    invariant4(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 92,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    this._joinedSwarms.add({
-      topic,
-      peer
-    });
-    if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new ComplexSet3(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 }) {
-    invariant4(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 124,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    this._joinedSwarms.delete({
-      topic,
-      peer
-    });
-    if (!this._context.swarms.has(topic)) {
-      this._context.swarms.set(topic, new ComplexSet3(PeerInfoHash));
-    }
-    this._context.swarms.get(topic).delete(peer);
-    const swarmEvent = {
-      topic,
-      peerLeft: {
-        peer
-      }
-    };
-    this._context.swarmEvent.emit(swarmEvent);
-  }
-  async query(request) {
-    throw new Error("Not implemented");
-  }
-  async sendMessage({ author, recipient, payload }) {
-    log5("send message", {
-      author,
-      recipient,
-      ...dec(payload)
-    }, {
-      F: __dxlog_file5,
-      L: 157,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    invariant4(recipient, void 0, {
-      F: __dxlog_file5,
-      L: 159,
-      S: this,
-      A: [
-        "recipient",
-        ""
-      ]
-    });
-    invariant4(!this._ctx.disposed, "Closed", {
-      F: __dxlog_file5,
-      L: 160,
-      S: this,
-      A: [
-        "!this._ctx.disposed",
-        "'Closed'"
-      ]
-    });
-    await this._freezeTrigger.wait();
-    const remote = this._context.connections.get(recipient);
-    if (!remote) {
-      log5.warn("recipient is not subscribed for messages", {
-        author,
-        recipient
-      }, {
-        F: __dxlog_file5,
-        L: 166,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    if (remote._ctx.disposed) {
-      log5.warn("recipient is disposed", {
-        author,
-        recipient
-      }, {
-        F: __dxlog_file5,
-        L: 171,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    remote._freezeTrigger.wait().then(() => {
-      if (remote._ctx.disposed) {
-        log5.warn("recipient is disposed", {
-          author,
-          recipient
-        }, {
-          F: __dxlog_file5,
-          L: 179,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        return;
-      }
-      log5("receive message", {
-        author,
-        recipient,
-        ...dec(payload)
-      }, {
-        F: __dxlog_file5,
-        L: 183,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      remote.onMessage.emit({
-        author,
-        recipient,
-        payload
-      });
-    }).catch((err) => {
-      log5.error("error while waiting for freeze", {
-        err
-      }, {
-        F: __dxlog_file5,
-        L: 188,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    });
-  }
-  async subscribeMessages(peerInfo) {
-    log5("subscribing", {
-      peerInfo
-    }, {
-      F: __dxlog_file5,
-      L: 193,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._context.connections.set(peerInfo, this);
-  }
-  async unsubscribeMessages(peerInfo) {
-    log5("unsubscribing", {
-      peerInfo
-    }, {
-      F: __dxlog_file5,
-      L: 198,
-      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 = schema3.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 {};
-};
-
 // src/signal-manager/websocket-signal-manager.ts
-import { Event as Event4, sleep as sleep2, synchronized } from "@dxos/async";
+import { Event as Event3, sleep as sleep2, synchronized } from "@dxos/async";
 import { LifecycleState, Resource as Resource2 } from "@dxos/context";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
-import { RateLimitExceededError, TimeoutError as TimeoutError3, trace as trace8 } from "@dxos/protocols";
+import { invariant as invariant3 } from "@dxos/invariant";
+import { PublicKey as PublicKey4 } from "@dxos/keys";
+import { log as log4 } from "@dxos/log";
+import { RateLimitExceededError, TimeoutError as TimeoutError2, trace as trace6 } from "@dxos/protocols";
 import { BitField, safeAwaitAll as safeAwaitAll2 } from "@dxos/util";
 
 // src/signal-manager/websocket-signal-manager-monitor.ts
-import { trace as trace7 } from "@dxos/tracing";
+import { trace as trace5 } from "@dxos/tracing";
 var WebsocketSignalManagerMonitor = class {
   recordRateLimitExceeded() {
-    trace7.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
+    trace5.metrics.increment("dxos.mesh.signal.signal-manager.rate-limit-hit", 1);
   }
   recordServerFailure(params) {
-    trace7.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
+    trace5.metrics.increment("dxos.mesh.signal.signal-manager.server-failure", 1, {
       tags: {
         server: params.serverName,
         restarted: params.willRestart
@@ -1741,30 +1055,30 @@ 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 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
+var __dxlog_file4 = "/__w/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 Resource2 {
   _hosts;
   _getMetadata;
-  _servers;
-  _monitor;
+  _servers = /* @__PURE__ */ new Map();
+  _monitor = new WebsocketSignalManagerMonitor();
   /**
   * Used to avoid logging failed server restarts more than once until the server actually recovers.
   */
   _failedServersBitfield;
-  failureCount;
-  statusChanged;
-  swarmEvent;
-  onMessage;
-  _instanceId;
+  failureCount = /* @__PURE__ */ new Map();
+  statusChanged = new Event3();
+  swarmEvent = new Event3();
+  onMessage = new Event3();
+  _instanceId = PublicKey4.random().toHex();
   constructor(_hosts, _getMetadata) {
-    super(), this._hosts = _hosts, this._getMetadata = _getMetadata, this._servers = /* @__PURE__ */ new Map(), this._monitor = new WebsocketSignalManagerMonitor(), this.failureCount = /* @__PURE__ */ new Map(), this.statusChanged = new Event4(), this.swarmEvent = new Event4(), this.onMessage = new Event4(), this._instanceId = PublicKey6.random().toHex();
-    log6("Created WebsocketSignalManager", {
+    super(), this._hosts = _hosts, this._getMetadata = _getMetadata;
+    log4("Created WebsocketSignalManager", {
       hosts: this._hosts
     }, {
-      F: __dxlog_file6,
-      L: 59,
+      F: __dxlog_file4,
+      L: 58,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1782,28 +1096,28 @@ var WebsocketSignalManager = class extends Resource2 {
     this._failedServersBitfield = BitField.zeros(this._hosts.length);
   }
   async _open() {
-    log6("open signal manager", {
+    log4("open signal manager", {
       hosts: this._hosts
     }, {
-      F: __dxlog_file6,
-      L: 79,
+      F: __dxlog_file4,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
-    log6.trace("dxos.mesh.websocket-signal-manager.open", trace8.begin({
+    log4.trace("dxos.mesh.websocket-signal-manager.open", trace6.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
-      L: 80,
+      F: __dxlog_file4,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
     await safeAwaitAll2(this._servers.values(), (server) => server.open());
-    log6.trace("dxos.mesh.websocket-signal-manager.open", trace8.end({
+    log4.trace("dxos.mesh.websocket-signal-manager.open", trace6.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file6,
-      L: 84,
+      F: __dxlog_file4,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1812,17 +1126,17 @@ var WebsocketSignalManager = class extends Resource2 {
     await safeAwaitAll2(this._servers.values(), (server) => server.close());
   }
   async restartServer(serverName) {
-    log6("restarting server", {
+    log4("restarting server", {
       serverName
     }, {
-      F: __dxlog_file6,
-      L: 92,
+      F: __dxlog_file4,
+      L: 91,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 93,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 92,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1830,9 +1144,9 @@ var WebsocketSignalManager = class extends Resource2 {
       ]
     });
     const server = this._servers.get(serverName);
-    invariant5(server, "server not found", {
-      F: __dxlog_file6,
-      L: 96,
+    invariant3(server, "server not found", {
+      F: __dxlog_file4,
+      L: 95,
       S: this,
       A: [
         "server",
@@ -1846,69 +1160,69 @@ var WebsocketSignalManager = class extends Resource2 {
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
-  async join({ topic, peer }) {
-    log6("join", {
+  async join(_ctx, { topic, peer }) {
+    log4("join", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
-      L: 109,
+      F: __dxlog_file4,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 110,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 109,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    await this._forEachServer((server) => server.join({
+    await this._forEachServer((server) => server.join(_ctx, {
       topic,
       peer
     }));
   }
-  async leave({ topic, peer }) {
-    log6("leaving", {
+  async leave(_ctx, { topic, peer }) {
+    log4("leaving", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
-      L: 116,
+      F: __dxlog_file4,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 117,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 116,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    await this._forEachServer((server) => server.leave({
+    await this._forEachServer((server) => server.leave(_ctx, {
       topic,
       peer
     }));
   }
-  async query({ topic }) {
+  async query(_ctx, { topic }) {
     throw new Error("Not implemented");
   }
-  async sendMessage({ author, recipient, payload }) {
-    log6("signal", {
+  async sendMessage(_ctx, { author, recipient, payload }) {
+    log4("signal", {
       recipient
     }, {
-      F: __dxlog_file6,
-      L: 126,
+      F: __dxlog_file4,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 127,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 126,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1916,37 +1230,37 @@ var WebsocketSignalManager = class extends Resource2 {
       ]
     });
     void this._forEachServer(async (server, serverName, index) => {
-      void server.sendMessage({
+      void server.sendMessage(_ctx, {
         author,
         recipient,
         payload
       }).then(() => this._clearServerFailedFlag(serverName, index)).catch((err) => {
         if (err instanceof RateLimitExceededError) {
-          log6.info("WSS rate limit exceeded", {
+          log4.info("WSS rate limit exceeded", {
             err
           }, {
-            F: __dxlog_file6,
-            L: 135,
+            F: __dxlog_file4,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
           this._monitor.recordRateLimitExceeded();
-        } else if (err instanceof TimeoutError3 || err.constructor.name === "TimeoutError") {
-          log6.info("WSS sendMessage timeout", {
+        } else if (err instanceof TimeoutError2 || err.constructor.name === "TimeoutError") {
+          log4.info("WSS sendMessage timeout", {
             err
           }, {
-            F: __dxlog_file6,
-            L: 138,
+            F: __dxlog_file4,
+            L: 137,
             S: this,
             C: (f, a) => f(...a)
           });
           void this.checkServerFailure(serverName, index);
         } else {
-          log6.warn(`error sending to ${serverName}`, {
+          log4.warn(`error sending to ${serverName}`, {
             err
           }, {
-            F: __dxlog_file6,
-            L: 141,
+            F: __dxlog_file4,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1964,12 +1278,12 @@ var WebsocketSignalManager = class extends Resource2 {
     });
     if (isRestartRequired) {
       if (!BitField.get(this._failedServersBitfield, index)) {
-        log6.warn("too many failures for ws-server, restarting", {
+        log4.warn("too many failures for ws-server, restarting", {
           serverName,
           failureCount
         }, {
-          F: __dxlog_file6,
-          L: 155,
+          F: __dxlog_file4,
+          L: 154,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1983,11 +1297,11 @@ var WebsocketSignalManager = class extends Resource2 {
   }
   _clearServerFailedFlag(serverName, index) {
     if (BitField.get(this._failedServersBitfield, index)) {
-      log6.info("server connection restored", {
+      log4.info("server connection restored", {
         serverName
       }, {
-        F: __dxlog_file6,
-        L: 168,
+        F: __dxlog_file4,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1996,17 +1310,17 @@ var WebsocketSignalManager = class extends Resource2 {
     }
   }
   async subscribeMessages(peer) {
-    log6("subscribed for message stream", {
+    log4("subscribed for message stream", {
       peer
     }, {
-      F: __dxlog_file6,
-      L: 175,
+      F: __dxlog_file4,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 176,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 175,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2016,17 +1330,17 @@ var WebsocketSignalManager = class extends Resource2 {
     await this._forEachServer(async (server) => server.subscribeMessages(peer));
   }
   async unsubscribeMessages(peer) {
-    log6("subscribed for message stream", {
+    log4("subscribed for message stream", {
       peer
     }, {
-      F: __dxlog_file6,
-      L: 182,
+      F: __dxlog_file4,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
-      L: 183,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
+      L: 182,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2050,29 +1364,29 @@ _ts_decorate([
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
 
 // src/signal-manager/edge-signal-manager.ts
-import { Event as Event5, scheduleMicroTask } from "@dxos/async";
+import { Event as Event4, scheduleMicroTask } from "@dxos/async";
 import { Resource as Resource3, cancelWithContext as cancelWithContext3 } from "@dxos/context";
-import { protocol } from "@dxos/edge-client";
-import { invariant as invariant6 } from "@dxos/invariant";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import { EdgeIdentityChangedError, protocol } from "@dxos/edge-client";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { PublicKey as PublicKey5 } from "@dxos/keys";
+import { log as log5 } from "@dxos/log";
 import { EdgeService } from "@dxos/protocols";
 import { bufWkt } from "@dxos/protocols/buf";
 import { SwarmRequest_Action as SwarmRequestAction, SwarmRequestSchema, SwarmResponseSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet4 } from "@dxos/util";
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
+import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2 } from "@dxos/util";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
 var EdgeSignalManager = class extends Resource3 {
   /**
   * @deprecated
   */
-  swarmEvent = new Event5();
-  swarmState = new Event5();
-  onMessage = new Event5();
+  swarmEvent = new Event4();
+  swarmState = new Event4();
+  onMessage = new Event4();
   /**
   * Swarm key -> { peer: <own state payload>, joinedPeers: <state of swarm> }.
   */
   // TODO(mykola): This class should not contain swarm state joinedPeers. Temporary before network-manager API changes to accept list of peers.
-  _swarmPeers = new ComplexMap4(PublicKey7.hash);
+  _swarmPeers = new ComplexMap2(PublicKey5.hash);
   _edgeConnection;
   constructor({ edgeConnection }) {
     super();
@@ -2087,17 +1401,17 @@ var EdgeSignalManager = class extends Resource3 {
   /**
   * Warning: PeerInfo is inferred from edgeConnection.
   */
-  async join({ topic, peer }) {
+  async join(ctx, { topic, peer }) {
     if (!this._matchSelfPeerInfo(peer)) {
-      log7.warn("ignoring peer info on join request", {
+      log5.warn("ignoring peer info on join request", {
         peer,
         expected: {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
       }, {
-        F: __dxlog_file7,
-        L: 66,
+        F: __dxlog_file5,
+        L: 65,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2106,9 +1420,9 @@ var EdgeSignalManager = class extends Resource3 {
     }
     this._swarmPeers.set(topic, {
       lastState: peer.state,
-      joinedPeers: new ComplexSet4(PeerInfoHash)
+      joinedPeers: new ComplexSet2(PeerInfoHash)
     });
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
       serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, peer),
       payload: {
@@ -2119,22 +1433,29 @@ var EdgeSignalManager = class extends Resource3 {
       }
     }));
   }
-  async leave({ topic, peer }) {
+  async leave(ctx, { topic, peer }) {
     this._swarmPeers.delete(topic);
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
-      serviceId: EdgeService.SWARM,
-      source: createMessageSource(topic, peer),
-      payload: {
-        action: SwarmRequestAction.LEAVE,
-        swarmKeys: [
-          topic.toHex()
-        ]
+    try {
+      await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
+        serviceId: EdgeService.SWARM,
+        source: createMessageSource(topic, peer),
+        payload: {
+          action: SwarmRequestAction.LEAVE,
+          swarmKeys: [
+            topic.toHex()
+          ]
+        }
+      }));
+    } catch (err) {
+      if (err instanceof EdgeIdentityChangedError) {
+        return;
       }
-    }));
+      throw err;
+    }
   }
-  async query({ topic }) {
+  async query(ctx, { topic }) {
     const response = cancelWithContext3(this._ctx, this.swarmState.waitFor((state) => state.swarmKey === topic.toHex()));
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
       serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, {
         peerKey: this._edgeConnection.peerKey,
@@ -2149,22 +1470,22 @@ var EdgeSignalManager = class extends Resource3 {
     }));
     return response;
   }
-  async sendMessage(message) {
+  async sendMessage(ctx, message) {
     if (!this._matchSelfPeerInfo(message.author)) {
-      log7.warn("ignoring author on send request", {
+      log5.warn("ignoring author on send request", {
         author: message.author,
         expected: {
           peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
       }, {
-        F: __dxlog_file7,
-        L: 122,
+        F: __dxlog_file5,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    await this._edgeConnection.send(protocol.createMessage(bufWkt.AnySchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(bufWkt.AnySchema, {
       serviceId: EdgeService.SIGNAL,
       source: message.author,
       target: [
@@ -2192,9 +1513,9 @@ var EdgeSignalManager = class extends Resource3 {
     }
   }
   _processSwarmResponse(message) {
-    invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
-      F: __dxlog_file7,
-      L: 159,
+    invariant4(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
+      L: 171,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2203,13 +1524,13 @@ var EdgeSignalManager = class extends Resource3 {
     });
     const payload = protocol.getPayload(message, SwarmResponseSchema);
     this.swarmState.emit(payload);
-    const topic = PublicKey7.from(payload.swarmKey);
+    const topic = PublicKey5.from(payload.swarmKey);
     if (!this._swarmPeers.has(topic)) {
       return;
     }
     const { joinedPeers: oldPeers } = this._swarmPeers.get(topic);
     const timestamp = message.timestamp ? new Date(Date.parse(message.timestamp)) : /* @__PURE__ */ new Date();
-    const newPeers = new ComplexSet4(PeerInfoHash, payload.peers);
+    const newPeers = new ComplexSet2(PeerInfoHash, payload.peers);
     for (const peer of newPeers) {
       if (oldPeers.has(peer)) {
         continue;
@@ -2236,9 +1557,9 @@ var EdgeSignalManager = class extends Resource3 {
     this._swarmPeers.get(topic).joinedPeers = newPeers;
   }
   _processMessage(message) {
-    invariant6(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
-      F: __dxlog_file7,
-      L: 197,
+    invariant4(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
+      L: 209,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2246,27 +1567,27 @@ var EdgeSignalManager = class extends Resource3 {
       ]
     });
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
-    invariant6(message.source, "source is missing", {
-      F: __dxlog_file7,
-      L: 199,
+    invariant4(message.source, "source is missing", {
+      F: __dxlog_file5,
+      L: 211,
       S: this,
       A: [
         "message.source",
         "'source is missing'"
       ]
     });
-    invariant6(message.target, "target is missing", {
-      F: __dxlog_file7,
-      L: 200,
+    invariant4(message.target, "target is missing", {
+      F: __dxlog_file5,
+      L: 212,
       S: this,
       A: [
         "message.target",
         "'target is missing'"
       ]
     });
-    invariant6(message.target.length === 1, "target should have exactly one item", {
-      F: __dxlog_file7,
-      L: 201,
+    invariant4(message.target.length === 1, "target should have exactly one item", {
+      F: __dxlog_file5,
+      L: 213,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2286,16 +1607,16 @@ var EdgeSignalManager = class extends Resource3 {
     return peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityKey === this._edgeConnection.identityKey);
   }
   async _rejoinAllSwarms() {
-    log7("rejoin swarms", {
+    log5("rejoin swarms", {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
-      F: __dxlog_file7,
-      L: 220,
+      F: __dxlog_file5,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const [topic, { lastState }] of this._swarmPeers.entries()) {
-      await this.join({
+      await this.join(this._ctx, {
         topic,
         peer: {
           peerKey: this._edgeConnection.peerKey,
@@ -2314,17 +1635,17 @@ var createMessageSource = (topic, peerInfo) => {
 };
 
 // src/signal-manager/utils.ts
-import { invariant as invariant7 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
+import { invariant as invariant5 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
 import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
 var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   identityService.queryIdentity().subscribe((idqr) => {
     if (!idqr?.identity?.identityKey) {
-      log8("empty response from identity service", {
+      log6("empty response from identity service", {
         idqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 21,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2335,18 +1656,18 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
   });
   devicesService.queryDevices().subscribe((dqr) => {
     if (!dqr || !dqr.devices || dqr.devices.length === 0) {
-      log8("empty response from device service", {
+      log6("empty response from device service", {
         device: dqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 30,
         S: void 0,
         C: (f, a) => f(...a)
       });
       return;
     }
-    invariant7(dqr, "empty response from device service", {
-      F: __dxlog_file8,
+    invariant5(dqr, "empty response from device service", {
+      F: __dxlog_file6,
       L: 33,
       S: void 0,
       A: [
@@ -2356,10 +1677,10 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     });
     const thisDevice = dqr.devices.find((device) => device.kind === DeviceKind.CURRENT);
     if (!thisDevice) {
-      log8("no current device", {
+      log6("no current device", {
         device: dqr
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file6,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)
@@ -2369,15 +1690,14 @@ var setIdentityTags = ({ identityService, devicesService, setTag }) => {
     setTag("deviceKey", thisDevice.deviceKey.truncate());
   });
 };
-
 export {
+  EdgeSignalManager,
+  MemorySignalManager,
+  MemorySignalManagerContext,
   Messenger,
-  SignalClient,
   PeerInfoHash,
-  MemorySignalManagerContext,
-  MemorySignalManager,
+  SignalClient,
   WebsocketSignalManager,
-  EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-TPBTNKLU.mjs.map
+//# sourceMappingURL=index.mjs.map