@dxos/messaging 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

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

@@ -531,33 +531,28 @@ var SignalLocalState = class {
   /**
   * Swarm events streams. Keys represent actually joined topic and peerId.
   */
-  _swarmStreams;
+  _swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
   /**
   * Represent desired joined topic and peerId.
   */
-  _joinedTopics;
+  _joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
   /**
   * Represent desired message subscriptions.
   */
-  _subscribedMessages;
+  _subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
   /**
   * Message streams. Keys represents actually subscribed peers.
   * @internal
   */
-  messageStreams;
+  messageStreams = new ComplexMap2((key) => key.toHex());
   /**
   * Event to use in tests to wait till subscription is successfully established.
   * @internal
   */
-  reconciled;
+  reconciled = new Event();
   constructor(_onMessage, _onSwarmEvent) {
     this._onMessage = _onMessage;
     this._onSwarmEvent = _onSwarmEvent;
-    this._swarmStreams = new ComplexMap2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._joinedTopics = new ComplexSet2(({ topic, peerId }) => topic.toHex() + peerId.toHex());
-    this._subscribedMessages = new ComplexSet2(({ peerId }) => peerId.toHex());
-    this.messageStreams = new ComplexMap2((key) => key.toHex());
-    this.reconciled = new Event();
   }
   async safeCloseStreams() {
     const streams = [
@@ -998,11 +993,11 @@ var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class extends Resource {
   _host;
   _getMetadata;
-  _monitor;
-  _state;
+  _monitor = new SignalClientMonitor();
+  _state = SignalState.CLOSED;
   _lastError;
-  _lastReconciliationFailed;
-  _clientReady;
+  _lastReconciliationFailed = false;
+  _clientReady = new Trigger2();
   _connectionCtx;
   _client;
   _reconcileTask;
@@ -1010,15 +1005,15 @@ var SignalClient = class extends Resource {
   /**
   * Number of milliseconds after which the connection will be attempted again in case of error.
   */
-  _reconnectAfter;
-  _instanceId;
+  _reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
+  _instanceId = PublicKey4.random().toHex();
   /**
   * @internal
   */
   localState;
-  statusChanged;
-  onMessage;
-  swarmEvent;
+  statusChanged = new Event2();
+  onMessage = new Event2();
+  swarmEvent = new Event2();
   /**
   * @param _host Signal server websocket URL.
   * @param onMessage called when a new message is received.
@@ -1026,7 +1021,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}`);
     }
@@ -1456,21 +1451,16 @@ var MemorySignalManagerContext = class {
 };
 var MemorySignalManager = class {
   _context;
-  statusChanged;
-  swarmEvent;
-  onMessage;
+  statusChanged = new Event3();
+  swarmEvent = new Event3();
+  onMessage = new Event3();
   /**  Will be used to emit SwarmEvents on .open() and .close() */
-  _joinedSwarms;
+  _joinedSwarms = new ComplexSet3(({ topic, peer }) => topic.toHex() + peer.peerKey);
   _ctx;
   // TODO(dmaretskyi): Replace with callback.
-  _freezeTrigger;
+  _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: 54
@@ -1747,19 +1737,19 @@ var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
 var WebsocketSignalManager = class extends Resource2 {
   _hosts;
   _getMetadata;
-  _servers;
-  _monitor;
+  _servers = /* @__PURE__ */ new Map();
+  _monitor = new WebsocketSignalManagerMonitor();
   /**
   * Used to avoid logging failed server restarts more than once until the server actually recovers.
   */
   _failedServersBitfield;
-  failureCount;
-  statusChanged;
-  swarmEvent;
-  onMessage;
-  _instanceId;
+  failureCount = /* @__PURE__ */ new Map();
+  statusChanged = new 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
     }, {
@@ -2052,7 +2042,7 @@ _ts_decorate([
 // src/signal-manager/edge-signal-manager.ts
 import { Event as Event5, scheduleMicroTask } from "@dxos/async";
 import { Resource as Resource3, cancelWithContext as cancelWithContext3 } from "@dxos/context";
-import { protocol } from "@dxos/edge-client";
+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";
@@ -2121,16 +2111,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()));
@@ -2159,7 +2156,7 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 122,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2194,7 +2191,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 159,
+      L: 168,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2238,7 +2235,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processMessage(message) {
     invariant6(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 197,
+      L: 206,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2248,7 +2245,7 @@ var EdgeSignalManager = class extends Resource3 {
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
     invariant6(message.source, "source is missing", {
       F: __dxlog_file7,
-      L: 199,
+      L: 208,
       S: this,
       A: [
         "message.source",
@@ -2257,7 +2254,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target, "target is missing", {
       F: __dxlog_file7,
-      L: 200,
+      L: 209,
       S: this,
       A: [
         "message.target",
@@ -2266,7 +2263,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file7,
-      L: 201,
+      L: 210,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2290,7 +2287,7 @@ var EdgeSignalManager = class extends Resource3 {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
       F: __dxlog_file7,
-      L: 220,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2380,4 +2377,4 @@ export {
   EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-TPBTNKLU.mjs.map
+//# sourceMappingURL=chunk-L7NDSF6K.mjs.map