@dxos/messaging 0.6.9 → 0.6.10-main.48c066e

package/dist/lib/browser/index.mjs

@@ -13,7 +13,8 @@ import { Context } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { TimeoutError as ProtocolTimeoutError, schema, trace as trace2 } from "@dxos/protocols";
+import { TimeoutError as ProtocolTimeoutError, trace as trace2 } from "@dxos/protocols";
+import { schema } from "@dxos/protocols/proto";
 import { ComplexMap, ComplexSet } from "@dxos/util";
 
 // packages/core/mesh/messaging/src/messenger-monitor.ts
@@ -67,27 +68,27 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 71,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
     this._ctx = new Context({
       onError: (err) => log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 73,
+        L: 74,
         S: this,
         C: (f, a) => f(...a)
       })
     }, {
       F: __dxlog_file,
-      L: 72
+      L: 73
     });
     this._ctx.onDispose(this._signalManager.onMessage.on(async (message) => {
       log("received message", {
         from: message.author
       }, {
         F: __dxlog_file,
-        L: 77,
+        L: 78,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -101,7 +102,7 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 92,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -116,7 +117,7 @@ var Messenger = class {
   async sendMessage({ author, recipient, payload }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 104,
+      L: 105,
       S: this,
       A: [
         "!this._closed",
@@ -130,7 +131,7 @@ var Messenger = class {
     };
     invariant(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
       F: __dxlog_file,
-      L: 111,
+      L: 112,
       S: this,
       A: [
         "!this._onAckCallbacks.has(reliablePayload.messageId!)",
@@ -143,7 +144,7 @@ var Messenger = class {
       recipient
     }, {
       F: __dxlog_file,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -159,7 +160,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 127,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -172,7 +173,7 @@ var Messenger = class {
         err
       }, {
         F: __dxlog_file,
-        L: 130,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -182,7 +183,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 139,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -217,7 +218,7 @@ var Messenger = class {
   async listen({ peer, payloadType, onMessage }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 177,
+      L: 178,
       S: this,
       A: [
         "!this._closed",
@@ -228,7 +229,7 @@ var Messenger = class {
     let listeners;
     invariant(peer.peerKey, "Peer key is required", {
       F: __dxlog_file,
-      L: 181,
+      L: 182,
       S: this,
       A: [
         "peer.peerKey",
@@ -290,7 +291,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
       F: __dxlog_file,
-      L: 239,
+      L: 240,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -304,7 +305,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 242,
+      L: 243,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -331,7 +332,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 270,
+      L: 271,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
@@ -347,7 +348,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 283,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -366,7 +367,7 @@ var Messenger = class {
     {
       invariant(message.recipient.peerKey, "Peer key is required", {
         F: __dxlog_file,
-        L: 297,
+        L: 298,
         S: this,
         A: [
           "message.recipient.peerKey",
@@ -407,7 +408,7 @@ var Messenger = class {
         elapsed
       }, {
         F: __dxlog_file,
-        L: 332,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -708,7 +709,8 @@ import { Context as Context2 } from "@dxos/context";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
-import { schema as schema2, trace as trace5 } from "@dxos/protocols";
+import { trace as trace5 } from "@dxos/protocols";
+import { schema as schema2 } from "@dxos/protocols/proto";
 import { createProtoRpcPeer } from "@dxos/rpc";
 
 // packages/core/mesh/messaging/src/signal-client/signal-rpc-client-monitor.ts
@@ -737,7 +739,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 60,
+      L: 61,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -759,7 +761,7 @@ var SignalRPCClient = class {
           } catch (err) {
             log3.warn("send error", err, {
               F: __dxlog_file3,
-              L: 79,
+              L: 80,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -788,7 +790,7 @@ var SignalRPCClient = class {
         }
         log3(`RPC open ${this._url}`, void 0, {
           F: __dxlog_file3,
-          L: 104,
+          L: 105,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -796,7 +798,7 @@ var SignalRPCClient = class {
         this._connectTrigger.wake();
         this._keepaliveCtx = new Context2(void 0, {
           F: __dxlog_file3,
-          L: 107
+          L: 108
         });
         scheduleTaskInterval2(this._keepaliveCtx, async () => {
           this._socket?.send("__ping__");
@@ -810,7 +812,7 @@ var SignalRPCClient = class {
     this._socket.onclose = async () => {
       log3(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file3,
-        L: 127,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -831,7 +833,7 @@ var SignalRPCClient = class {
         url: this._url
       }, {
         F: __dxlog_file3,
-        L: 143,
+        L: 144,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -840,7 +842,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file3,
-      L: 146,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -873,13 +875,13 @@ var SignalRPCClient = class {
       metadata: this._callbacks?.getMetadata?.()
     }, {
       F: __dxlog_file3,
-      L: 172,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 173,
+      L: 174,
       S: this,
       A: [
         "!this._closed",
@@ -900,13 +902,13 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 185,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 186,
+      L: 187,
       S: this,
       A: [
         "!this._closed",
@@ -928,13 +930,13 @@ var SignalRPCClient = class {
       metadata: this._callbacks?.getMetadata?.()
     }, {
       F: __dxlog_file3,
-      L: 196,
+      L: 197,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file3,
-      L: 197,
+      L: 198,
       S: this,
       A: [
         "!this._closed",
@@ -956,7 +958,7 @@ var SignalRPCClient = class {
     } catch (err) {
       log3.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 212,
+        L: 213,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1400,7 +1402,7 @@ import { Context as Context3 } from "@dxos/context";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
-import { schema as schema3 } from "@dxos/protocols";
+import { schema as schema3 } from "@dxos/protocols/proto";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
 
 // packages/core/mesh/messaging/src/signal-methods.ts
@@ -2024,6 +2026,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 +2037,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 +2075,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 +2115,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 +2129,7 @@ var EdgeSignalManager = class extends Resource3 {
         topic
       }, {
         F: __dxlog_file7,
-        L: 123,
+        L: 125,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2162,7 +2166,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 +2176,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 +2185,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 +2194,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 +2211,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
+        }
+      });
+    }
   }
 };