@dxos/messaging 0.7.4 → 0.7.5-main.9cb18ac

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

@@ -2005,9 +2005,9 @@ var EdgeSignalManager = class extends Resource3 {
     this.swarmEvent = 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 +2030,17 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 56,
+        L: 60,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    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 +2053,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 +2073,13 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file7,
-        L: 89,
+        L: 93,
         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 +2096,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 +2108,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 126,
+      L: 130,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2119,13 +2122,13 @@ var EdgeSignalManager = class extends Resource3 {
         topic
       }, {
         F: __dxlog_file7,
-        L: 130,
+        L: 134,
         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 +2154,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: 167,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -2166,7 +2169,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: 169,
       S: this,
       A: [
         "message.source",
@@ -2175,7 +2178,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target, "target is missing", {
       F: __dxlog_file7,
-      L: 166,
+      L: 170,
       S: this,
       A: [
         "message.target",
@@ -2184,7 +2187,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file7,
-      L: 167,
+      L: 171,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2208,16 +2211,17 @@ var EdgeSignalManager = class extends Resource3 {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
       F: __dxlog_file7,
-      L: 186,
+      L: 190,
       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 +2230,7 @@ var EdgeSignalManager = class extends Resource3 {
 var createMessageSource = (topic, peerInfo) => {
   return {
     swarmKey: topic.toHex(),
-    identityKey: peerInfo.identityKey,
-    peerKey: peerInfo.peerKey
+    ...peerInfo
   };
 };
 
@@ -2298,4 +2301,4 @@ export {
   EdgeSignalManager,
   setIdentityTags
 };
-//# sourceMappingURL=chunk-U5OG65N2.mjs.map
+//# sourceMappingURL=chunk-YYX7KDG4.mjs.map