@dxos/messaging 0.1.58-main.f117c08 → 0.1.58-main.f4192cb

package/dist/lib/browser/index.mjs

@@ -1,13 +1,12 @@
 import "@dxos/node-std/globals";
 
 // packages/core/mesh/messaging/src/messenger.ts
-import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask } from "@dxos/async";
+import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Context } from "@dxos/context";
-import { TimeoutError as ProtocolTimeoutError } from "@dxos/errors";
 import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { schema, trace } from "@dxos/protocols";
+import { TimeoutError as ProtocolTimeoutError, schema, trace } from "@dxos/protocols";
 import { ComplexMap, ComplexSet } from "@dxos/util";
 
 // packages/core/mesh/messaging/src/timeouts.ts
@@ -19,6 +18,7 @@ var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayloa
 var Acknowledgement = 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
@@ -26,7 +26,11 @@ var Messenger = class {
     // peerId => listeners set
     this._defaultListeners = new ComplexMap(PublicKey.hash);
     this._onAckCallbacks = new ComplexMap(PublicKey.hash);
-    this._receivedMessages = new ComplexSet((key) => key.toHex());
+    this._receivedMessages = new ComplexSet(PublicKey.hash);
+    /**
+    * Keys scheduled to be cleared from _receivedMessages on the next iteration.
+    */
+    this._toClear = new ComplexSet(PublicKey.hash);
     this._closed = true;
     this._errorCount = 0;
     this._rebooting = false;
@@ -43,14 +47,14 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 68,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     this._ctx = new Context({
       onError: (err) => log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 70,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -60,18 +64,21 @@ var Messenger = class {
         from: message.author
       }, {
         F: __dxlog_file,
-        L: 74,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._handleMessage(message);
     }));
+    scheduleTaskInterval(this._ctx, async () => {
+      this._performGc();
+    }, RECEIVED_MESSAGES_GC_INTERVAL);
     this._closed = false;
     log.trace("dxos.mesh.messenger.open", trace.end({
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 79,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -86,7 +93,7 @@ var Messenger = class {
   async sendMessage({ author, recipient, payload }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 91,
+      L: 107,
       S: this,
       A: [
         "!this._closed",
@@ -100,7 +107,7 @@ var Messenger = class {
     };
     invariant(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
       F: __dxlog_file,
-      L: 98,
+      L: 114,
       S: this,
       A: [
         "!this._onAckCallbacks.has(reliablePayload.messageId!)",
@@ -113,7 +120,7 @@ var Messenger = class {
       recipient
     }, {
       F: __dxlog_file,
-      L: 99,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -128,7 +135,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 113,
+        L: 129,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -140,7 +147,7 @@ var Messenger = class {
         err
       }, {
         F: __dxlog_file,
-        L: 115,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -150,7 +157,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 124,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -174,7 +181,7 @@ var Messenger = class {
   async errorLimitCheck() {
     log(`checking error limit ${this._errorCount}`, void 0, {
       F: __dxlog_file,
-      L: 149,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -189,7 +196,7 @@ var Messenger = class {
     this._rebooting = true;
     log("rebooting Messenger/SignalManager", void 0, {
       F: __dxlog_file,
-      L: 161,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -197,14 +204,14 @@ var Messenger = class {
     await this._signalManager.close();
     log("pausing", void 0, {
       F: __dxlog_file,
-      L: 164,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
     await new Promise((resolve) => setTimeout(resolve, NETWORK_REBOOT_DELAY));
     log("done pausing", void 0, {
       F: __dxlog_file,
-      L: 166,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -212,7 +219,7 @@ var Messenger = class {
     await this._signalManager.open();
     log("done rebooting", void 0, {
       F: __dxlog_file,
-      L: 169,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -226,7 +233,7 @@ var Messenger = class {
   async listen({ peerId, payloadType, onMessage }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 188,
+      L: 204,
       S: this,
       A: [
         "!this._closed",
@@ -290,7 +297,7 @@ var Messenger = class {
   async _handleReliablePayload({ author, recipient, payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, {
       F: __dxlog_file,
-      L: 249,
+      L: 265,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -304,7 +311,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 252,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -326,7 +333,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     invariant(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 274,
+      L: 290,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
@@ -342,7 +349,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 287,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -378,10 +385,31 @@ 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) {
+      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
-import { DeferredTask, Event, Trigger as Trigger2, asyncTimeout, scheduleTask as scheduleTask2, scheduleTaskInterval, sleep } from "@dxos/async";
+import { DeferredTask, Event, Trigger as Trigger2, asyncTimeout, scheduleTask as scheduleTask2, scheduleTaskInterval as scheduleTaskInterval2, sleep } from "@dxos/async";
 import { Context as Context2, cancelWithContext } from "@dxos/context";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
@@ -707,7 +735,7 @@ var SignalClient = class {
       await this._reconcileMessageSubscriptions();
       this._reconciled.emit();
     });
-    scheduleTaskInterval(this._ctx, async () => {
+    scheduleTaskInterval2(this._ctx, async () => {
       if (this._state === SignalState.CONNECTED) {
         this._reconcileTask.schedule();
       }
@@ -1112,7 +1140,6 @@ var MemorySignalManagerContext = class {
   }
 };
 var MemorySignalManager = class {
-  // prettier-ignore
   constructor(_context) {
     this._context = _context;
     this.statusChanged = new Event2();
@@ -1153,7 +1180,7 @@ var MemorySignalManager = class {
   async join({ topic, peerId }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 104,
+      L: 101,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1194,7 +1221,7 @@ var MemorySignalManager = class {
   async leave({ topic, peerId }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 140,
+      L: 137,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1226,13 +1253,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file4,
-      L: 160,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant4(recipient, void 0, {
       F: __dxlog_file4,
-      L: 162,
+      L: 159,
       S: this,
       A: [
         "recipient",
@@ -1241,7 +1268,7 @@ var MemorySignalManager = class {
     });
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 163,
+      L: 160,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1256,7 +1283,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 169,
+        L: 166,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1268,7 +1295,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 174,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1281,7 +1308,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file4,
-          L: 182,
+          L: 179,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1293,7 +1320,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file4,
-        L: 186,
+        L: 183,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1307,7 +1334,7 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 191,
+        L: 188,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1318,7 +1345,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 196,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1329,7 +1356,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 201,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1375,7 +1402,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();
@@ -1389,7 +1415,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 46,
+      L: 43,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1411,7 +1437,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 68,
+      L: 65,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1419,7 +1445,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 69,
+      L: 66,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1432,7 +1458,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 76,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1454,13 +1480,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 96,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 97,
+      L: 94,
       S: this,
       A: [
         "this._opened",
@@ -1478,13 +1504,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 103,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 104,
+      L: 101,
       S: this,
       A: [
         "this._opened",
@@ -1499,13 +1525,13 @@ var WebsocketSignalManager = class {
   async sendMessage({ author, recipient, payload }) {
     log5(`Signal ${recipient}`, void 0, {
       F: __dxlog_file5,
-      L: 118,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 119,
+      L: 116,
       S: this,
       A: [
         "this._opened",
@@ -1519,7 +1545,7 @@ var WebsocketSignalManager = class {
         payload
       }).catch((err) => log5(err, void 0, {
         F: __dxlog_file5,
-        L: 122,
+        L: 119,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -1528,13 +1554,13 @@ var WebsocketSignalManager = class {
   async subscribeMessages(peerId) {
     log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 127,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 128,
+      L: 125,
       S: this,
       A: [
         "this._opened",
@@ -1546,13 +1572,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 134,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 135,
+      L: 132,
       S: this,
       A: [
         "this._opened",
@@ -1565,7 +1591,7 @@ var WebsocketSignalManager = class {
     this._ctx = new Context4({
       onError: (err) => log5.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 142,
+        L: 139,
         S: this,
         C: (f, a) => f(...a)
       })