@dxos/messaging 0.8.4-main.c4373fc → 0.8.4-main.c85a9c8dae

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

@@ -1,450 +1,38 @@
 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
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-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 {
-  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)
-      });
-    }
-  }
-  constructor({ signalManager, retryDelay = 1e3 }) {
-    _define_property(this, "_monitor", new MessengerMonitor());
-    _define_property(this, "_signalManager", void 0);
-    _define_property(this, "_listeners", new ComplexMap(({ peerId, payloadType }) => peerId + payloadType));
-    _define_property(this, "_defaultListeners", /* @__PURE__ */ new Map());
-    _define_property(this, "_onAckCallbacks", new ComplexMap(PublicKey.hash));
-    _define_property(this, "_receivedMessages", new ComplexSet(PublicKey.hash));
-    _define_property(this, "_toClear", new ComplexSet(PublicKey.hash));
-    _define_property(this, "_ctx", void 0);
-    _define_property(this, "_closed", true);
-    _define_property(this, "_retryDelay", void 0);
-    this._signalManager = signalManager;
-    this._retryDelay = retryDelay;
-    this.open();
-  }
-};
+import {
+  MemorySignalManager,
+  MemorySignalManagerContext,
+  Messenger,
+  PeerInfoHash
+} from "./chunk-5MOQVHHI.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";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { trace } from "@dxos/tracing";
 var SignalClientMonitor = class {
+  _performance = {
+    sentMessages: 0,
+    receivedMessages: 0,
+    reconnectCounter: 0,
+    joinCounter: 0,
+    leaveCounter: 0
+  };
+  /**
+  * Timestamp of when the connection attempt was began.
+  */
+  _connectionStarted = /* @__PURE__ */ new Date();
+  /**
+  * Timestamp of last state change.
+  */
+  _lastStateChange = /* @__PURE__ */ new Date();
   getRecordedTimestamps() {
     return {
       connectionStarted: this._connectionStarted,
@@ -459,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
       }
@@ -473,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)
     });
   }
@@ -488,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
@@ -505,26 +93,15 @@ 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
       }
     });
   }
