@dxos/messaging 0.1.58-main.75cbd70 → 0.1.58-main.7858df5

package/dist/lib/node/index.cjs

@@ -54,6 +54,9 @@ var MESSAGE_TIMEOUT = 1e4;
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
 var ReliablePayload = import_protocols.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
 var Acknowledgement = import_protocols.schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
+var ERROR_LIMIT = 5;
+var NETWORK_REBOOT_DELAY = 3e3;
+var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
 var Messenger = class {
   constructor({ signalManager, retryDelay = 300 }) {
     // { peerId, payloadType } => listeners set
@@ -61,8 +64,14 @@ var Messenger = class {
     // peerId => listeners set
     this._defaultListeners = new import_util.ComplexMap(import_keys.PublicKey.hash);
     this._onAckCallbacks = new import_util.ComplexMap(import_keys.PublicKey.hash);
-    this._receivedMessages = new import_util.ComplexSet((key) => key.toHex());
+    this._receivedMessages = new import_util.ComplexSet(import_keys.PublicKey.hash);
+    /**
+    * Keys scheduled to be cleared from _receivedMessages on the next iteration.
+    */
+    this._toClear = new import_util.ComplexSet(import_keys.PublicKey.hash);
     this._closed = true;
+    this._errorCount = 0;
+    this._rebooting = false;
     this._signalManager = signalManager;
     this._retryDelay = retryDelay;
     this.open();
@@ -76,14 +85,14 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 62,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     this._ctx = new import_context.Context({
       onError: (err) => import_log.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 64,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -93,18 +102,21 @@ var Messenger = class {
         from: message.author
       }, {
         F: __dxlog_file,
-        L: 68,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._handleMessage(message);
     }));
+    (0, import_async.scheduleTaskInterval)(this._ctx, async () => {
+      this._performGc();
+    }, RECEIVED_MESSAGES_GC_INTERVAL);
     this._closed = false;
     import_log.log.trace("dxos.mesh.messenger.open", import_protocols.trace.end({
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 73,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -119,7 +131,7 @@ var Messenger = class {
   async sendMessage({ author, recipient, payload }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 85,
+      L: 107,
       S: this,
       A: [
         "!this._closed",
@@ -133,7 +145,7 @@ var Messenger = class {
     };
     (0, import_invariant.invariant)(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
       F: __dxlog_file,
-      L: 92,
+      L: 114,
       S: this,
       A: [
         "!this._onAckCallbacks.has(reliablePayload.messageId!)",
@@ -146,7 +158,7 @@ var Messenger = class {
       recipient
     }, {
       F: __dxlog_file,
-      L: 93,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -161,7 +173,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 107,
+        L: 129,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -173,22 +185,23 @@ var Messenger = class {
         err
       }, {
         F: __dxlog_file,
-        L: 109,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       }));
     }, this._retryDelay);
-    (0, import_async.scheduleTask)(messageContext, () => {
+    (0, import_async.scheduleTask)(messageContext, async () => {
       (0, import_log.log)("message not delivered", {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 118,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
       this._onAckCallbacks.delete(reliablePayload.messageId);
-      timeoutHit(new import_async.TimeoutError(MESSAGE_TIMEOUT, "Message not delivered"));
+      await this.errorLimitCheck();
+      timeoutHit(new import_protocols.TimeoutError("signaling message not delivered", new import_async.TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
       void messageContext.dispose();
     }, MESSAGE_TIMEOUT);
     this._onAckCallbacks.set(reliablePayload.messageId, () => {
@@ -203,6 +216,54 @@ var Messenger = class {
     });
     return promise;
   }
+  async errorLimitCheck() {
+    (0, import_log.log)(`checking error limit ${this._errorCount}`, void 0, {
+      F: __dxlog_file,
+      L: 165,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (this._errorCount++ > ERROR_LIMIT) {
+      await this.rebootNetwork();
+    }
+  }
+  async rebootNetwork() {
+    if (this._rebooting) {
+      return;
+    }
+    this._rebooting = true;
+    (0, import_log.log)("rebooting Messenger/SignalManager", void 0, {
+      F: __dxlog_file,
+      L: 177,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this.close();
+    await this._signalManager.close();
+    (0, import_log.log)("pausing", void 0, {
+      F: __dxlog_file,
+      L: 180,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await new Promise((resolve) => setTimeout(resolve, NETWORK_REBOOT_DELAY));
+    (0, import_log.log)("done pausing", void 0, {
+      F: __dxlog_file,
+      L: 182,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this.open();
+    await this._signalManager.open();
+    (0, import_log.log)("done rebooting", void 0, {
+      F: __dxlog_file,
+      L: 185,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._errorCount = 0;
+    this._rebooting = false;
+  }
   /**
   * Subscribes onMessage function to messages that contains payload with payloadType.
   * @param payloadType if not specified, onMessage will be subscribed to all types of messages.
@@ -210,7 +271,7 @@ var Messenger = class {
   async listen({ peerId, payloadType, onMessage }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 149,
+      L: 204,
       S: this,
       A: [
         "!this._closed",
@@ -274,7 +335,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
       F: __dxlog_file,
-      L: 210,
+      L: 265,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -288,7 +349,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 213,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -310,7 +371,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 235,
+      L: 290,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
@@ -326,7 +387,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 248,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -362,6 +423,27 @@ var Messenger = class {
       }
     }
   }
+  _performGc() {
+    const start = performance.now();
+    for (const key of this._toClear.keys()) {
+      this._receivedMessages.delete(key);
+    }
+    this._toClear.clear();
+    for (const key of this._receivedMessages.keys()) {
+      this._toClear.add(key);
+    }
+    const elapsed = performance.now() - start;
+    if (elapsed > 100) {
+      import_log.log.warn("GC took too long", {
+        elapsed
+      }, {
+        F: __dxlog_file,
+        L: 351,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
 };
 
 // packages/core/mesh/messaging/src/signal-client/signal-client.ts
@@ -1096,7 +1178,6 @@ var MemorySignalManagerContext = class {
   }
 };
 var MemorySignalManager = class {
-  // prettier-ignore
   constructor(_context) {
     this._context = _context;
     this.statusChanged = new import_async4.Event();
@@ -1137,7 +1218,7 @@ var MemorySignalManager = class {
   async join({ topic, peerId }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 104,
+      L: 101,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1178,7 +1259,7 @@ var MemorySignalManager = class {
   async leave({ topic, peerId }) {
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 140,
+      L: 137,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1210,13 +1291,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file4,
-      L: 160,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant4.invariant)(recipient, void 0, {
       F: __dxlog_file4,
-      L: 162,
+      L: 159,
       S: this,
       A: [
         "recipient",
@@ -1225,7 +1306,7 @@ var MemorySignalManager = class {
     });
     (0, import_invariant4.invariant)(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 163,
+      L: 160,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1240,7 +1321,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 169,
+        L: 166,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1252,7 +1333,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 174,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1265,7 +1346,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file4,
-          L: 182,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1277,7 +1358,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file4,
-        L: 186,
+        L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1291,7 +1372,7 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 191,
+        L: 188,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1302,7 +1383,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 196,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1313,7 +1394,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 201,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1359,7 +1440,6 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
 var WebsocketSignalManager = class {
-  // prettier-ignore
   constructor(_hosts) {
     this._hosts = _hosts;
     this._servers = /* @__PURE__ */ new Map();
@@ -1373,7 +1453,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 46,
+      L: 43,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1395,7 +1475,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 68,
+      L: 65,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1403,7 +1483,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 69,
+      L: 66,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1416,7 +1496,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 76,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1438,13 +1518,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 96,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 97,
+      L: 94,
       S: this,
       A: [
         "this._opened",
@@ -1462,13 +1542,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 103,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 104,
+      L: 101,
       S: this,
       A: [
         "this._opened",
@@ -1483,13 +1563,13 @@ var WebsocketSignalManager = class {
   async sendMessage({ author, recipient, payload }) {
     (0, import_log5.log)(`Signal ${recipient}`, void 0, {
       F: __dxlog_file5,
-      L: 118,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 119,
+      L: 116,
       S: this,
       A: [
         "this._opened",
@@ -1503,7 +1583,7 @@ var WebsocketSignalManager = class {
         payload
       }).catch((err) => (0, import_log5.log)(err, void 0, {
         F: __dxlog_file5,
-        L: 122,
+        L: 119,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -1512,13 +1592,13 @@ var WebsocketSignalManager = class {
   async subscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 127,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 128,
+      L: 125,
       S: this,
       A: [
         "this._opened",
@@ -1530,13 +1610,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 134,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 135,
+      L: 132,
       S: this,
       A: [
         "this._opened",
@@ -1549,7 +1629,7 @@ var WebsocketSignalManager = class {
     this._ctx = new import_context4.Context({
       onError: (err) => import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 142,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       })