@dxos/messaging 0.4.10-main.fd4f2a3 → 0.4.10-main.fd8ea31

package/dist/lib/node/index.cjs

@@ -668,7 +668,6 @@ var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class {
   /**
   * @param _host Signal server websocket URL.
-  * @param _onMessage
   */
   constructor(_host, _onMessage, _onSwarmEvent, _getMetadata) {
     this._host = _host;
@@ -699,12 +698,12 @@ var SignalClient = class {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
   }
-  open() {
+  async open() {
     import_log2.log.trace("dxos.mesh.signal-client.open", import_protocols2.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 136,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -722,7 +721,7 @@ var SignalClient = class {
         if (this._state === import_signal.SignalState.CONNECTED) {
           import_log2.log.warn("SignalClient error:", err, {
             F: __dxlog_file3,
-            L: 148,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -749,7 +748,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 177,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -757,7 +756,7 @@ var SignalClient = class {
   async close() {
     (0, import_log2.log)("closing...", void 0, {
       F: __dxlog_file3,
-      L: 181,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -773,7 +772,7 @@ var SignalClient = class {
     this._setState(import_signal.SignalState.CLOSED);
     (0, import_log2.log)("closed", void 0, {
       F: __dxlog_file3,
-      L: 192,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -794,7 +793,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 207,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -812,7 +811,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 215,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -834,7 +833,7 @@ var SignalClient = class {
     await this._clientReady.wait();
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 225,
+      L: 216,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -848,7 +847,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 230,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -862,7 +861,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 236,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -884,7 +883,7 @@ var SignalClient = class {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
-      L: 255,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -896,13 +895,13 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 260,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this._client, "Client already created", {
       F: __dxlog_file3,
-      L: 261,
+      L: 252,
       S: this,
       A: [
         "!this._client",
@@ -914,7 +913,7 @@ var SignalClient = class {
     this._connectionCtx.onDispose(async () => {
       (0, import_log2.log)("connection context disposed", void 0, {
         F: __dxlog_file3,
-        L: 268,
+        L: 259,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -930,7 +929,7 @@ var SignalClient = class {
           onConnected: () => {
             (0, import_log2.log)("socket connected", void 0, {
               F: __dxlog_file3,
-              L: 280,
+              L: 271,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -945,7 +944,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 289,
+              L: 280,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -965,7 +964,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 304,
+              L: 295,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -997,7 +996,7 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 332,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1005,7 +1004,7 @@ var SignalClient = class {
     if (this._state === import_signal.SignalState.RECONNECTING) {
       import_log2.log.warn("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
-        L: 336,
+        L: 327,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1028,7 +1027,7 @@ var SignalClient = class {
     const client = this._client;
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 361,
+      L: 352,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1067,7 +1066,7 @@ var SignalClient = class {
           swarmEvent
         }, {
           F: __dxlog_file3,
-          L: 388,
+          L: 379,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1087,7 +1086,7 @@ var SignalClient = class {
     const client = this._client;
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 401,
+      L: 392,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1169,7 +1168,7 @@ var MemorySignalManager = class {
   async join({ topic, peerId }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 101,
+      L: 102,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1210,7 +1209,7 @@ var MemorySignalManager = class {
   async leave({ topic, peerId }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 137,
+      L: 138,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1242,13 +1241,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file4,
-      L: 157,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(recipient, void 0, {
       F: __dxlog_file4,
-      L: 159,
+      L: 160,
       S: this,
       A: [
         "recipient",
@@ -1257,7 +1256,7 @@ var MemorySignalManager = class {
     });
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 160,
+      L: 161,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1272,7 +1271,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 166,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1284,7 +1283,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 171,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1297,7 +1296,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file4,
-          L: 179,
+          L: 180,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1309,7 +1308,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file4,
-        L: 183,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1323,7 +1322,7 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 188,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1334,7 +1333,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 193,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1345,7 +1344,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1400,7 +1399,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 49,
+      L: 51,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1423,7 +1422,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 73,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1431,7 +1430,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 74,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1444,7 +1443,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1458,17 +1457,17 @@ var WebsocketSignalManager = class {
     await Promise.all(Array.from(this._servers.values()).map((server) => server.close()));
   }
   async restartServer(serverName) {
-    (0, import_log5.log)("Restarting server", {
+    (0, import_log5.log)("restarting server", {
       serverName
     }, {
       F: __dxlog_file5,
-      L: 97,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "server already closed", {
       F: __dxlog_file5,
-      L: 98,
+      L: 104,
       S: this,
       A: [
         "this._opened",
@@ -1478,7 +1477,7 @@ var WebsocketSignalManager = class {
     const server = this._servers.get(serverName);
     (0, import_invariant5.invariant)(server, "server not found", {
       F: __dxlog_file5,
-      L: 101,
+      L: 107,
       S: this,
       A: [
         "server",
@@ -1493,18 +1492,18 @@ var WebsocketSignalManager = class {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
   async join({ topic, peerId }) {
-    (0, import_log5.log)("Join", {
+    (0, import_log5.log)("join", {
       topic,
       peerId
     }, {
       F: __dxlog_file5,
-      L: 114,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._opened",
@@ -1522,13 +1521,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 121,
+      L: 127,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 122,
+      L: 128,
       S: this,
       A: [
         "this._opened",
@@ -1541,15 +1540,17 @@ var WebsocketSignalManager = class {
     }));
   }
   async sendMessage({ author, recipient, payload }) {
-    (0, import_log5.log)(`Signal ${recipient.truncate()}`, void 0, {
+    (0, import_log5.log)("signal", {
+      recipient
+    }, {
       F: __dxlog_file5,
-      L: 136,
+      L: 142,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 137,
+      L: 143,
       S: this,
       A: [
         "this._opened",
@@ -1567,7 +1568,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 142,
+            L: 148,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1576,7 +1577,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 144,
+            L: 150,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1586,7 +1587,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 147,
+            L: 153,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1598,9 +1599,9 @@ var WebsocketSignalManager = class {
   async checkServerFailure(serverName) {
     const failureCount = this.failureCount.get(serverName) ?? 0;
     if (failureCount > MAX_SERVER_FAILURES) {
-      import_log5.log.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
+      import_log5.log.warn(`too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
         F: __dxlog_file5,
-        L: 158,
+        L: 164,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1611,15 +1612,17 @@ var WebsocketSignalManager = class {
     this.failureCount.set(serverName, (this.failureCount.get(serverName) ?? 0) + 1);
   }
   async subscribeMessages(peerId) {
-    (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
+    (0, import_log5.log)("subscribed for message stream", {
+      peerId
+    }, {
       F: __dxlog_file5,
-      L: 167,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 168,
+      L: 175,
       S: this,
       A: [
         "this._opened",
@@ -1629,15 +1632,17 @@ var WebsocketSignalManager = class {
     await this._forEachServer(async (server) => server.subscribeMessages(peerId));
   }
   async unsubscribeMessages(peerId) {
-    (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
+    (0, import_log5.log)("subscribed for message stream", {
+      peerId
+    }, {
       F: __dxlog_file5,
-      L: 174,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 175,
+      L: 182,
       S: this,
       A: [
         "this._opened",
@@ -1650,7 +1655,7 @@ var WebsocketSignalManager = class {
     this._ctx = new import_context5.Context({
       onError: (err) => import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 182,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       })