@dxos/messaging 0.3.8-next.f4e0086 → 0.3.9-main.14901ff

package/dist/lib/node/index.cjs

@@ -26,19 +26,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/core/mesh/messaging/src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var node_exports = {};
+__export(node_exports, {
   MemorySignalManager: () => MemorySignalManager,
   MemorySignalManagerContext: () => MemorySignalManagerContext,
   Messenger: () => Messenger,
   SignalClient: () => SignalClient,
   WebsocketSignalManager: () => WebsocketSignalManager
 });
-module.exports = __toCommonJS(src_exports);
-
-// packages/core/mesh/messaging/src/messenger.ts
+module.exports = __toCommonJS(node_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
@@ -46,26 +42,45 @@ var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 var import_util = require("@dxos/util");
-
-// packages/core/mesh/messaging/src/timeouts.ts
+var import_async2 = require("@dxos/async");
+var import_context2 = require("@dxos/context");
+var import_invariant2 = require("@dxos/invariant");
+var import_keys2 = require("@dxos/keys");
+var import_log2 = require("@dxos/log");
+var import_protocols2 = require("@dxos/protocols");
+var import_signal = require("@dxos/protocols/proto/dxos/mesh/signal");
+var import_util2 = require("@dxos/util");
+var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
+var import_async3 = require("@dxos/async");
+var import_invariant3 = require("@dxos/invariant");
+var import_keys3 = require("@dxos/keys");
+var import_log3 = require("@dxos/log");
+var import_protocols3 = require("@dxos/protocols");
+var import_rpc = require("@dxos/rpc");
+var import_async4 = require("@dxos/async");
+var import_context3 = require("@dxos/context");
+var import_invariant4 = require("@dxos/invariant");
+var import_keys4 = require("@dxos/keys");
+var import_log4 = require("@dxos/log");
+var import_protocols4 = require("@dxos/protocols");
+var import_util3 = require("@dxos/util");
+var import_async5 = require("@dxos/async");
+var import_context4 = require("@dxos/context");
+var import_invariant5 = require("@dxos/invariant");
+var import_keys5 = require("@dxos/keys");
+var import_log5 = require("@dxos/log");
+var import_protocols5 = require("@dxos/protocols");
 var MESSAGE_TIMEOUT = 1e4;
-
-// packages/core/mesh/messaging/src/messenger.ts
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
 var ReliablePayload = import_protocols.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
 var Acknowledgement = import_protocols.schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
 var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
 var Messenger = class {
   constructor({ signalManager, retryDelay = 300 }) {
-    // { peerId, payloadType } => listeners set
     this._listeners = new import_util.ComplexMap(({ peerId, payloadType }) => peerId.toHex() + payloadType);
-    // peerId => listeners set
     this._defaultListeners = new import_util.ComplexMap(import_keys.PublicKey.hash);
     this._onAckCallbacks = new import_util.ComplexMap(import_keys.PublicKey.hash);
     this._receivedMessages = new import_util.ComplexSet(import_keys.PublicKey.hash);
-    /**
-    * Keys scheduled to be cleared from _receivedMessages on the next iteration.
-    */
     this._toClear = new import_util.ComplexSet(import_keys.PublicKey.hash);
     this._closed = true;
     this._signalManager = signalManager;
@@ -392,32 +407,13 @@ var Messenger = class {
     }
   }
 };
-
-// packages/core/mesh/messaging/src/signal-client/signal-client.ts
-var import_async3 = require("@dxos/async");
-var import_context2 = require("@dxos/context");
-var import_invariant3 = require("@dxos/invariant");
-var import_keys3 = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
-var import_signal = require("@dxos/protocols/proto/dxos/mesh/signal");
-var import_util2 = require("@dxos/util");
-
-// packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts
-var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
-var import_async2 = require("@dxos/async");
-var import_invariant2 = require("@dxos/invariant");
-var import_keys2 = require("@dxos/keys");
-var import_log2 = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
-var import_rpc = require("@dxos/rpc");
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
 var SignalRPCClient = class {
   constructor({ url, callbacks = {} }) {
-    this._connectTrigger = new import_async2.Trigger();
+    this._connectTrigger = new import_async3.Trigger();
     this._closed = false;
-    const traceId = import_keys2.PublicKey.random().toHex();
-    import_log2.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols2.trace.begin({
+    const traceId = import_keys3.PublicKey.random().toHex();
+    import_log3.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols3.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file2,
@@ -430,7 +426,7 @@ var SignalRPCClient = class {
     this._socket = new import_isomorphic_ws.default(this._url);
     this._rpc = (0, import_rpc.createProtoRpcPeer)({
       requested: {
-        Signal: import_protocols2.schema.getService("dxos.mesh.signal.Signal")
+        Signal: import_protocols3.schema.getService("dxos.mesh.signal.Signal")
       },
       noHandshake: true,
       port: {
@@ -441,7 +437,7 @@ var SignalRPCClient = class {
           try {
             this._socket.send(msg);
           } catch (err) {
-            import_log2.log.warn("send error", err, {
+            import_log3.log.warn("send error", err, {
               F: __dxlog_file2,
               L: 68,
               S: this,
@@ -466,7 +462,7 @@ var SignalRPCClient = class {
     this._socket.onopen = async () => {
       try {
         await this._rpc.open();
-        (0, import_log2.log)(`RPC open ${this._url}`, void 0, {
+        (0, import_log3.log)(`RPC open ${this._url}`, void 0, {
           F: __dxlog_file2,
           L: 89,
           S: this,
@@ -479,7 +475,7 @@ var SignalRPCClient = class {
       }
     };
     this._socket.onclose = async () => {
-      (0, import_log2.log)(`Disconnected ${this._url}`, void 0, {
+      (0, import_log3.log)(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file2,
         L: 98,
         S: this,
@@ -497,7 +493,7 @@ var SignalRPCClient = class {
       try {
         await this._rpc?.close();
       } catch (err) {
-        import_log2.log.catch(err, void 0, {
+        import_log3.log.catch(err, void 0, {
           F: __dxlog_file2,
           L: 115,
           S: this,
@@ -505,7 +501,7 @@ var SignalRPCClient = class {
         });
       }
       this._closed = true;
-      import_log2.log.warn(event.message ?? "Socket error", {
+      import_log3.log.warn(event.message ?? "Socket error", {
         url: this._url
       }, {
         F: __dxlog_file2,
@@ -514,7 +510,7 @@ var SignalRPCClient = class {
         C: (f, a) => f(...a)
       });
     };
-    import_log2.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols2.trace.end({
+    import_log3.log.trace("dxos.mesh.signal-rpc-client.constructor", import_protocols3.trace.end({
       id: traceId
     }), {
       F: __dxlog_file2,
@@ -529,7 +525,7 @@ var SignalRPCClient = class {
       await this._rpc?.close();
       this._socket?.close();
     } catch (err) {
-      import_log2.log.warn("close error", err, {
+      import_log3.log.warn("close error", err, {
         F: __dxlog_file2,
         L: 131,
         S: this,
@@ -538,7 +534,7 @@ var SignalRPCClient = class {
     }
   }
   async join({ topic, peerId }) {
-    (0, import_log2.log)("join", {
+    (0, import_log3.log)("join", {
       topic,
       peerId
     }, {
@@ -548,7 +544,7 @@ var SignalRPCClient = class {
       C: (f, a) => f(...a)
     });
     await this._connectTrigger.wait();
-    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
       L: 138,
       S: this,
@@ -557,7 +553,7 @@ var SignalRPCClient = class {
         "'SignalRPCClient is closed'"
       ]
     });
-    (0, import_invariant2.invariant)(this._rpc, "Rpc is not initialized", {
+    (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
       L: 139,
       S: this,
@@ -574,7 +570,7 @@ var SignalRPCClient = class {
     return swarmStream;
   }
   async receiveMessages(peerId) {
-    (0, import_log2.log)("receiveMessages", {
+    (0, import_log3.log)("receiveMessages", {
       peerId
     }, {
       F: __dxlog_file2,
@@ -582,7 +578,7 @@ var SignalRPCClient = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
       L: 150,
       S: this,
@@ -592,7 +588,7 @@ var SignalRPCClient = class {
       ]
     });
     await this._connectTrigger.wait();
-    (0, import_invariant2.invariant)(this._rpc, "Rpc is not initialized", {
+    (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
       L: 152,
       S: this,
@@ -608,7 +604,7 @@ var SignalRPCClient = class {
     return messageStream;
   }
   async sendMessage({ author, recipient, payload }) {
-    (0, import_log2.log)("sendMessage", {
+    (0, import_log3.log)("sendMessage", {
       author,
       recipient,
       payload
@@ -618,7 +614,7 @@ var SignalRPCClient = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant2.invariant)(!this._closed, "SignalRPCClient is closed", {
+    (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
       L: 162,
       S: this,
@@ -628,7 +624,7 @@ var SignalRPCClient = class {
       ]
     });
     await this._connectTrigger.wait();
-    (0, import_invariant2.invariant)(this._rpc, "Rpc is not initialized", {
+    (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
       L: 164,
       S: this,
@@ -644,8 +640,6 @@ var SignalRPCClient = class {
     });
   }
 };
-
-// packages/core/mesh/messaging/src/signal-client/signal-client.ts
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
 var DEFAULT_RECONNECT_TIMEOUT = 100;
 var MAX_RECONNECT_TIMEOUT = 5e3;
@@ -664,15 +658,15 @@ var SignalClient = class {
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
     this._connectionStarted = /* @__PURE__ */ new Date();
     this._lastStateChange = /* @__PURE__ */ new Date();
-    this._clientReady = new import_async3.Trigger();
-    this.statusChanged = new import_async3.Event();
-    this.commandTrace = new import_async3.Event();
+    this._clientReady = new import_async2.Trigger();
+    this.statusChanged = new import_async2.Event();
+    this.commandTrace = new import_async2.Event();
     this._swarmStreams = new import_util2.ComplexMap(({ topic, peerId }) => topic.toHex() + peerId.toHex());
     this._joinedTopics = new import_util2.ComplexSet(({ topic, peerId }) => topic.toHex() + peerId.toHex());
     this._messageStreams = new import_util2.ComplexMap((key) => key.toHex());
     this._subscribedMessages = new import_util2.ComplexSet(({ peerId }) => peerId.toHex());
-    this._reconciled = new import_async3.Event();
-    this._instanceId = import_keys3.PublicKey.random().toHex();
+    this._reconciled = new import_async2.Event();
+    this._instanceId = import_keys2.PublicKey.random().toHex();
     this._performance = {
       sentMessages: 0,
       receivedMessages: 0,
@@ -685,7 +679,7 @@ var SignalClient = class {
     }
   }
   open() {
-    import_log3.log.trace("dxos.mesh.signal-client.open", import_protocols3.trace.begin({
+    import_log2.log.trace("dxos.mesh.signal-client.open", import_protocols2.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file3,
@@ -705,7 +699,7 @@ var SignalClient = class {
           return;
         }
         if (this._state === import_signal.SignalState.CONNECTED) {
-          import_log3.log.warn("SignalClient error:", err, {
+          import_log2.log.warn("SignalClient error:", err, {
             F: __dxlog_file3,
             L: 147,
             S: this,
@@ -715,22 +709,22 @@ var SignalClient = class {
         this._scheduleReconcileAfterError();
       }
     });
-    this._reconcileTask = new import_async3.DeferredTask(this._ctx, async () => {
+    this._reconcileTask = new import_async2.DeferredTask(this._ctx, async () => {
       await this._reconcileSwarmSubscriptions();
       await this._reconcileMessageSubscriptions();
       this._reconciled.emit();
     });
-    (0, import_async3.scheduleTaskInterval)(this._ctx, async () => {
+    (0, import_async2.scheduleTaskInterval)(this._ctx, async () => {
       if (this._state === import_signal.SignalState.CONNECTED) {
         this._reconcileTask.schedule();
       }
     }, RECONCILE_INTERVAL);
-    this._reconnectTask = new import_async3.DeferredTask(this._ctx, async () => {
+    this._reconnectTask = new import_async2.DeferredTask(this._ctx, async () => {
       await this._reconnect();
     });
     this._setState(import_signal.SignalState.CONNECTING);
     this._createClient();
-    import_log3.log.trace("dxos.mesh.signal-client.open", import_protocols3.trace.end({
+    import_log2.log.trace("dxos.mesh.signal-client.open", import_protocols2.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file3,
@@ -740,7 +734,7 @@ var SignalClient = class {
     });
   }
   async close() {
-    (0, import_log3.log)("closing...", void 0, {
+    (0, import_log2.log)("closing...", void 0, {
       F: __dxlog_file3,
       L: 180,
       S: this,
@@ -756,7 +750,7 @@ var SignalClient = class {
     await this._client?.close();
     this._client = void 0;
     this._setState(import_signal.SignalState.CLOSED);
-    (0, import_log3.log)("closed", void 0, {
+    (0, import_log2.log)("closed", void 0, {
       F: __dxlog_file3,
       L: 191,
       S: this,
@@ -774,7 +768,7 @@ var SignalClient = class {
     };
   }
   async join({ topic, peerId }) {
-    (0, import_log3.log)("joining", {
+    (0, import_log2.log)("joining", {
       topic,
       peerId
     }, {
@@ -792,7 +786,7 @@ var SignalClient = class {
   }
   async leave({ topic, peerId }) {
     this._performance.leaveCounter++;
-    (0, import_log3.log)("leaving", {
+    (0, import_log2.log)("leaving", {
       topic,
       peerId
     }, {
@@ -817,7 +811,7 @@ var SignalClient = class {
   async sendMessage(msg) {
     this._performance.sentMessages++;
     await this._clientReady.wait();
-    (0, import_invariant3.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
+    (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
       L: 224,
       S: this,
@@ -829,7 +823,7 @@ var SignalClient = class {
     await this._client.sendMessage(msg);
   }
   async subscribeMessages(peerId) {
-    (0, import_log3.log)("subscribing to messages", {
+    (0, import_log2.log)("subscribing to messages", {
       peerId
     }, {
       F: __dxlog_file3,
@@ -843,7 +837,7 @@ var SignalClient = class {
     this._reconcileTask.schedule();
   }
   async unsubscribeMessages(peerId) {
-    (0, import_log3.log)("unsubscribing from messages", {
+    (0, import_log2.log)("unsubscribing from messages", {
       peerId
     }, {
       F: __dxlog_file3,
@@ -858,14 +852,14 @@ var SignalClient = class {
     this._messageStreams.delete(peerId);
   }
   _scheduleReconcileAfterError() {
-    (0, import_async3.scheduleTask)(this._ctx, () => {
+    (0, import_async2.scheduleTask)(this._ctx, () => {
       this._reconcileTask.schedule();
     }, ERROR_RECONCILE_DELAY);
   }
   _setState(newState) {
     this._state = newState;
     this._lastStateChange = /* @__PURE__ */ new Date();
-    (0, import_log3.log)("signal state changed", {
+    (0, import_log2.log)("signal state changed", {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
@@ -876,7 +870,7 @@ var SignalClient = class {
     this.statusChanged.emit(this.getStatus());
   }
   _createClient() {
-    (0, import_log3.log)("creating client", {
+    (0, import_log2.log)("creating client", {
       host: this._host,
       state: this._state
     }, {
@@ -885,7 +879,7 @@ var SignalClient = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant3.invariant)(!this._client, "Client already created", {
+    (0, import_invariant2.invariant)(!this._client, "Client already created", {
       F: __dxlog_file3,
       L: 260,
       S: this,
@@ -897,7 +891,7 @@ var SignalClient = class {
     this._connectionStarted = /* @__PURE__ */ new Date();
     this._connectionCtx = this._ctx.derive();
     this._connectionCtx.onDispose(async () => {
-      (0, import_log3.log)("connection context disposed", void 0, {
+      (0, import_log2.log)("connection context disposed", void 0, {
         F: __dxlog_file3,
         L: 267,
         S: this,
@@ -913,7 +907,7 @@ var SignalClient = class {
         url: this._host,
         callbacks: {
           onConnected: () => {
-            (0, import_log3.log)("socket connected", void 0, {
+            (0, import_log2.log)("socket connected", void 0, {
               F: __dxlog_file3,
               L: 279,
               S: this,
@@ -926,7 +920,7 @@ var SignalClient = class {
             this._reconcileTask.schedule();
           },
           onDisconnected: () => {
-            (0, import_log3.log)("socket disconnected", {
+            (0, import_log2.log)("socket disconnected", {
               state: this._state
             }, {
               F: __dxlog_file3,
@@ -945,7 +939,7 @@ var SignalClient = class {
             this._reconnectTask.schedule();
           },
           onError: (error) => {
-            (0, import_log3.log)("socket error", {
+            (0, import_log2.log)("socket error", {
               error,
               state: this._state
             }, {
@@ -977,7 +971,7 @@ var SignalClient = class {
     this._reconnectAfter = Math.min(this._reconnectAfter, MAX_RECONNECT_TIMEOUT);
   }
   async _reconnect() {
-    (0, import_log3.log)(`reconnecting in ${this._reconnectAfter}ms`, {
+    (0, import_log2.log)(`reconnecting in ${this._reconnectAfter}ms`, {
       state: this._state
     }, {
       F: __dxlog_file3,
@@ -987,7 +981,7 @@ var SignalClient = class {
     });
     this._performance.reconnectCounter++;
     if (this._state === import_signal.SignalState.RECONNECTING) {
-      import_log3.log.warn("Signal api already reconnecting.", void 0, {
+      import_log2.log.warn("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
         L: 334,
         S: this,
@@ -1003,14 +997,14 @@ var SignalClient = class {
     this._client?.close().catch(() => {
     });
     this._client = void 0;
-    await (0, import_context2.cancelWithContext)(this._ctx, (0, import_async3.sleep)(this._reconnectAfter));
+    await (0, import_context2.cancelWithContext)(this._ctx, (0, import_async2.sleep)(this._reconnectAfter));
     this._setState(import_signal.SignalState.RECONNECTING);
     this._createClient();
   }
   async _reconcileSwarmSubscriptions() {
-    await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
+    await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
     const client = this._client;
-    (0, import_invariant3.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
+    (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
       L: 359,
       S: this,
@@ -1042,12 +1036,12 @@ var SignalClient = class {
       })) {
         continue;
       }
-      const swarmStream = await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, client.join({
+      const swarmStream = await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, client.join({
         topic,
         peerId
       })), 5e3);
       swarmStream.subscribe(async (swarmEvent) => {
-        (0, import_log3.log)("swarm event", {
+        (0, import_log2.log)("swarm event", {
           swarmEvent
         }, {
           F: __dxlog_file3,
@@ -1067,9 +1061,9 @@ var SignalClient = class {
     }
   }
   async _reconcileMessageSubscriptions() {
-    await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
+    await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, this._clientReady.wait()), 5e3);
     const client = this._client;
-    (0, import_invariant3.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
+    (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
       L: 399,
       S: this,
@@ -1091,12 +1085,12 @@ var SignalClient = class {
       if (this._messageStreams.has(peerId)) {
         continue;
       }
-      const messageStream = await (0, import_async3.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, client.receiveMessages(peerId)), 5e3);
+      const messageStream = await (0, import_async2.asyncTimeout)((0, import_context2.cancelWithContext)(this._connectionCtx, client.receiveMessages(peerId)), 5e3);
       messageStream.subscribe(async (message) => {
         this._performance.receivedMessages++;
         await this._onMessage({
-          author: import_keys3.PublicKey.from(message.author),
-          recipient: import_keys3.PublicKey.from(message.recipient),
+          author: import_keys2.PublicKey.from(message.author),
+          recipient: import_keys2.PublicKey.from(message.recipient),
           payload: message.payload
         });
       });
@@ -1104,23 +1098,11 @@ var SignalClient = class {
     }
   }
 };
-
-// packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts
-var import_async4 = require("@dxos/async");
-var import_context3 = require("@dxos/context");
-var import_invariant4 = require("@dxos/invariant");
-var import_keys4 = require("@dxos/keys");
-var import_log4 = require("@dxos/log");
-var import_protocols4 = require("@dxos/protocols");
-var import_util3 = require("@dxos/util");
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
   constructor() {
-    // Swarm messages.
     this.swarmEvent = new import_async4.Event();
-    // Mapping from topic to set of peers.
     this.swarms = new import_util3.ComplexMap(import_keys4.PublicKey.hash);
-    // Map of connections for each peer for signaling.
     this.connections = new import_util3.ComplexMap(import_keys4.PublicKey.hash);
   }
 };
@@ -1367,14 +1349,6 @@ var dec = (payload) => {
   }
   return {};
 };
-
-// packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts
-var import_async5 = require("@dxos/async");
-var import_context4 = require("@dxos/context");
-var import_invariant5 = require("@dxos/invariant");
-var import_keys5 = require("@dxos/keys");
-var import_log5 = require("@dxos/log");
-var import_protocols5 = require("@dxos/protocols");
 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")
@@ -1566,7 +1540,7 @@ var WebsocketSignalManager = class {
         payload
       }).catch((err) => {
         if (err instanceof import_protocols5.RateLimitExceededError) {
-          (0, import_log5.log)("WSS rate limit exceeded", {
+          import_log5.log.info("WSS rate limit exceeded", {
             err
           }, {
             F: __dxlog_file5,
@@ -1574,8 +1548,8 @@ var WebsocketSignalManager = class {
             S: this,
             C: (f, a) => f(...a)
           });
-        } else {
-          (0, import_log5.log)(`error sending to ${serverName}`, {
+        } else if (err instanceof import_protocols5.TimeoutError || err.constructor.name === "TimeoutError") {
+          import_log5.log.info("WSS sendMessage timeout", {
             err
           }, {
             F: __dxlog_file5,
@@ -1584,6 +1558,16 @@ var WebsocketSignalManager = class {
             C: (f, a) => f(...a)
           });
           void this.checkServerFailure(serverName);
+        } else {
+          import_log5.log.info(`error sending to ${serverName}`, {
+            err
+          }, {
+            F: __dxlog_file5,
+            L: 143,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          void this.checkServerFailure(serverName);
         }
       });
     });
@@ -1593,7 +1577,7 @@ var WebsocketSignalManager = class {
     if (failureCount > MAX_SERVER_FAILURES) {
       import_log5.log.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
         F: __dxlog_file5,
-        L: 151,
+        L: 154,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1606,13 +1590,13 @@ var WebsocketSignalManager = class {
   async subscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 160,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 161,
+      L: 164,
       S: this,
       A: [
         "this._opened",
@@ -1624,13 +1608,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 167,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 168,
+      L: 171,
       S: this,
       A: [
         "this._opened",
@@ -1643,7 +1627,7 @@ var WebsocketSignalManager = class {
     this._ctx = new import_context4.Context({
       onError: (err) => import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 175,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       })