@dxos/messaging 0.3.0 → 0.3.1-main.0fddbd4

package/dist/lib/node/index.cjs

@@ -51,11 +51,9 @@ var import_util = require("@dxos/util");
 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 = 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 }) {
@@ -70,8 +68,6 @@ var Messenger = class {
     */
     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();
@@ -85,14 +81,14 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 74,
+      L: 69,
       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: 76,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -102,7 +98,7 @@ var Messenger = class {
         from: message.author
       }, {
         F: __dxlog_file,
-        L: 80,
+        L: 75,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -116,7 +112,7 @@ var Messenger = class {
       id: traceId
     }), {
       F: __dxlog_file,
-      L: 95,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -131,7 +127,7 @@ var Messenger = class {
   async sendMessage({ author, recipient, payload }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 107,
+      L: 102,
       S: this,
       A: [
         "!this._closed",
@@ -145,7 +141,7 @@ var Messenger = class {
     };
     (0, import_invariant.invariant)(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, {
       F: __dxlog_file,
-      L: 114,
+      L: 109,
       S: this,
       A: [
         "!this._onAckCallbacks.has(reliablePayload.messageId!)",
@@ -158,7 +154,7 @@ var Messenger = class {
       recipient
     }, {
       F: __dxlog_file,
-      L: 115,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -173,7 +169,7 @@ var Messenger = class {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -185,22 +181,21 @@ var Messenger = class {
         err
       }, {
         F: __dxlog_file,
-        L: 131,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       }));
     }, this._retryDelay);
-    (0, import_async.scheduleTask)(messageContext, async () => {
+    (0, import_async.scheduleTask)(messageContext, () => {
       (0, import_log.log)("message not delivered", {
         messageId: reliablePayload.messageId
       }, {
         F: __dxlog_file,
-        L: 140,
+        L: 135,
         S: this,
         C: (f, a) => f(...a)
       });
       this._onAckCallbacks.delete(reliablePayload.messageId);
-      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);
@@ -216,54 +211,6 @@ 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.
@@ -271,7 +218,7 @@ var Messenger = class {
   async listen({ peerId, payloadType, onMessage }) {
     (0, import_invariant.invariant)(!this._closed, "Closed", {
       F: __dxlog_file,
-      L: 204,
+      L: 171,
       S: this,
       A: [
         "!this._closed",
@@ -335,7 +282,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: 265,
+      L: 232,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.ReliablePayload'",
@@ -349,7 +296,7 @@ var Messenger = class {
       messageId: reliablePayload.messageId
     }, {
       F: __dxlog_file,
-      L: 268,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -371,7 +318,7 @@ var Messenger = class {
   async _handleAcknowledgement({ payload }) {
     (0, import_invariant.invariant)(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, {
       F: __dxlog_file,
-      L: 290,
+      L: 257,
       S: this,
       A: [
         "payload.type_url === 'dxos.mesh.messaging.Acknowledgement'",
@@ -387,7 +334,7 @@ var Messenger = class {
       to: author
     }, {
       F: __dxlog_file,
-      L: 303,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -438,7 +385,7 @@ var Messenger = class {
         elapsed
       }, {
         F: __dxlog_file,
-        L: 351,
+        L: 318,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -464,7 +411,7 @@ var import_keys2 = require("@dxos/keys");
 var import_log2 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_rpc = require("@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 import_async2.Trigger();
@@ -699,7 +646,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;
@@ -1166,7 +1113,7 @@ var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_protocols4 = require("@dxos/protocols");
 var import_util3 = require("@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.
@@ -1438,12 +1385,15 @@ 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 MAX_SERVER_FAILURES = 5;
+var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
 var WebsocketSignalManager = class {
   constructor(_hosts) {
     this._hosts = _hosts;
     this._servers = /* @__PURE__ */ new Map();
     this._opened = false;
+    this.failureCount = /* @__PURE__ */ new Map();
     this.statusChanged = new import_async5.Event();
     this.commandTrace = new import_async5.Event();
     this.swarmEvent = new import_async5.Event();
@@ -1453,7 +1403,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 43,
+      L: 46,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1464,6 +1414,7 @@ var WebsocketSignalManager = class {
       const server = new SignalClient(host.server, async (message) => this.onMessage.emit(message), async (data) => this.swarmEvent.emit(data));
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
       this._servers.set(host.server, server);
+      this.failureCount.set(host.server, 0);
       server.commandTrace.on((trace5) => this.commandTrace.emit(trace5));
     }
   }
@@ -1475,7 +1426,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 65,
+      L: 69,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1483,7 +1434,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 66,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1496,7 +1447,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 73,
+      L: 77,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1509,6 +1460,38 @@ var WebsocketSignalManager = class {
     await this._ctx.dispose();
     await Promise.all(Array.from(this._servers.values()).map((server) => server.close()));
   }
+  async restartServer(serverName) {
+    (0, import_log5.log)("Restarting server", {
+      serverName
+    }, {
+      F: __dxlog_file5,
+      L: 93,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant5.invariant)(this._opened, "server already closed", {
+      F: __dxlog_file5,
+      L: 94,
+      S: this,
+      A: [
+        "this._opened",
+        "'server already closed'"
+      ]
+    });
+    const server = this._servers.get(serverName);
+    (0, import_invariant5.invariant)(server, "server not found", {
+      F: __dxlog_file5,
+      L: 97,
+      S: this,
+      A: [
+        "server",
+        "'server not found'"
+      ]
+    });
+    await server.close();
+    await (0, import_async5.sleep)(WSS_SIGNAL_SERVER_REBOOT_DELAY);
+    await server.open();
+  }
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
@@ -1518,13 +1501,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 93,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 94,
+      L: 111,
       S: this,
       A: [
         "this._opened",
@@ -1542,13 +1525,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 100,
+      L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 101,
+      L: 118,
       S: this,
       A: [
         "this._opened",
@@ -1561,44 +1544,75 @@ var WebsocketSignalManager = class {
     }));
   }
   async sendMessage({ author, recipient, payload }) {
-    (0, import_log5.log)(`Signal ${recipient}`, void 0, {
+    (0, import_log5.log)(`Signal ${recipient.truncate()}`, void 0, {
       F: __dxlog_file5,
-      L: 115,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 116,
+      L: 133,
       S: this,
       A: [
         "this._opened",
         "'Closed'"
       ]
     });
-    void this._forEachServer(async (server) => {
+    void this._forEachServer(async (server, serverName) => {
       void server.sendMessage({
         author,
         recipient,
         payload
-      }).catch((err) => (0, import_log5.log)(err, void 0, {
+      }).catch((err) => {
+        if (err instanceof import_protocols5.RateLimitExceededError) {
+          (0, import_log5.log)("WSS rate limit exceeded", {
+            err
+          }, {
+            F: __dxlog_file5,
+            L: 138,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        } else {
+          (0, import_log5.log)(`error sending to ${serverName}`, {
+            err
+          }, {
+            F: __dxlog_file5,
+            L: 140,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          void this.checkServerFailure(serverName);
+        }
+      });
+    });
+  }
+  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, {
         F: __dxlog_file5,
-        L: 119,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
-      }));
-    });
+      });
+      await this.restartServer(serverName);
+      this.failureCount.set(serverName, 0);
+      return;
+    }
+    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, {
       F: __dxlog_file5,
-      L: 124,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 125,
+      L: 161,
       S: this,
       A: [
         "this._opened",
@@ -1610,13 +1624,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 131,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 132,
+      L: 168,
       S: this,
       A: [
         "this._opened",
@@ -1629,25 +1643,31 @@ var WebsocketSignalManager = class {
     this._ctx = new import_context4.Context({
       onError: (err) => import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 139,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       })
     });
   }
   async _forEachServer(fn) {
-    return Promise.all(Array.from(this._servers.values()).map(fn));
+    return Promise.all(Array.from(this._servers.entries()).map(([serverName, server]) => fn(server, serverName)));
   }
 };
 _ts_decorate([
   import_async5.synchronized
 ], WebsocketSignalManager.prototype, "open", null);
+_ts_decorate([
+  import_async5.synchronized
+], WebsocketSignalManager.prototype, "close", null);
 _ts_decorate([
   import_async5.synchronized
 ], WebsocketSignalManager.prototype, "join", null);
 _ts_decorate([
   import_async5.synchronized
 ], WebsocketSignalManager.prototype, "leave", null);
+_ts_decorate([
+  import_async5.synchronized
+], WebsocketSignalManager.prototype, "checkServerFailure", null);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MemorySignalManager,