@dxos/messaging 0.1.57 → 0.1.58-main.0e9c99e

package/dist/lib/browser/index.mjs

@@ -1,21 +1,24 @@
 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 { 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
 var MESSAGE_TIMEOUT = 1e4;
 
 // packages/core/mesh/messaging/src/messenger.ts
-var __dxlog_file = "/mnt/ramdisk/work/packages/core/mesh/messaging/src/messenger.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
 var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
 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
@@ -23,8 +26,14 @@ 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;
     this._signalManager = signalManager;
     this._retryDelay = retryDelay;
     this.open();
@@ -38,14 +47,14 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 62,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
     this._ctx = new Context({
       onError: (err) => log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 64,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -55,18 +64,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);
     }));
+    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: 73,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -81,7 +93,7 @@ var Messenger = class {
   async sendMessage({ author, recipient, payload }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 85,
+      L: 107,
       S: this,
       A: [
         "!this._closed",
@@ -95,7 +107,7 @@ var Messenger = class {
     };
     invariant(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
       F: __dxlog_file,
-      L: 92,
+      L: 114,
       S: this,
       A: [
         "!this._onAckCallbacks.has(reliablePayload.messageId!)",
@@ -108,7 +120,7 @@ var Messenger = class {
       recipient
     }, {
       F: __dxlog_file,
-      L: 93,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -123,7 +135,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 107,
+        L: 129,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -135,22 +147,23 @@ var Messenger = class {
         err
       }, {
         F: __dxlog_file,
-        L: 109,
+        L: 131,
         S: this,
         C: (f, a) => f(...a)
       }));
     }, this._retryDelay);
-    scheduleTask(messageContext, () => {
+    scheduleTask(messageContext, async () => {
       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 TimeoutError(MESSAGE_TIMEOUT, "Message not delivered"));
+      await this.errorLimitCheck();
+      timeoutHit(new ProtocolTimeoutError("signaling message not delivered", new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")));
       void messageContext.dispose();
     }, MESSAGE_TIMEOUT);
     this._onAckCallbacks.set(reliablePayload.messageId, () => {
@@ -165,6 +178,54 @@ var Messenger = class {
     });
     return promise;
   }
+  async errorLimitCheck() {
+    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;
+    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();
+    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));
+    log("done pausing", void 0, {
+      F: __dxlog_file,
+      L: 182,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await this.open();
+    await this._signalManager.open();
+    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.
@@ -172,7 +233,7 @@ var Messenger = class {
   async listen({ peerId, payloadType, onMessage }) {
     invariant(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 149,
+      L: 204,
       S: this,
       A: [
         "!this._closed",
@@ -236,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: 210,
+      L: 265,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -250,7 +311,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 213,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -272,7 +333,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     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'",
@@ -288,7 +349,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 248,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -324,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";
@@ -344,7 +426,7 @@ import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
 import { schema as schema2, trace as trace2 } from "@dxos/protocols";
 import { createProtoRpcPeer } from "@dxos/rpc";
-var __dxlog_file2 = "/mnt/ramdisk/work/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-rpc-client.ts";
 var SignalRPCClient = class {
   constructor({ url, callbacks = {} }) {
     this._connectTrigger = new Trigger();
@@ -579,7 +661,7 @@ var SignalRPCClient = class {
 };
 
 // packages/core/mesh/messaging/src/signal-client/signal-client.ts
-var __dxlog_file3 = "/mnt/ramdisk/work/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-client/signal-client.ts";
 var DEFAULT_RECONNECT_TIMEOUT = 100;
 var MAX_RECONNECT_TIMEOUT = 5e3;
 var ERROR_RECONCILE_DELAY = 1e3;
@@ -653,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();
       }
@@ -1046,7 +1128,7 @@ import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap3, ComplexSet as ComplexSet3 } from "@dxos/util";
-var __dxlog_file4 = "/mnt/ramdisk/work/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
 var MemorySignalManagerContext = class {
   constructor() {
     // Swarm messages.
@@ -1319,7 +1401,7 @@ function _ts_decorate(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file5 = "/mnt/ramdisk/work/packages/core/mesh/messaging/src/signal-manager/websocket-signal-manager.ts";
+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) {