@dxos/messaging 0.8.4-main.3a94e84 → 0.8.4-main.3c1ae3b

package/dist/lib/browser/{chunk-QLQS7TUS.mjs → chunk-4EMAT5U7.mjs}

@@ -35,19 +35,22 @@ var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayloa
 var Acknowledgement = schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
 var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
 var Messenger = class {
+  _monitor = new MessengerMonitor();
+  _signalManager;
+  // { peerId, payloadType } => listeners set
+  _listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
+  // peerId => listeners set
+  _defaultListeners = /* @__PURE__ */ new Map();
+  _onAckCallbacks = new ComplexMap(PublicKey.hash);
+  _receivedMessages = new ComplexSet(PublicKey.hash);
+  /**
+  * Keys scheduled to be cleared from _receivedMessages on the next iteration.
+  */
+  _toClear = new ComplexSet(PublicKey.hash);
+  _ctx;
+  _closed = true;
+  _retryDelay;
   constructor({ signalManager, retryDelay = 1e3 }) {
-    this._monitor = new MessengerMonitor();
-    // { peerId, payloadType } => listeners set
-    this._listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
-    // peerId => listeners set
-    this._defaultListeners = /* @__PURE__ */ new Map();
-    this._onAckCallbacks = new ComplexMap(PublicKey.hash);
-    this._receivedMessages = new ComplexSet(PublicKey.hash);
-    /**
-    * Keys scheduled to be cleared from _receivedMessages on the next iteration.
-    */
-    this._toClear = new ComplexSet(PublicKey.hash);
-    this._closed = true;
     this._signalManager = signalManager;
     this._retryDelay = retryDelay;
     this.open();
@@ -181,7 +184,10 @@ var Messenger = class {
         C: (f, a) => f(...a)
       });
       this._onAckCallbacks.delete(reliablePayload.messageId);
-      timeoutHit(new ProtocolTimeoutError("signaling message not delivered", new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
+      timeoutHit(new ProtocolTimeoutError({
+        message: "signaling message not delivered",
+        cause: new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")
+      }));
       void messageContext.dispose();
       this._monitor.recordReliableMessage({
         sendAttempts,
@@ -411,7 +417,7 @@ var Messenger = class {
 
 // 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 { cancelWithContext as cancelWithContext2, Resource } from "@dxos/context";
+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";
@@ -421,23 +427,21 @@ import { SignalState } from "@dxos/protocols/proto/dxos/mesh/signal";
 // src/signal-client/signal-client-monitor.ts
 import { trace as trace3 } from "@dxos/tracing";
 var SignalClientMonitor = class {
-  constructor() {
-    this._performance = {
-      sentMessages: 0,
-      receivedMessages: 0,
-      reconnectCounter: 0,
-      joinCounter: 0,
-      leaveCounter: 0
-    };
-    /**
-    * Timestamp of when the connection attempt was began.
-    */
-    this._connectionStarted = /* @__PURE__ */ new Date();
-    /**
-    * Timestamp of last state change.
-    */
-    this._lastStateChange = /* @__PURE__ */ new Date();
-  }
+  _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,
@@ -518,21 +522,40 @@ var createIdentityTags = (message) => {
 };
 
 // src/signal-client/signal-local-state.ts
-import { asyncTimeout, Event } from "@dxos/async";
+import { Event, asyncTimeout } from "@dxos/async";
 import { cancelWithContext } from "@dxos/context";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2, safeAwaitAll } from "@dxos/util";
 var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-local-state.ts";
 var SignalLocalState = class {
+  _onMessage;
+  _onSwarmEvent;
+  /**
+  * Swarm events streams. Keys represent actually joined topic and peerId.
+  */
+  _swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired joined topic and peerId.
+  */
+  _joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
+  /**
+  * Represent desired message subscriptions.
+  */
+  _subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
+  /**
+  * Message streams. Keys represents actually subscribed peers.
+  * @internal
+  */
+  messageStreams = new ComplexMap2((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;
-    this._swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
-    this.messageStreams = new ComplexMap2((key) => key.toHex());
-    this.reconciled = new Event();
   }
   async safeCloseStreams() {
     const streams = [
@@ -577,7 +600,7 @@ var SignalLocalState = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 79,
+      L: 80,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -629,7 +652,7 @@ var SignalLocalState = class {
             swarmEvent
           }, {
             F: __dxlog_file2,
-            L: 115,
+            L: 116,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -697,7 +720,7 @@ var SignalLocalState = class {
 
 // src/signal-client/signal-rpc-client.ts
 import WebSocket from "isomorphic-ws";
-import { scheduleTaskInterval as scheduleTaskInterval2, TimeoutError as TimeoutError2, Trigger } from "@dxos/async";
+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";
@@ -722,11 +745,16 @@ var SignalRpcClientMonitor = class {
 var __dxlog_file3 = "/__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 = {} }) {
-    this._connectTrigger = new Trigger();
-    this._closed = false;
-    this._closeComplete = new Trigger();
-    this._monitor = new SignalRpcClientMonitor();
     const traceId = PublicKey3.random().toHex();
     log3.trace("dxos.mesh.signal-rpc-client.constructor", trace5.begin({
       id: traceId
@@ -966,6 +994,29 @@ 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 = PublicKey4.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.
@@ -973,7 +1024,7 @@ var SignalClient = class extends Resource {
   * @param _getMetadata signal-message metadata provider, called for every message.
   */
   constructor(_host, _getMetadata) {
-    super(), this._host = _host, this._getMetadata = _getMetadata, this._monitor = new SignalClientMonitor(), this._state = SignalState.CLOSED, this._lastReconciliationFailed = false, this._clientReady = new Trigger2(), this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT, this._instanceId = PublicKey4.random().toHex(), this.statusChanged = new Event2(), this.onMessage = new Event2(), this.swarmEvent = new Event2();
+    super(), this._host = _host, this._getMetadata = _getMetadata;
     if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
@@ -987,7 +1038,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 96,
+      L: 97,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1005,7 +1056,7 @@ var SignalClient = class extends Resource {
         }));
         invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file4,
-          L: 106,
+          L: 107,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1048,7 +1099,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 139,
+      L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1060,7 +1111,7 @@ var SignalClient = class extends Resource {
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
       log4.warn("SignalClient error:", err, {
         F: __dxlog_file4,
-        L: 148,
+        L: 149,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1070,7 +1121,7 @@ var SignalClient = class extends Resource {
   async _close() {
     log4("closing...", void 0, {
       F: __dxlog_file4,
-      L: 154,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1083,7 +1134,7 @@ var SignalClient = class extends Resource {
     await this._safeResetClient();
     log4("closed", void 0, {
       F: __dxlog_file4,
-      L: 162,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1103,7 +1154,7 @@ var SignalClient = class extends Resource {
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 176,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1120,7 +1171,7 @@ var SignalClient = class extends Resource {
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 183,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1138,7 +1189,7 @@ var SignalClient = class extends Resource {
       await this._clientReady.wait();
       invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
         F: __dxlog_file4,
-        L: 195,
+        L: 196,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
@@ -1147,7 +1198,7 @@ var SignalClient = class extends Resource {
       });
       invariant3(msg.author.peerKey, "Author key required", {
         F: __dxlog_file4,
-        L: 196,
+        L: 197,
         S: this,
         A: [
           "msg.author.peerKey",
@@ -1156,7 +1207,7 @@ var SignalClient = class extends Resource {
       });
       invariant3(msg.recipient.peerKey, "Recipient key required", {
         F: __dxlog_file4,
-        L: 197,
+        L: 198,
         S: this,
         A: [
           "msg.recipient.peerKey",
@@ -1173,7 +1224,7 @@ var SignalClient = class extends Resource {
   async subscribeMessages(peer) {
     invariant3(peer.peerKey, "Peer key required", {
       F: __dxlog_file4,
-      L: 207,
+      L: 208,
       S: this,
       A: [
         "peer.peerKey",
@@ -1184,7 +1235,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file4,
-      L: 208,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1194,7 +1245,7 @@ var SignalClient = class extends Resource {
   async unsubscribeMessages(peer) {
     invariant3(peer.peerKey, "Peer key required", {
       F: __dxlog_file4,
-      L: 214,
+      L: 215,
       S: this,
       A: [
         "peer.peerKey",
@@ -1205,7 +1256,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file4,
-      L: 215,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1220,13 +1271,13 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 224,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file4,
-      L: 225,
+      L: 226,
       S: this,
       A: [
         "!this._client",
@@ -1238,7 +1289,7 @@ var SignalClient = class extends Resource {
     this._connectionCtx.onDispose(async () => {
       log4("connection context disposed", void 0, {
         F: __dxlog_file4,
-        L: 232,
+        L: 233,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1253,7 +1304,7 @@ var SignalClient = class extends Resource {
             if (client === this._client) {
               log4("socket connected", void 0, {
                 F: __dxlog_file4,
-                L: 243,
+                L: 244,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1268,7 +1319,7 @@ var SignalClient = class extends Resource {
               state: this._state
             }, {
               F: __dxlog_file4,
-              L: 252,
+              L: 253,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1285,7 +1336,7 @@ var SignalClient = class extends Resource {
                 state: this._state
               }, {
                 F: __dxlog_file4,
-                L: 264,
+                L: 265,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1310,14 +1361,14 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 279,
+      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: 282,
+        L: 283,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1359,7 +1410,7 @@ var SignalClient = class extends Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file4,
-      L: 323,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1394,26 +1445,28 @@ import { schema as schema3 } from "@dxos/protocols/proto";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
-  constructor() {
-    // Swarm messages.
-    this.swarmEvent = new Event3();
-    // Mapping from topic to set of peers.
-    this.swarms = new ComplexMap3(PublicKey5.hash);
-    // Map of connections for each peer for signaling.
-    this.connections = new ComplexMap3(PeerInfoHash);
-  }
+  // Swarm messages.
+  swarmEvent = new Event3();
+  // Mapping from topic to set of peers.
+  swarms = new ComplexMap3(PublicKey5.hash);
+  // Map of connections for each peer for signaling.
+  connections = new ComplexMap3(PeerInfoHash);
 };
 var MemorySignalManager = class {
+  _context;
+  statusChanged = new Event3();
+  swarmEvent = new Event3();
+  onMessage = new Event3();
+  /**  Will be used to emit SwarmEvents on .open() and .close() */
+  _joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
+  _ctx;
+  // TODO(dmaretskyi): Replace with callback.
+  _freezeTrigger = new Trigger3().wake();
   constructor(_context) {
     this._context = _context;
-    this.statusChanged = new Event3();
-    this.swarmEvent = new Event3();
-    this.onMessage = new Event3();
-    this._joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
-    this._freezeTrigger = new Trigger3().wake();
     this._ctx = new Context3(void 0, {
       F: __dxlog_file5,
-      L: 53
+      L: 54
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
   }
@@ -1423,7 +1476,7 @@ var MemorySignalManager = class {
     }
     this._ctx = new Context3(void 0, {
       F: __dxlog_file5,
-      L: 62
+      L: 63
     });
     this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
     await Promise.all([
@@ -1449,7 +1502,7 @@ var MemorySignalManager = class {
   async join({ topic, peer }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 91,
+      L: 92,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1486,7 +1539,7 @@ var MemorySignalManager = class {
   async leave({ topic, peer }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 123,
+      L: 124,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1519,13 +1572,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file5,
-      L: 156,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant4(recipient, void 0, {
       F: __dxlog_file5,
-      L: 158,
+      L: 159,
       S: this,
       A: [
         "recipient",
@@ -1534,7 +1587,7 @@ var MemorySignalManager = class {
     });
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file5,
-      L: 159,
+      L: 160,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1549,7 +1602,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 165,
+        L: 166,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1561,7 +1614,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file5,
-        L: 170,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1574,7 +1627,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file5,
-          L: 178,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1586,7 +1639,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file5,
-        L: 182,
+        L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1600,7 +1653,7 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file5,
-        L: 187,
+        L: 188,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1611,7 +1664,7 @@ var MemorySignalManager = class {
       peerInfo
     }, {
       F: __dxlog_file5,
-      L: 192,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1622,7 +1675,7 @@ var MemorySignalManager = class {
       peerInfo
     }, {
       F: __dxlog_file5,
-      L: 197,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1685,13 +1738,26 @@ var __dxlog_file6 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-mana
 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 Event4();
+  swarmEvent = new Event4();
+  onMessage = new Event4();
+  _instanceId = PublicKey6.random().toHex();
   constructor(_hosts, _getMetadata) {
-    super(), this._hosts = _hosts, this._getMetadata = _getMetadata, this._servers = /* @__PURE__ */ new Map(), this._monitor = new WebsocketSignalManagerMonitor(), this.failureCount = /* @__PURE__ */ new Map(), this.statusChanged = new Event4(), this.swarmEvent = new Event4(), this.onMessage = new Event4(), this._instanceId = PublicKey6.random().toHex();
+    super(), this._hosts = _hosts, this._getMetadata = _getMetadata;
     log6("Created WebsocketSignalManager", {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 58,
+      L: 59,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1713,7 +1779,7 @@ var WebsocketSignalManager = class extends Resource2 {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 78,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1721,7 +1787,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 79,
+      L: 80,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1730,7 +1796,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 83,
+      L: 84,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1743,13 +1809,13 @@ var WebsocketSignalManager = class extends Resource2 {
       serverName
     }, {
       F: __dxlog_file6,
-      L: 91,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 92,
+      L: 93,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1759,7 +1825,7 @@ var WebsocketSignalManager = class extends Resource2 {
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file6,
-      L: 95,
+      L: 96,
       S: this,
       A: [
         "server",
@@ -1779,13 +1845,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 108,
+      L: 109,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 109,
+      L: 110,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1803,13 +1869,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 115,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 116,
+      L: 117,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1829,13 +1895,13 @@ var WebsocketSignalManager = class extends Resource2 {
       recipient
     }, {
       F: __dxlog_file6,
-      L: 125,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 126,
+      L: 127,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1853,7 +1919,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 134,
+            L: 135,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1863,7 +1929,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 137,
+            L: 138,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1873,7 +1939,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 140,
+            L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1896,7 +1962,7 @@ var WebsocketSignalManager = class extends Resource2 {
           failureCount
         }, {
           F: __dxlog_file6,
-          L: 154,
+          L: 155,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1914,7 +1980,7 @@ var WebsocketSignalManager = class extends Resource2 {
         serverName
       }, {
         F: __dxlog_file6,
-        L: 167,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1927,13 +1993,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 174,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 175,
+      L: 176,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1947,13 +2013,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 181,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 182,
+      L: 183,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1978,30 +2044,31 @@ _ts_decorate([
 
 // src/signal-manager/edge-signal-manager.ts
 import { Event as Event5, scheduleMicroTask } from "@dxos/async";
-import { cancelWithContext as cancelWithContext3, Resource as Resource3 } from "@dxos/context";
-import { protocol } from "@dxos/edge-client";
+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 { EdgeService } from "@dxos/protocols";
 import { bufWkt } from "@dxos/protocols/buf";
-import { SwarmRequestSchema, SwarmRequest_Action as SwarmRequestAction, SwarmResponseSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { SwarmRequest_Action as SwarmRequestAction, SwarmRequestSchema, SwarmResponseSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet4 } from "@dxos/util";
 var __dxlog_file7 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/edge-signal-manager.ts";
 var EdgeSignalManager = class extends Resource3 {
+  /**
+  * @deprecated
+  */
+  swarmEvent = new Event5();
+  swarmState = new Event5();
+  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.
+  _swarmPeers = new ComplexMap4(PublicKey7.hash);
+  _edgeConnection;
   constructor({ edgeConnection }) {
     super();
-    /**
-    * @deprecated
-    */
-    this.swarmEvent = new Event5();
-    this.swarmState = new Event5();
-    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.
-    this._swarmPeers = new ComplexMap4(PublicKey7.hash);
     this._edgeConnection = edgeConnection;
   }
   async _open() {
@@ -2023,7 +2090,7 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 65,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2047,16 +2114,23 @@ var EdgeSignalManager = class extends Resource3 {
   }
   async leave({ topic, peer }) {
     this._swarmPeers.delete(topic);
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
-      serviceId: EdgeService.SWARM,
-      source: createMessageSource(topic, peer),
-      payload: {
-        action: SwarmRequestAction.LEAVE,
-        swarmKeys: [
-          topic.toHex()
-        ]
+    try {
+      await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+        serviceId: EdgeService.SWARM,
+        source: createMessageSource(topic, peer),
+        payload: {
+          action: SwarmRequestAction.LEAVE,
+          swarmKeys: [
+            topic.toHex()
+          ]
+        }
+      }));
+    } catch (err) {
+      if (err instanceof EdgeIdentityChangedError) {
+        return;
       }
-    }));
+      throw err;
+    }
   }
   async query({ topic }) {
     const response = cancelWithContext3(this._ctx, this.swarmState.waitFor((state) => state.swarmKey === topic.toHex()));
@@ -2085,7 +2159,7 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 121,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2120,7 +2194,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 158,
+      L: 168,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2164,7 +2238,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processMessage(message) {
     invariant6(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 196,
+      L: 206,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2174,7 +2248,7 @@ var EdgeSignalManager = class extends Resource3 {
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
     invariant6(message.source, "source is missing", {
       F: __dxlog_file7,
-      L: 198,
+      L: 208,
       S: this,
       A: [
         "message.source",
@@ -2183,7 +2257,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target, "target is missing", {
       F: __dxlog_file7,
-      L: 199,
+      L: 209,
       S: this,
       A: [
         "message.target",
@@ -2192,7 +2266,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file7,
-      L: 200,
+      L: 210,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2216,7 +2290,7 @@ var EdgeSignalManager = class extends Resource3 {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
       F: __dxlog_file7,
-      L: 219,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2306,4 +2380,4 @@ export {
   EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-QLQS7TUS.mjs.map
+//# sourceMappingURL=chunk-4EMAT5U7.mjs.map