@dxos/messaging 0.6.9 → 0.6.10-main.bbdfaa4

package/dist/lib/browser/index.mjs

@@ -2024,6 +2024,8 @@ var EdgeSignalManager = class extends Resource3 {
   }
   async _open() {
     this._ctx.onDispose(this._edgeConnection.addListener((message) => this._onMessage(message)));
+    this._edgeConnection.reconnect.on(this._ctx, () => this._rejoinAllSwarms());
+    await this._rejoinAllSwarms();
   }
   /**
   * Warning: PeerInfo is inferred from edgeConnection.
@@ -2033,12 +2035,12 @@ var EdgeSignalManager = class extends Resource3 {
       log7.warn("ignoring peer info on join request", {
         peer,
         expected: {
-          peerKey: this._edgeConnection.deviceKey.toHex(),
-          identityKey: this._edgeConnection.identityKey.toHex()
+          peerKey: this._edgeConnection.peerKey,
+          identityKey: this._edgeConnection.identityKey
         }
       }, {
         F: __dxlog_file7,
-        L: 51,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2071,12 +2073,12 @@ var EdgeSignalManager = class extends Resource3 {
       log7.warn("ignoring author on send request", {
         author: message.author,
         expected: {
-          peerKey: this._edgeConnection.deviceKey,
+          peerKey: this._edgeConnection.peerKey,
           identityKey: this._edgeConnection.identityKey
         }
       }, {
         F: __dxlog_file7,
-        L: 82,
+        L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2111,7 +2113,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant6(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 119,
+      L: 121,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -2125,7 +2127,7 @@ var EdgeSignalManager = class extends Resource3 {
         topic
       }, {
         F: __dxlog_file7,
-        L: 123,
+        L: 125,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2162,7 +2164,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processMessage(message) {
     invariant6(protocol.getPayloadType(message) === AnySchema.typeName, "Wrong payload type", {
       F: __dxlog_file7,
-      L: 156,
+      L: 158,
       S: this,
       A: [
         "protocol.getPayloadType(message) === AnySchema.typeName",
@@ -2172,7 +2174,7 @@ var EdgeSignalManager = class extends Resource3 {
     const payload = protocol.getPayload(message, AnySchema);
     invariant6(message.source, "source is missing", {
       F: __dxlog_file7,
-      L: 158,
+      L: 160,
       S: this,
       A: [
         "message.source",
@@ -2181,7 +2183,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target, "target is missing", {
       F: __dxlog_file7,
-      L: 159,
+      L: 161,
       S: this,
       A: [
         "message.target",
@@ -2190,7 +2192,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant6(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file7,
-      L: 160,
+      L: 162,
       S: this,
       A: [
         "message.target.length === 1",
@@ -2207,7 +2209,26 @@ var EdgeSignalManager = class extends Resource3 {
     });
   }
   _matchSelfPeerInfo(peer) {
-    return peer && (peer.peerKey === this._edgeConnection.deviceKey.toHex() || peer.identityKey === this._edgeConnection.identityKey.toHex());
+    return peer && (peer.peerKey === this._edgeConnection.peerKey || peer.identityKey === this._edgeConnection.identityKey);
+  }
+  async _rejoinAllSwarms() {
+    log7("rejoin swarms", {
+      swarms: Array.from(this._swarmPeers.keys())
+    }, {
+      F: __dxlog_file7,
+      L: 181,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    for (const topic of this._swarmPeers.keys()) {
+      await this.join({
+        topic,
+        peer: {
+          peerKey: this._edgeConnection.peerKey,
+          identityKey: this._edgeConnection.identityKey
+        }
+      });
+    }
   }
 };