@dxos/messaging 0.7.4 → 0.7.5-labs.071a3e2

package/dist/lib/browser/{chunk-U5OG65N2.mjs → chunk-KWCKO7OY.mjs}

@@ -732,7 +732,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 61,
+      L: 66,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -754,7 +754,7 @@ var SignalRPCClient = class {
           } catch (err) {
             log3.warn("send error", err, {
               F: __dxlog_file3,
-              L: 80,
+              L: 85,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -783,7 +783,7 @@ var SignalRPCClient = class {
         }
         log3(`RPC open ${this._url}`, void 0, {
           F: __dxlog_file3,
-          L: 105,
+          L: 110,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -791,7 +791,7 @@ var SignalRPCClient = class {
         this._connectTrigger.wake();
         this._keepaliveCtx = new Context2(void 0, {
           F: __dxlog_file3,
-          L: 108
+          L: 113
         });
         scheduleTaskInterval2(this._keepaliveCtx, async () => {
           this._socket?.send("__ping__");
@@ -805,7 +805,7 @@ var SignalRPCClient = class {
     this._socket.onclose = async () => {
       log3(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file3,
-        L: 128,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -826,7 +826,7 @@ var SignalRPCClient = class {
         url: this._url
       }, {
         F: __dxlog_file3,
-        L: 144,
+        L: 149,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -835,7 +835,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 147,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -868,13 +868,13 @@ var SignalRPCClient = class {
       metadata: this._callbacks?.getMetadata?.()
     }, {
       F: __dxlog_file3,
-      L: 173,
+      L: 178,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 174,
+      L: 179,
       S: this,
       A: [
         "!this._closed",
@@ -895,13 +895,13 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 186,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 187,
+      L: 192,
       S: this,
       A: [
         "!this._closed",
@@ -923,13 +923,13 @@ var SignalRPCClient = class {
       metadata: this._callbacks?.getMetadata?.()
     }, {
       F: __dxlog_file3,
-      L: 197,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 198,
+      L: 203,
       S: this,
       A: [
         "!this._closed",
@@ -951,7 +951,7 @@ var SignalRPCClient = class {
     } catch (err) {
       log3.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 213,
+        L: 218,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -998,7 +998,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 92,
+      L: 94,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1016,7 +1016,7 @@ var SignalClient = class extends Resource {
         }));
         invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file4,
-          L: 102,
+          L: 104,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1059,7 +1059,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 135,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1071,7 +1071,7 @@ var SignalClient = class extends Resource {
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
       log4.warn("SignalClient error:", err, {
         F: __dxlog_file4,
-        L: 144,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1081,7 +1081,7 @@ var SignalClient = class extends Resource {
   async _close() {
     log4("closing...", void 0, {
       F: __dxlog_file4,
-      L: 150,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1094,7 +1094,7 @@ var SignalClient = class extends Resource {
     await this._safeResetClient();
     log4("closed", void 0, {
       F: __dxlog_file4,
-      L: 158,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1114,7 +1114,7 @@ var SignalClient = class extends Resource {
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 172,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1131,7 +1131,7 @@ var SignalClient = class extends Resource {
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file4,
-      L: 179,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1146,7 +1146,7 @@ var SignalClient = class extends Resource {
       await this._clientReady.wait();
       invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
         F: __dxlog_file4,
-        L: 187,
+        L: 189,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
@@ -1155,7 +1155,7 @@ var SignalClient = class extends Resource {
       });
       invariant3(msg.author.peerKey, "Author key required", {
         F: __dxlog_file4,
-        L: 188,
+        L: 190,
         S: this,
         A: [
           "msg.author.peerKey",
@@ -1164,7 +1164,7 @@ var SignalClient = class extends Resource {
       });
       invariant3(msg.recipient.peerKey, "Recipient key required", {
         F: __dxlog_file4,
-        L: 189,
+        L: 191,
         S: this,
         A: [
           "msg.recipient.peerKey",
@@ -1181,7 +1181,7 @@ var SignalClient = class extends Resource {
   async subscribeMessages(peer) {
     invariant3(peer.peerKey, "Peer key required", {
       F: __dxlog_file4,
-      L: 199,
+      L: 201,
       S: this,
       A: [
         "peer.peerKey",
@@ -1192,7 +1192,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file4,
-      L: 200,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1202,7 +1202,7 @@ var SignalClient = class extends Resource {
   async unsubscribeMessages(peer) {
     invariant3(peer.peerKey, "Peer key required", {
       F: __dxlog_file4,
-      L: 206,
+      L: 208,
       S: this,
       A: [
         "peer.peerKey",
@@ -1213,7 +1213,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file4,
-      L: 207,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1228,13 +1228,13 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 216,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file4,
-      L: 217,
+      L: 219,
       S: this,
       A: [
         "!this._client",
@@ -1246,7 +1246,7 @@ var SignalClient = class extends Resource {
     this._connectionCtx.onDispose(async () => {
       log4("connection context disposed", void 0, {
         F: __dxlog_file4,
-        L: 224,
+        L: 226,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1261,7 +1261,7 @@ var SignalClient = class extends Resource {
             if (client === this._client) {
               log4("socket connected", void 0, {
                 F: __dxlog_file4,
-                L: 235,
+                L: 237,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1276,7 +1276,7 @@ var SignalClient = class extends Resource {
               state: this._state
             }, {
               F: __dxlog_file4,
-              L: 244,
+              L: 246,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1293,7 +1293,7 @@ var SignalClient = class extends Resource {
                 state: this._state
               }, {
                 F: __dxlog_file4,
-                L: 256,
+                L: 258,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1318,14 +1318,14 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 271,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === SignalState.RECONNECTING) {
       log4.info("Signal api already reconnecting.", void 0, {
         F: __dxlog_file4,
-        L: 274,
+        L: 276,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1367,7 +1367,7 @@ var SignalClient = class extends Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file4,
-      L: 315,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1705,7 +1705,7 @@ var WebsocketSignalManager = class extends Resource2 {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 54,
+      L: 56,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1727,7 +1727,7 @@ var WebsocketSignalManager = class extends Resource2 {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 74,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1735,7 +1735,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 75,
+      L: 77,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1744,7 +1744,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 79,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1757,13 +1757,13 @@ var WebsocketSignalManager = class extends Resource2 {
       serverName
     }, {
       F: __dxlog_file6,
-      L: 87,
+      L: 89,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 88,
+      L: 90,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1773,7 +1773,7 @@ var WebsocketSignalManager = class extends Resource2 {
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file6,
-      L: 91,
+      L: 93,
       S: this,
       A: [
         "server",
@@ -1793,13 +1793,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 104,
+      L: 106,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 105,
+      L: 107,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1817,13 +1817,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 111,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 112,
+      L: 114,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1840,13 +1840,13 @@ var WebsocketSignalManager = class extends Resource2 {
       recipient
     }, {
       F: __dxlog_file6,
-      L: 117,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 118,
+      L: 120,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1864,7 +1864,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 126,
+            L: 128,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1874,7 +1874,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 129,
+            L: 131,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1884,7 +1884,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 132,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1907,7 +1907,7 @@ var WebsocketSignalManager = class extends Resource2 {
           failureCount
         }, {
           F: __dxlog_file6,
-          L: 146,
+          L: 148,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1925,7 +1925,7 @@ var WebsocketSignalManager = class extends Resource2 {
         serverName
       }, {
         F: __dxlog_file6,
-        L: 159,
+        L: 161,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1938,13 +1938,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 166,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 167,
+      L: 169,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1958,13 +1958,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file6,
-      L: 173,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file6,
-      L: 174,
+      L: 176,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2003,11 +2003,12 @@ var EdgeSignalManager = class extends Resource3 {
   constructor({ edgeConnection }) {
     super();
     this.swarmEvent = new Event5();
+    this.swarmState = new Event5();
     this.onMessage = new Event5();
     /**
-    * swarm key -> peerKeys in the swarm
+    * Swarm key -> { peer: <own peer info>, joinedPeers: <state of swarm> }.
     */
-    // TODO(mykola): This class should not contain swarm state. Temporary before network-manager API changes to accept list of peers.
+    // 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;
   }
@@ -2030,14 +2031,19 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 56,
+        L: 62,
         S: this,
         C: (f, a) => f(...a)
       });
+      peer.identityKey = this._edgeConnection.identityKey;
+      peer.peerKey = this._edgeConnection.peerKey;
     }
-    this._swarmPeers.set(topic, new ComplexSet4(PeerInfoHash));
+    this._swarmPeers.set(topic, {
+      lastState: peer.state,
+      joinedPeers: new ComplexSet4(PeerInfoHash)
+    });
     await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
-      serviceId: EdgeService.SWARM_SERVICE_ID,
+      serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, peer),
       payload: {
         action: SwarmRequestAction.JOIN,
@@ -2050,7 +2056,7 @@ var EdgeSignalManager = class extends Resource3 {
   async leave({ topic, peer }) {
     this._swarmPeers.delete(topic);
     await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
-      serviceId: EdgeService.SWARM_SERVICE_ID,
+      serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, peer),
       payload: {
         action: SwarmRequestAction.LEAVE,
@@ -2070,13 +2076,13 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 89,
+        L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     await this._edgeConnection.send(protocol.createMessage(bufWkt.AnySchema, {
-      serviceId: EdgeService.SIGNAL_SERVICE_ID,
+      serviceId: EdgeService.SIGNAL,
       source: message.author,
       target: [
         message.recipient
@@ -2093,11 +2099,11 @@ var EdgeSignalManager = class extends Resource3 {
   }
   _onMessage(message) {
     switch (message.serviceId) {
-      case EdgeService.SWARM_SERVICE_ID: {
+      case EdgeService.SWARM: {
         this._processSwarmResponse(message);
         break;
       }
-      case EdgeService.SIGNAL_SERVICE_ID: {
+      case EdgeService.SIGNAL: {
         this._processMessage(message);
       }
     }
@@ -2105,7 +2111,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 126,
+      L: 135,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2113,19 +2119,20 @@ var EdgeSignalManager = class extends Resource3 {
       ]
     });
     const payload = protocol.getPayload(message, SwarmResponseSchema);
+    this.swarmState.emit(payload);
     const topic = PublicKey7.from(payload.swarmKey);
     if (!this._swarmPeers.has(topic)) {
       log7.warn("Received message from wrong topic", {
         topic
       }, {
         F: __dxlog_file7,
-        L: 130,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    const oldPeers = this._swarmPeers.get(topic);
+    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);
     for (const peer of newPeers) {
@@ -2151,12 +2158,12 @@ var EdgeSignalManager = class extends Resource3 {
         }
       });
     }
-    this._swarmPeers.set(topic, newPeers);
+    this._swarmPeers.get(topic).joinedPeers = newPeers;
   }
   _processMessage(message) {
     invariant6(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 163,
+      L: 173,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2166,7 +2173,7 @@ var EdgeSignalManager = class extends Resource3 {
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
     invariant6(message.source, "source is missing", {
       F: __dxlog_file7,
-      L: 165,
+      L: 175,
       S: this,
       A: [
         "message.source",
@@ -2175,7 +2182,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target, "target is missing", {
       F: __dxlog_file7,
-      L: 166,
+      L: 176,
       S: this,
       A: [
         "message.target",
@@ -2184,7 +2191,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file7,
-      L: 167,
+      L: 177,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2208,16 +2215,17 @@ var EdgeSignalManager = class extends Resource3 {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
       F: __dxlog_file7,
-      L: 186,
+      L: 196,
       S: this,
       C: (f, a) => f(...a)
     });
-    for (const topic of this._swarmPeers.keys()) {
+    for (const [topic, { lastState }] of this._swarmPeers.entries()) {
       await this.join({
         topic,
         peer: {
           peerKey: this._edgeConnection.peerKey,
-          identityKey: this._edgeConnection.identityKey
+          identityKey: this._edgeConnection.identityKey,
+          state: lastState
         }
       });
     }
@@ -2226,8 +2234,7 @@ var EdgeSignalManager = class extends Resource3 {
 var createMessageSource = (topic, peerInfo) => {
   return {
     swarmKey: topic.toHex(),
-    identityKey: peerInfo.identityKey,
-    peerKey: peerInfo.peerKey
+    ...peerInfo
   };
 };
 
@@ -2298,4 +2305,4 @@ export {
   EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-U5OG65N2.mjs.map
+//# sourceMappingURL=chunk-KWCKO7OY.mjs.map