-  constructor() {
-    _define_property2(this, "_performance", {
-      sentMessages: 0,
-      receivedMessages: 0,
-      reconnectCounter: 0,
-      joinCounter: 0,
-      leaveCounter: 0
-    });
-    _define_property2(this, "_connectionStarted", /* @__PURE__ */ new Date());
-    _define_property2(this, "_lastStateChange", /* @__PURE__ */ new Date());
-  }
 };
 var getByteCount = (message) => {
   return message.author.peerKey.length + message.recipient.peerKey.length + message.payload.type_url.length + message.payload.value.length;
@@ -538,24 +115,39 @@ 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";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-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 = new ComplexMap(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired joined topic and peerId.
+  */
+  _joinedTopics = new ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired message subscriptions.
+  */
+  _subscribedMessages = new ComplexSet(({ peerId }) => peerId.toHex());
+  /**
+  * Message streams. Keys represents actually subscribed peers.
+  * @internal
+  */
+  messageStreams = new ComplexMap((key) => key.toHex());
+  /**
+  * Event to use in tests to wait till subscription is successfully established.
+  * @internal
+  */
+  reconciled = new Event();
+  constructor(_onMessage, _onSwarmEvent) {
+    this._onMessage = _onMessage;
+    this._onSwarmEvent = _onSwarmEvent;
+  }
   async safeCloseStreams() {
     const streams = [
       ...this._swarmStreams.values()
@@ -595,10 +187,10 @@ var SignalLocalState = class {
     });
   }
   unsubscribeMessages(peerId) {
-    log2("unsubscribing from messages", {
+    log("unsubscribing from messages", {
       peerId
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file,
       L: 80,
       S: this,
       C: (f, a) => f(...a)
@@ -647,10 +239,10 @@ var SignalLocalState = class {
           topic,
           peerId
         })) {
-          log2("swarm event", {
+          log("swarm event", {
             swarmEvent
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file,
             L: 116,
             S: this,
             C: (f, a) => f(...a)
@@ -660,7 +252,7 @@ var SignalLocalState = class {
             peerAvailable: {
               ...swarmEvent.peerAvailable,
               peer: {
-                peerKey: PublicKey2.from(swarmEvent.peerAvailable.peer).toHex()
+                peerKey: PublicKey.from(swarmEvent.peerAvailable.peer).toHex()
               }
             }
           } : {
@@ -668,7 +260,7 @@ var SignalLocalState = class {
             peerLeft: {
               ...swarmEvent.peerLeft,
               peer: {
-                peerKey: PublicKey2.from(swarmEvent.peerLeft.peer).toHex()
+                peerKey: PublicKey.from(swarmEvent.peerLeft.peer).toHex()
               }
             }
           };
@@ -702,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
           };
@@ -715,40 +307,24 @@ var SignalLocalState = class {
       this.messageStreams.set(peerId, messageStream);
     }
   }
-  constructor(_onMessage, _onSwarmEvent) {
-    _define_property3(this, "_onMessage", void 0);
-    _define_property3(this, "_onSwarmEvent", void 0);
-    _define_property3(this, "_swarmStreams", void 0);
-    _define_property3(this, "_joinedTopics", void 0);
-    _define_property3(this, "_subscribedMessages", void 0);
-    _define_property3(this, "messageStreams", void 0);
-    _define_property3(this, "reconciled", void 0);
-    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();
-  }
 };
 
 // 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
       }
@@ -757,22 +333,132 @@ var SignalRpcClientMonitor = class {
 };
 
 // src/signal-client/signal-rpc-client.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-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;
+  _rpc;
+  _connectTrigger = new Trigger();
+  _keepaliveCtx;
+  _closed = false;
+  _url;
+  _callbacks;
+  _closeComplete = new Trigger();
+  _monitor = new SignalRpcClientMonitor();
+  constructor({ url, callbacks = {} }) {
+    const traceId = PublicKey2.random().toHex();
+    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.begin({
+      id: traceId
+    }), {
+      F: __dxlog_file2,
+      L: 66,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._url = url;
+    this._callbacks = callbacks;
+    this._socket = new WebSocket(this._url);
+    this._rpc = createProtoRpcPeer({
+      requested: {
+        Signal: schema.getService("dxos.mesh.signal.Signal")
+      },
+      noHandshake: true,
+      port: {
+        send: (msg) => {
+          if (this._closed) {
+            return;
+          }
+          try {
+            this._socket.send(msg);
+          } catch (err) {
+            log2.warn("send error", err, {
+              F: __dxlog_file2,
+              L: 85,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+        },
+        subscribe: (cb) => {
+          this._socket.onmessage = async (msg) => {
+            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
+              cb(Buffer.from(await msg.data.arrayBuffer()));
+            } else {
+              cb(msg.data);
+            }
+          };
+        }
+      },
+      encodingOptions: {
+        preserveAny: true
+      }
+    });
+    this._socket.onopen = async () => {
+      try {
+        await this._rpc.open();
+        if (this._closed) {
+          await this._safeCloseRpc();
+          return;
+        }
+        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 Context(void 0, {
+          F: __dxlog_file2,
+          L: 113
+        });
+        scheduleTaskInterval(this._keepaliveCtx, async () => {
+          this._socket?.send("__ping__");
+        }, SIGNAL_KEEPALIVE_INTERVAL);
+      } catch (err) {
+        this._callbacks.onError?.(err);
+        this._socket.close();
+        this._closed = true;
+      }
+    };
+    this._socket.onclose = async () => {
+      log2(`Disconnected ${this._url}`, void 0, {
+        F: __dxlog_file2,
+        L: 133,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._callbacks.onDisconnected?.();
+      this._closeComplete.wake();
+      await this.close();
+    };
+    this._socket.onerror = async (event) => {
+      if (this._closed) {
+        this._socket.close();
+        return;
+      }
+      this._closed = true;
+      this._callbacks.onError?.(event.error ?? new Error(event.message));
+      await this._safeCloseRpc();
+      log2.warn(`Socket ${event.type ?? "unknown"} error`, {
+        message: event.message,
+        url: this._url
+      }, {
+        F: __dxlog_file2,
+        L: 149,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    };
+    log2.trace("dxos.mesh.signal-rpc-client.constructor", trace3.end({
+      id: traceId
+    }), {
+      F: __dxlog_file2,
+      L: 152,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   async close() {
     if (this._closed) {
       return;
@@ -788,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: [
@@ -824,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: [
@@ -849,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: [
@@ -874,172 +560,75 @@ var SignalRPCClient = class {
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
       payload,
-      metadata: this._callbacks?.getMetadata?.()
-    });
-  }
-  async _safeCloseRpc() {
-    try {
-      this._connectTrigger.reset();
-      await this._rpc.close();
-    } catch (err) {
-      log3.catch(err, void 0, {
-        F: __dxlog_file3,
-        L: 226,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  constructor({ url, callbacks = {} }) {
-    _define_property4(this, "_socket", void 0);
-    _define_property4(this, "_rpc", void 0);
-    _define_property4(this, "_connectTrigger", new Trigger());
-    _define_property4(this, "_keepaliveCtx", void 0);
-    _define_property4(this, "_closed", false);
-    _define_property4(this, "_url", void 0);
-    _define_property4(this, "_callbacks", void 0);
-    _define_property4(this, "_closeComplete", new Trigger());
-    _define_property4(this, "_monitor", new SignalRpcClientMonitor());
-    const traceId = PublicKey3.random().toHex();
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.begin({
-      id: traceId
-    }), {
-      F: __dxlog_file3,
-      L: 66,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._url = url;
-    this._callbacks = callbacks;
-    this._socket = new WebSocket(this._url);
-    this._rpc = createProtoRpcPeer({
-      requested: {
-        Signal: schema2.getService("dxos.mesh.signal.Signal")
-      },
-      noHandshake: true,
-      port: {
-        send: (msg) => {
-          if (this._closed) {
-            return;
-          }
-          try {
-            this._socket.send(msg);
-          } catch (err) {
-            log3.warn("send error", err, {
-              F: __dxlog_file3,
-              L: 85,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        },
-        subscribe: (cb) => {
-          this._socket.onmessage = async (msg) => {
-            if (typeof Blob !== "undefined" && msg.data instanceof Blob) {
-              cb(Buffer.from(await msg.data.arrayBuffer()));
-            } else {
-              cb(msg.data);
-            }
-          };
-        }
-      },
-      encodingOptions: {
-        preserveAny: true
-      }
+      metadata: this._callbacks?.getMetadata?.()
     });
-    this._socket.onopen = async () => {
-      try {
-        await this._rpc.open();
-        if (this._closed) {
-          await this._safeCloseRpc();
-          return;
-        }
-        log3(`RPC open ${this._url}`, void 0, {
-          F: __dxlog_file3,
-          L: 110,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._callbacks.onConnected?.();
-        this._connectTrigger.wake();
-        this._keepaliveCtx = new Context2(void 0, {
-          F: __dxlog_file3,
-          L: 113
-        });
-        scheduleTaskInterval2(this._keepaliveCtx, async () => {
-          this._socket?.send("__ping__");
-        }, SIGNAL_KEEPALIVE_INTERVAL);
-      } catch (err) {
-        this._callbacks.onError?.(err);
-        this._socket.close();
-        this._closed = true;
-      }
-    };
-    this._socket.onclose = async () => {
-      log3(`Disconnected ${this._url}`, void 0, {
-        F: __dxlog_file3,
-        L: 133,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      this._callbacks.onDisconnected?.();
-      this._closeComplete.wake();
-      await this.close();
-    };
-    this._socket.onerror = async (event) => {
-      if (this._closed) {
-        this._socket.close();
-        return;
-      }
-      this._closed = true;
-      this._callbacks.onError?.(event.error ?? new Error(event.message));
-      await this._safeCloseRpc();
-      log3.warn(`Socket ${event.type ?? "unknown"} error`, {
-        message: event.message,
-        url: this._url
-      }, {
-        F: __dxlog_file3,
-        L: 149,
+  }
+  async _safeCloseRpc() {
+    try {
+      this._connectTrigger.reset();
+      await this._rpc.close();
+    } catch (err) {
+      log2.catch(err, void 0, {
+        F: __dxlog_file2,
+        L: 226,
         S: this,
         C: (f, a) => f(...a)
       });
-    };
-    log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.end({
-      id: traceId
-    }), {
-      F: __dxlog_file3,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }
   }
 };
 
 // src/signal-client/signal-client.ts
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-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;
 var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class extends Resource {
+  _host;
+  _getMetadata;
+  _monitor = new SignalClientMonitor();
+  _state = SignalState.CLOSED;
+  _lastError;
+  _lastReconciliationFailed = false;
+  _clientReady = new Trigger2();
+  _connectionCtx;
+  _client;
+  _reconcileTask;
+  _reconnectTask;
+  /**
+  * Number of milliseconds after which the connection will be attempted again in case of error.
+  */
+  _reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
+  _instanceId = PublicKey3.random().toHex();
+  /**
+  * @internal
+  */
+  localState;
+  statusChanged = new Event2();
+  onMessage = new Event2();
+  swarmEvent = new Event2();
+  /**
+  * @param _host Signal server websocket URL.
+  * @param onMessage called when a new message is received.
+  * @param onSwarmEvent called when a new swarm event is received.
+  * @param _getMetadata signal-message metadata provider, called for every message.
+  */
+  constructor(_host, _getMetadata) {
+    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}`);
+    }
+    this.localState = new SignalLocalState(async (message) => {
+      this._monitor.recordMessageReceived(message);
+      this.onMessage.emit(message);
+    }, 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,
+      F: __dxlog_file3,
       L: 97,
       S: this,
       C: (f, a) => f(...a)
@@ -1056,8 +645,8 @@ 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,
+        invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
+          F: __dxlog_file3,
           L: 107,
           S: this,
           A: [
@@ -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,10 +686,10 @@ 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,
+      F: __dxlog_file3,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
@@ -1111,8 +700,8 @@ var SignalClient = class extends Resource {
       return;
     }
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
-      log4.warn("SignalClient error:", err, {
-        F: __dxlog_file4,
+      log3.warn("SignalClient error:", err, {
+        F: __dxlog_file3,
         L: 149,
         S: this,
         C: (f, a) => f(...a)
@@ -1121,8 +710,8 @@ var SignalClient = class extends Resource {
     this._scheduleReconcileAfterError();
   }
   async _close() {
-    log4("closing...", void 0, {
-      F: __dxlog_file4,
+    log3("closing...", void 0, {
+      F: __dxlog_file3,
       L: 155,
       S: this,
       C: (f, a) => f(...a)
@@ -1134,8 +723,8 @@ var SignalClient = class extends Resource {
     }
     this._setState(SignalState.CLOSED);
     await this._safeResetClient();
-    log4("closed", void 0, {
-      F: __dxlog_file4,
+    log3("closed", void 0, {
+      F: __dxlog_file3,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
@@ -1151,11 +740,11 @@ var SignalClient = class extends Resource {
     };
   }
   async join(args) {
-    log4("joining", {
+    log3("joining", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 177,
       S: this,
       C: (f, a) => f(...a)
@@ -1163,16 +752,16 @@ var SignalClient = class extends Resource {
     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", {
+    log3("leaving", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 184,
       S: this,
       C: (f, a) => f(...a)
@@ -1180,7 +769,7 @@ var SignalClient = class extends Resource {
     this._monitor.recordLeave();
     this.localState.leave({
       topic: args.topic,
-      peerId: PublicKey4.from(args.peer.peerKey)
+      peerId: PublicKey3.from(args.peer.peerKey)
     });
   }
   async query(params) {
@@ -1189,8 +778,8 @@ var SignalClient = class extends Resource {
   async sendMessage(msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
-      invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
-        F: __dxlog_file4,
+      invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
+        F: __dxlog_file3,
         L: 196,
         S: this,
         A: [
@@ -1198,8 +787,8 @@ var SignalClient = class extends Resource {
           "'Not connected to Signal Server'"
         ]
       });
-      invariant3(msg.author.peerKey, "Author key required", {
-        F: __dxlog_file4,
+      invariant2(msg.author.peerKey, "Author key required", {
+        F: __dxlog_file3,
         L: 197,
         S: this,
         A: [
@@ -1207,8 +796,8 @@ var SignalClient = class extends Resource {
           "'Author key required'"
         ]
       });
-      invariant3(msg.recipient.peerKey, "Recipient key required", {
-        F: __dxlog_file4,
+      invariant2(msg.recipient.peerKey, "Recipient key required", {
+        F: __dxlog_file3,
         L: 198,
         S: this,
         A: [
@@ -1217,15 +806,15 @@ 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,
+    invariant2(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
       L: 208,
       S: this,
       A: [
@@ -1233,20 +822,20 @@ var SignalClient = class extends Resource {
         "'Peer key required'"
       ]
     });
-    log4("subscribing to messages", {
+    log3("subscribing to messages", {
       peer
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 209,
       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,
+    invariant2(peer.peerKey, "Peer key required", {
+      F: __dxlog_file3,
       L: 215,
       S: this,
       A: [
@@ -1254,31 +843,31 @@ var SignalClient = class extends Resource {
         "'Peer key required'"
       ]
     });
-    log4("unsubscribing from messages", {
+    log3("unsubscribing from messages", {
       peer
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file3,
       L: 216,
       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,
+      F: __dxlog_file3,
       L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant3(!this._client, "Client already created", {
-      F: __dxlog_file4,
+    invariant2(!this._client, "Client already created", {
+      F: __dxlog_file3,
       L: 226,
       S: this,
       A: [
@@ -1289,8 +878,8 @@ 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,
+      log3("connection context disposed", void 0, {
+        F: __dxlog_file3,
         L: 233,
         S: this,
         C: (f, a) => f(...a)
@@ -1304,8 +893,8 @@ var SignalClient = class extends Resource {
         callbacks: {
           onConnected: () => {
             if (client === this._client) {
-              log4("socket connected", void 0, {
-                F: __dxlog_file4,
+              log3("socket connected", void 0, {
+                F: __dxlog_file3,
                 L: 244,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1317,10 +906,10 @@ var SignalClient = class extends Resource {
             if (client !== this._client) {
               return;
             }
-            log4("socket disconnected", {
+            log3("socket disconnected", {
               state: this._state
             }, {
-              F: __dxlog_file4,
+              F: __dxlog_file3,
               L: 253,
               S: this,
               C: (f, a) => f(...a)
@@ -1333,11 +922,11 @@ var SignalClient = class extends Resource {
           },
           onError: (error) => {
             if (client === this._client) {
-              log4("socket error", {
+              log3("socket error", {
                 error,
                 state: this._state
               }, {
-                F: __dxlog_file4,
+                F: __dxlog_file3,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1350,414 +939,107 @@ var SignalClient = class extends Resource {
           getMetadata: this._getMetadata
         }
       });
-      this._client = client;
-    } catch (error) {
-      this._client = void 0;
-      this._onDisconnected({
-        error
-      });
-    }
-  }
-  async _reconnect() {
-    log4(`reconnecting in ${this._reconnectAfter}ms`, {
-      state: this._state
-    }, {
-      F: __dxlog_file4,
-      L: 280,
-      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,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      return;
-    }
-    if (this._state === SignalState.CLOSED) {
-      return;
-    }
-    this._setState(SignalState.RECONNECTING);
-    await this._safeResetClient();
-    await cancelWithContext2(this._ctx, sleep(this._reconnectAfter));
-    this._createClient();
-  }
-  _onConnected() {
-    this._lastError = void 0;
-    this._lastReconciliationFailed = false;
-    this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
-    this._setState(SignalState.CONNECTED);
-    this._clientReady.wake();
-    this._reconcileTask.schedule();
-  }
-  _onDisconnected(options) {
-    this._updateReconnectTimeout();
-    if (this._state === SignalState.CLOSED) {
-      return;
-    }
-    if (options?.error) {
-      this._lastError = options.error;
-      this._setState(SignalState.ERROR);
-    } else {
-      this._setState(SignalState.DISCONNECTED);
-    }
-    this._reconnectTask.schedule();
-  }
-  _setState(newState) {
-    this._state = newState;
-    this._monitor.recordStateChangeTime();
-    log4("signal state changed", {
-      status: this.getStatus()
-    }, {
-      F: __dxlog_file4,
-      L: 324,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this.statusChanged.emit(this.getStatus());
-  }
-  _updateReconnectTimeout() {
-    if (this._state !== SignalState.CONNECTED && this._state !== SignalState.CONNECTING) {
-      this._reconnectAfter *= 2;
-      this._reconnectAfter = Math.min(this._reconnectAfter, MAX_RECONNECT_TIMEOUT);
-    }
-  }
-  async _safeResetClient() {
-    await this._connectionCtx?.dispose();
-    this._connectionCtx = void 0;
-    this._clientReady.reset();
-    await this._client?.close().catch(() => {
-    });
-    this._client = void 0;
-  }
-  /**
-  * @param _host Signal server websocket URL.
-  * @param onMessage called when a new message is received.
-  * @param onSwarmEvent called when a new swarm event is received.
-  * @param _getMetadata signal-message metadata provider, called for every message.
-  */
-  constructor(_host, _getMetadata) {
-    super(), _define_property5(this, "_host", void 0), _define_property5(this, "_getMetadata", void 0), _define_property5(this, "_monitor", void 0), _define_property5(this, "_state", void 0), _define_property5(this, "_lastError", void 0), _define_property5(this, "_lastReconciliationFailed", void 0), _define_property5(this, "_clientReady", void 0), _define_property5(this, "_connectionCtx", void 0), _define_property5(this, "_client", void 0), _define_property5(this, "_reconcileTask", void 0), _define_property5(this, "_reconnectTask", void 0), /**
-    * Number of milliseconds after which the connection will be attempted again in case of error.
-    */
-    _define_property5(this, "_reconnectAfter", void 0), _define_property5(this, "_instanceId", void 0), /**
-    * @internal
-    */
-    _define_property5(this, "localState", void 0), _define_property5(this, "statusChanged", void 0), _define_property5(this, "onMessage", void 0), _define_property5(this, "swarmEvent", void 0), 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();
-    if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
-      throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
-    }
-    this.localState = new SignalLocalState(async (message) => {
-      this._monitor.recordMessageReceived(message);
-      this.onMessage.emit(message);
-    }, async (event) => this.swarmEvent.emit(event));
-  }
-};
-
-// 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";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
-var MemorySignalManagerContext = class {
-  constructor() {
-    _define_property6(this, "swarmEvent", new Event3());
-    _define_property6(this, "swarms", new ComplexMap3(PublicKey5.hash));
-    _define_property6(this, "connections", new ComplexMap3(PeerInfoHash));
-  }
-};
-var MemorySignalManager = class {
-  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._client = client;
+    } catch (error) {
+      this._client = void 0;
+      this._onDisconnected({
+        error
+      });
     }
-    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)
+  async _reconnect() {
+    log3(`reconnecting in ${this._reconnectAfter}ms`, {
+      state: this._state
     }, {
-      F: __dxlog_file5,
-      L: 157,
+      F: __dxlog_file3,
+      L: 280,
       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,
+    if (this._state === SignalState.RECONNECTING) {
+      log3.info("Signal api already reconnecting.", void 0, {
+        F: __dxlog_file3,
+        L: 283,
         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)
-      });
+    if (this._state === SignalState.CLOSED) {
       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)
-      });
-    });
+    this._setState(SignalState.RECONNECTING);
+    await this._safeResetClient();
+    await cancelWithContext2(this._ctx, sleep(this._reconnectAfter));
+    this._createClient();
   }
-  async subscribeMessages(peerInfo) {
-    log5("subscribing", {
-      peerInfo
-    }, {
-      F: __dxlog_file5,
-      L: 193,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._context.connections.set(peerInfo, this);
+  _onConnected() {
+    this._lastError = void 0;
+    this._lastReconciliationFailed = false;
+    this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
+    this._setState(SignalState.CONNECTED);
+    this._clientReady.wake();
+    this._reconcileTask.schedule();
   }
-  async unsubscribeMessages(peerInfo) {
-    log5("unsubscribing", {
-      peerInfo
+  _onDisconnected(options) {
+    this._updateReconnectTimeout();
+    if (this._state === SignalState.CLOSED) {
+      return;
+    }
+    if (options?.error) {
+      this._lastError = options.error;
+      this._setState(SignalState.ERROR);
+    } else {
+      this._setState(SignalState.DISCONNECTED);
+    }
+    this._reconnectTask.schedule();
+  }
+  _setState(newState) {
+    this._state = newState;
+    this._monitor.recordStateChangeTime();
+    log3("signal state changed", {
+      status: this.getStatus()
     }, {
-      F: __dxlog_file5,
-      L: 198,
+      F: __dxlog_file3,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._context.connections.delete(peerInfo);
-  }
-  freeze() {
-    this._freezeTrigger.reset();
-  }
-  unfreeze() {
-    this._freezeTrigger.wake();
-  }
-  constructor(_context) {
-    _define_property6(this, "_context", void 0);
-    _define_property6(this, "statusChanged", void 0);
-    _define_property6(this, "swarmEvent", void 0);
-    _define_property6(this, "onMessage", void 0);
-    _define_property6(this, "_joinedSwarms", void 0);
-    _define_property6(this, "_ctx", void 0);
-    _define_property6(this, "_freezeTrigger", void 0);
-    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)));
+    this.statusChanged.emit(this.getStatus());
   }
-};
-var dec = (payload) => {
-  if (!payload.type_url.endsWith("ReliablePayload")) {
-    return {};
+  _updateReconnectTimeout() {
+    if (this._state !== SignalState.CONNECTED && this._state !== SignalState.CONNECTING) {
+      this._reconnectAfter *= 2;
+      this._reconnectAfter = Math.min(this._reconnectAfter, MAX_RECONNECT_TIMEOUT);
+    }
   }
-  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
-    };
+  async _safeResetClient() {
+    await this._connectionCtx?.dispose();
+    this._connectionCtx = void 0;
+    this._clientReady.reset();
+    await this._client?.close().catch(() => {
+    });
+    this._client = void 0;
   }
-  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
@@ -1767,51 +1049,74 @@ var WebsocketSignalManagerMonitor = class {
 };
 
 // src/signal-manager/websocket-signal-manager.ts
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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 = /* @__PURE__ */ new Map();
+  _monitor = new WebsocketSignalManagerMonitor();
+  /**
+  * Used to avoid logging failed server restarts more than once until the server actually recovers.
+  */
+  _failedServersBitfield;
+  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;
+    log4("Created WebsocketSignalManager", {
+      hosts: this._hosts
+    }, {
+      F: __dxlog_file4,
+      L: 59,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    for (const host of this._hosts) {
+      if (this._servers.has(host.server)) {
+        continue;
+      }
+      const server = new SignalClient(host.server, this._getMetadata);
+      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
+      server.onMessage.on((data) => this.onMessage.emit(data));
+      server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
+      this._servers.set(host.server, server);
+      this.failureCount.set(host.server, 0);
+    }
+    this._failedServersBitfield = BitField.zeros(this._hosts.length);
+  }
   async _open() {
-    log6("open signal manager", {
+    log4("open signal manager", {
       hosts: this._hosts
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 79,
       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,
+      F: __dxlog_file4,
       L: 80,
       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,
+      F: __dxlog_file4,
       L: 84,
       S: this,
       C: (f, a) => f(...a)
@@ -1821,16 +1126,16 @@ 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,
+      F: __dxlog_file4,
       L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 93,
       S: this,
       A: [
@@ -1839,8 +1144,8 @@ var WebsocketSignalManager = class extends Resource2 {
       ]
     });
     const server = this._servers.get(serverName);
-    invariant5(server, "server not found", {
-      F: __dxlog_file6,
+    invariant3(server, "server not found", {
+      F: __dxlog_file4,
       L: 96,
       S: this,
       A: [
@@ -1856,17 +1161,17 @@ var WebsocketSignalManager = class extends Resource2 {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
   async join({ topic, peer }) {
-    log6("join", {
+    log4("join", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 109,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 110,
       S: this,
       A: [
@@ -1880,17 +1185,17 @@ var WebsocketSignalManager = class extends Resource2 {
     }));
   }
   async leave({ topic, peer }) {
-    log6("leaving", {
+    log4("leaving", {
       topic,
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 117,
       S: this,
       A: [
@@ -1907,16 +1212,16 @@ var WebsocketSignalManager = class extends Resource2 {
     throw new Error("Not implemented");
   }
   async sendMessage({ author, recipient, payload }) {
-    log6("signal", {
+    log4("signal", {
       recipient
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 127,
       S: this,
       A: [
@@ -1931,30 +1236,30 @@ var WebsocketSignalManager = class extends Resource2 {
         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,
+            F: __dxlog_file4,
             L: 135,
             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,
+            F: __dxlog_file4,
             L: 138,
             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,
+            F: __dxlog_file4,
             L: 141,
             S: this,
             C: (f, a) => f(...a)
@@ -1973,11 +1278,11 @@ 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,
+          F: __dxlog_file4,
           L: 155,
           S: this,
           C: (f, a) => f(...a)
@@ -1992,10 +1297,10 @@ 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,
+        F: __dxlog_file4,
         L: 168,
         S: this,
         C: (f, a) => f(...a)
@@ -2005,16 +1310,16 @@ var WebsocketSignalManager = class extends Resource2 {
     }
   }
   async subscribeMessages(peer) {
-    log6("subscribed for message stream", {
+    log4("subscribed for message stream", {
       peer
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file4,
       L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 176,
       S: this,
       A: [
@@ -2025,16 +1330,16 @@ 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,
+      F: __dxlog_file4,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
-      F: __dxlog_file6,
+    invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
+      F: __dxlog_file4,
       L: 183,
       S: this,
       A: [
@@ -2047,32 +1352,6 @@ var WebsocketSignalManager = class extends Resource2 {
   async _forEachServer(fn) {
     return Promise.all(Array.from(this._servers.entries()).map(([serverName, server], idx) => fn(server, serverName, idx)));
   }
-  constructor(_hosts, _getMetadata) {
-    super(), _define_property7(this, "_hosts", void 0), _define_property7(this, "_getMetadata", void 0), _define_property7(this, "_servers", void 0), _define_property7(this, "_monitor", void 0), /**
-    * Used to avoid logging failed server restarts more than once until the server actually recovers.
-    */
-    _define_property7(this, "_failedServersBitfield", void 0), _define_property7(this, "failureCount", void 0), _define_property7(this, "statusChanged", void 0), _define_property7(this, "swarmEvent", void 0), _define_property7(this, "onMessage", void 0), _define_property7(this, "_instanceId", void 0), 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", {
-      hosts: this._hosts
-    }, {
-      F: __dxlog_file6,
-      L: 59,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    for (const host of this._hosts) {
-      if (this._servers.has(host.server)) {
-        continue;
-      }
-      const server = new SignalClient(host.server, this._getMetadata);
-      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
-      server.onMessage.on((data) => this.onMessage.emit(data));
-      server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
-      this._servers.set(host.server, server);
-      this.failureCount.set(host.server, 0);
-    }
-    this._failedServersBitfield = BitField.zeros(this._hosts.length);
-  }
 };
 _ts_decorate([
   synchronized
@@ -2085,31 +1364,34 @@ _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 { EdgeIdentityChangedError, 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 { 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";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-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 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 ComplexMap2(PublicKey5.hash);
+  _edgeConnection;
+  constructor({ edgeConnection }) {
+    super();
+    this._edgeConnection = edgeConnection;
+  }
   async _open() {
     this._ctx.onDispose(this._edgeConnection.onMessage((message) => this._onMessage(message)));
     this._ctx.onDispose(this._edgeConnection.onReconnected(() => {
@@ -2121,14 +1403,14 @@ var EdgeSignalManager = class extends Resource3 {
   */
   async join({ 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,
+        F: __dxlog_file5,
         L: 66,
         S: this,
         C: (f, a) => f(...a)
@@ -2138,7 +1420,7 @@ 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, {
       serviceId: EdgeService.SWARM,
@@ -2190,14 +1472,14 @@ var EdgeSignalManager = class extends Resource3 {
   }
   async sendMessage(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,
+        F: __dxlog_file5,
         L: 131,
         S: this,
         C: (f, a) => f(...a)
@@ -2231,8 +1513,8 @@ var EdgeSignalManager = class extends Resource3 {
     }
   }
   _processSwarmResponse(message) {
-    invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
-      F: __dxlog_file7,
+    invariant4(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
       L: 168,
       S: this,
       A: [
@@ -2242,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;
@@ -2275,8 +1557,8 @@ 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,
+    invariant4(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
+      F: __dxlog_file5,
       L: 206,
       S: this,
       A: [
@@ -2285,8 +1567,8 @@ var EdgeSignalManager = class extends Resource3 {
       ]
     });
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
-    invariant6(message.source, "source is missing", {
-      F: __dxlog_file7,
+    invariant4(message.source, "source is missing", {
+      F: __dxlog_file5,
       L: 208,
       S: this,
       A: [
@@ -2294,8 +1576,8 @@ var EdgeSignalManager = class extends Resource3 {
         "'source is missing'"
       ]
     });
-    invariant6(message.target, "target is missing", {
-      F: __dxlog_file7,
+    invariant4(message.target, "target is missing", {
+      F: __dxlog_file5,
       L: 209,
       S: this,
       A: [
@@ -2303,8 +1585,8 @@ var EdgeSignalManager = class extends Resource3 {
         "'target is missing'"
       ]
     });
-    invariant6(message.target.length === 1, "target should have exactly one item", {
-      F: __dxlog_file7,
+    invariant4(message.target.length === 1, "target should have exactly one item", {
+      F: __dxlog_file5,
       L: 210,
       S: this,
       A: [
@@ -2325,10 +1607,10 @@ 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,
+      F: __dxlog_file5,
       L: 229,
       S: this,
       C: (f, a) => f(...a)
@@ -2344,17 +1626,6 @@ var EdgeSignalManager = class extends Resource3 {
       });
     }
   }
-  constructor({ edgeConnection }) {
-    super(), /**
-    * @deprecated
-    */
-    _define_property8(this, "swarmEvent", new Event5()), _define_property8(this, "swarmState", new Event5()), _define_property8(this, "onMessage", new Event5()), /**
-    * 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.
-    _define_property8(this, "_swarmPeers", new ComplexMap4(PublicKey7.hash)), _define_property8(this, "_edgeConnection", void 0);
-    this._edgeConnection = edgeConnection;
-  }
 };
 var createMessageSource = (topic, peerInfo) => {
   return {
@@ -2364,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)
@@ -2385,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: [
@@ -2406,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)
@@ -2419,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-CD3GXEDZ.mjs.map
+//# sourceMappingURL=index.mjs.map