@dxos/teleport 0.3.4 → 0.3.5-main.1ae5af4

package/dist/lib/node/index.cjs

@@ -48,7 +48,8 @@ module.exports = __toCommonJS(src_exports);
 var import_node_stream = require("node:stream");
 var import_async = require("@dxos/async");
 var import_invariant = require("@dxos/invariant");
-var __dxlog_file = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/muxing/framer.ts";
+var import_log = require("@dxos/log");
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/framer.ts";
 var FRAME_LENGTH_SIZE = 2;
 var Framer = class {
   constructor() {
@@ -70,7 +71,7 @@ var Framer = class {
       write: (chunk, encoding, callback) => {
         (0, import_invariant.invariant)(!this._subscribeCb, "Internal Framer bug. Concurrent writes detected.", {
           F: __dxlog_file,
-          L: 39,
+          L: 40,
           S: this,
           A: [
             "!this._subscribeCb",
@@ -114,7 +115,7 @@ var Framer = class {
       subscribe: (callback) => {
         (0, import_invariant.invariant)(!this._messageCb, "Rpc port already has a message listener.", {
           F: __dxlog_file,
-          L: 78,
+          L: 79,
           S: this,
           A: [
             "!this._messageCb",
@@ -168,6 +169,22 @@ var Framer = class {
     }
   }
   destroy() {
+    if (this._stream.readableLength > 0) {
+      import_log.log.warn("framer destroyed while there are still read bytes in the buffer.", void 0, {
+        F: __dxlog_file,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    if (this._stream.writableLength > 0) {
+      import_log.log.warn("framer destroyed while there are still write bytes in the buffer.", void 0, {
+        F: __dxlog_file,
+        L: 143,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     this._stream.destroy();
   }
 };
@@ -199,14 +216,14 @@ var import_async3 = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
 var import_invariant2 = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
+var import_log3 = require("@dxos/log");
 var import_protocols = require("@dxos/protocols");
 
 // packages/core/mesh/teleport/src/muxing/balancer.ts
 var varint = __toESM(require("varint"));
 var import_async2 = require("@dxos/async");
-var import_log = require("@dxos/log");
-var __dxlog_file2 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/muxing/balancer.ts";
+var import_log2 = require("@dxos/log");
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/balancer.ts";
 var MAX_CHUNK_SIZE = 8192;
 var Balancer = class {
   constructor(_sysChannelId) {
@@ -258,7 +275,7 @@ var Balancer = class {
       });
     });
     if (noCalls) {
-      this._sendChunk().catch((err) => import_log.log.catch(err, void 0, {
+      this._sendChunk().catch((err) => import_log2.log.catch(err, void 0, {
         F: __dxlog_file2,
         L: 100,
         S: this,
@@ -267,6 +284,14 @@ var Balancer = class {
     }
   }
   destroy() {
+    if (this._sendBuffers.size !== 0) {
+      import_log2.log.warn("destroying balancer with pending calls", void 0, {
+        F: __dxlog_file2,
+        L: 106,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     this._sendBuffers.clear();
     this._framer.destroy();
   }
@@ -363,11 +388,12 @@ var decodeChunk = (data, withLength) => {
 };
 
 // packages/core/mesh/teleport/src/muxing/muxer.ts
-var __dxlog_file3 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/muxing/muxer.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/muxer.ts";
 var Command = import_protocols.schema.getCodecForType("dxos.mesh.muxer.Command");
 var STATS_INTERVAL = 1e3;
 var MAX_SAFE_FRAME_SIZE = 1e6;
 var SYSTEM_CHANNEL_ID = 0;
+var GRACEFUL_CLOSE_TIMEOUT = 3e3;
 var Muxer = class {
   constructor() {
     this._balancer = new Balancer(SYSTEM_CHANNEL_ID);
@@ -377,9 +403,10 @@ var Muxer = class {
     this._nextId = 1;
     this._destroyed = false;
     this._destroying = false;
+    this._closing = false;
     this._lastStats = void 0;
     this._lastChannelStats = /* @__PURE__ */ new Map();
-    this.close = new import_async3.Event();
+    this.afterClosed = new import_async3.Event();
     this.statsUpdated = new import_async3.Event();
     this.stream = this._balancer.stream;
     this._balancer.incomingData.on(async (msg) => {
@@ -400,7 +427,7 @@ var Muxer = class {
     });
     (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 136,
+      L: 138,
       S: this,
       A: [
         "!channel.push",
@@ -448,7 +475,7 @@ var Muxer = class {
     });
     (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 188,
+      L: 190,
       S: this,
       A: [
         "!channel.push",
@@ -472,7 +499,7 @@ var Muxer = class {
       subscribe: (cb) => {
         (0, import_invariant2.invariant)(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file3,
-          L: 210,
+          L: 212,
           S: this,
           A: [
             "!callback",
@@ -500,61 +527,153 @@ var Muxer = class {
     }
     return port;
   }
-  /**
-  * Force-close with optional error.
-  */
-  async destroy(err) {
+  // initiate graceful close
+  async close(err) {
     if (this._destroying) {
+      (0, import_log3.log)("already destroying, ignoring graceful close request", void 0, {
+        F: __dxlog_file3,
+        L: 245,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return;
     }
-    this._destroying = true;
-    this._sendCommand({
-      destroy: {
+    if (this._closing) {
+      (0, import_log3.log)("already closing, ignoring graceful close request", void 0, {
+        F: __dxlog_file3,
+        L: 249,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    this._closing = true;
+    await this._sendCommand({
+      close: {
         error: err?.message
       }
-    }, SYSTEM_CHANNEL_ID).then(() => {
-      this._dispose();
-    }).catch((err2) => {
-      this._dispose(err2);
+    }, SYSTEM_CHANNEL_ID).catch(async (err2) => {
+      (0, import_log3.log)("error sending close command", {
+        err: err2
+      }, {
+        F: __dxlog_file3,
+        L: 263,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this.dispose(err2);
     });
+    await Promise.race([
+      new Promise((_resolve, reject) => {
+        setTimeout(() => {
+          reject(new import_protocols.TimeoutError("gracefully closing muxer"));
+        }, GRACEFUL_CLOSE_TIMEOUT);
+      }),
+      (async () => {
+        await this.dispose(err);
+      })()
+    ]);
+  }
+  // force close without confirmation
+  async destroy(err) {
+    if (this._destroying) {
+      (0, import_log3.log)("already destroying, ignoring destroy request", void 0, {
+        F: __dxlog_file3,
+        L: 284,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    this._destroying = true;
     void this._ctx.dispose();
+    if (this._closing) {
+      (0, import_log3.log)("destroy cancelling graceful close", void 0, {
+        F: __dxlog_file3,
+        L: 290,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._closing = false;
+    } else {
+      await this._sendCommand({
+        close: {
+          error: err?.message
+        }
+      }, SYSTEM_CHANNEL_ID).catch(async (err2) => {
+        (0, import_log3.log)("error sending courtesy close command", {
+          err: err2
+        }, {
+          F: __dxlog_file3,
+          L: 303,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      });
+    }
+    this.dispose(err).catch((err2) => {
+      (0, import_log3.log)("error disposing after destroy", {
+        err: err2
+      }, {
+        F: __dxlog_file3,
+        L: 308,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    });
   }
-  _dispose(err) {
+  // complete the termination, graceful or otherwise
+  async dispose(err) {
     if (this._destroyed) {
+      (0, import_log3.log)("already destroyed, ignoring dispose request", void 0, {
+        F: __dxlog_file3,
+        L: 316,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return;
     }
-    this._destroyed = true;
-    this._balancer.destroy();
+    void this._ctx.dispose();
+    await this._balancer.destroy();
     for (const channel of this._channelsByTag.values()) {
       channel.destroy?.(err);
     }
-    this.close.emit(err);
+    this._destroyed = true;
+    this.afterClosed.emit(err);
     this._channelsByLocalId.clear();
     this._channelsByTag.clear();
   }
   async _handleCommand(cmd) {
-    (0, import_log2.log)("Received command", {
-      cmd
-    }, {
-      F: __dxlog_file3,
-      L: 286,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (this._destroyed || this._destroying) {
-      if (cmd.destroy) {
-        return;
-      }
-      import_log2.log.warn("Received command after destroy", {
+    if (this._destroyed) {
+      import_log3.log.warn("Received command after destroy", {
         cmd
       }, {
         F: __dxlog_file3,
-        L: 293,
+        L: 338,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
+    if (cmd.close) {
+      if (!this._closing) {
+        (0, import_log3.log)("received peer close, initiating my own graceful close", void 0, {
+          F: __dxlog_file3,
+          L: 344,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        await this.close();
+      } else {
+        (0, import_log3.log)("received close from peer, already closing", void 0, {
+          F: __dxlog_file3,
+          L: 347,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      return;
+    }
     if (cmd.openChannel) {
       const channel = this._getOrCreateStream({
         tag: cmd.openChannel.tag,
@@ -573,19 +692,17 @@ var Muxer = class {
     } else if (cmd.data) {
       const stream = this._channelsByLocalId.get(cmd.data.channelId) ?? (0, import_debug.failUndefined)();
       if (!stream.push) {
-        import_log2.log.warn("Received data for channel before it was opened", {
+        import_log3.log.warn("Received data for channel before it was opened", {
           tag: stream.tag
         }, {
           F: __dxlog_file3,
-          L: 320,
+          L: 376,
           S: this,
           C: (f, a) => f(...a)
         });
         return;
       }
       stream.push(cmd.data.data);
-    } else if (cmd.destroy) {
-      this._dispose();
     }
   }
   async _sendCommand(cmd, channelId = -1) {
@@ -621,12 +738,12 @@ var Muxer = class {
   }
   async _sendData(channel, data) {
     if (data.length > MAX_SAFE_FRAME_SIZE) {
-      import_log2.log.warn("frame size exceeds maximum safe value", {
+      import_log3.log.warn("frame size exceeds maximum safe value", {
         size: data.length,
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
         F: __dxlog_file3,
-        L: 365,
+        L: 419,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -698,7 +815,7 @@ var import_context2 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
-var import_log3 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_rpc = require("@dxos/rpc");
 var import_util = require("@dxos/util");
@@ -712,13 +829,13 @@ 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_file4 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/teleport.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/teleport.ts";
 var Teleport = class {
   constructor({ initiator, localPeerId, remotePeerId }) {
     this._ctx = new import_context2.Context({
       onError: (err) => {
         void this.destroy(err).catch(() => {
-          import_log3.log.error("Error during destroy", err, {
+          import_log4.log.error("Error during destroy", err, {
             F: __dxlog_file4,
             L: 44,
             S: this,
@@ -735,13 +852,13 @@ var Teleport = class {
         if (this._destroying || this._aborting) {
           return;
         }
-        (0, import_log3.log)("destroy teleport due to onTimeout in ControlExtension", void 0, {
+        (0, import_log4.log)("destroy teleport due to onTimeout in ControlExtension", void 0, {
           F: __dxlog_file4,
           L: 59,
           S: this,
           C: (f, a) => f(...a)
         });
-        this.destroy(new import_protocols2.TimeoutError("control extension")).catch((err) => import_log3.log.catch(err, void 0, {
+        this.destroy(new import_protocols2.TimeoutError("control extension")).catch((err) => import_log4.log.catch(err, void 0, {
           F: __dxlog_file4,
           L: 60,
           S: this,
@@ -785,7 +902,7 @@ var Teleport = class {
     this.localPeerId = localPeerId;
     this.remotePeerId = remotePeerId;
     this._control.onExtensionRegistered.set(async (name) => {
-      (0, import_log3.log)("remote extension", {
+      (0, import_log4.log)("remote extension", {
         name
       }, {
         F: __dxlog_file4,
@@ -814,7 +931,7 @@ var Teleport = class {
     {
       this._muxer.stream.on("close", async () => {
         if (this._destroying || this._aborting) {
-          (0, import_log3.log)("destroy teleport due to muxer stream close, skipping due to already destroying/aborting", void 0, {
+          (0, import_log4.log)("destroy teleport due to muxer stream close, skipping due to already destroying/aborting", void 0, {
             F: __dxlog_file4,
             L: 97,
             S: this,
@@ -829,7 +946,7 @@ var Teleport = class {
       });
     }
     this._muxer.statsUpdated.on((stats) => {
-      import_log3.log.trace("dxos.mesh.teleport.stats", {
+      import_log4.log.trace("dxos.mesh.teleport.stats", {
         localPeerId,
         remotePeerId,
         bytesSent: stats.bytesSent,
@@ -875,7 +992,7 @@ var Teleport = class {
       try {
         await extension.onAbort(err);
       } catch (err2) {
-        import_log3.log.catch(err2, void 0, {
+        import_log4.log.catch(err2, void 0, {
           F: __dxlog_file4,
           L: 163,
           S: this,
@@ -898,7 +1015,7 @@ var Teleport = class {
       try {
         await extension.onClose(err);
       } catch (err2) {
-        import_log3.log.catch(err2, void 0, {
+        import_log4.log.catch(err2, void 0, {
           F: __dxlog_file4,
           L: 187,
           S: this,
@@ -906,13 +1023,13 @@ var Teleport = class {
         });
       }
     }
-    await this._muxer.destroy(err);
+    await this._muxer.close();
   }
   addExtension(name, extension) {
     if (!this._open) {
       throw new Error("Not open");
     }
-    (0, import_log3.log)("addExtension", {
+    (0, import_log4.log)("addExtension", {
       name
     }, {
       F: __dxlog_file4,
@@ -959,7 +1076,7 @@ var Teleport = class {
     this._extensions.set(extensionName, extension);
   }
   async _openExtension(extensionName) {
-    (0, import_log3.log)("open extension", {
+    (0, import_log4.log)("open extension", {
       extensionName
     }, {
       F: __dxlog_file4,
@@ -1003,7 +1120,7 @@ var Teleport = class {
       }
     };
     await extension.onOpen(context);
-    (0, import_log3.log)("extension opened", {
+    (0, import_log4.log)("extension opened", {
       extensionName
     }, {
       F: __dxlog_file4,
@@ -1079,8 +1196,8 @@ var ControlExtension = class {
 var import_node_stream3 = require("node:stream");
 var import_invariant4 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log4 = require("@dxos/log");
-var __dxlog_file5 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/testing/test-builder.ts";
+var import_log5 = require("@dxos/log");
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-builder.ts";
 var TestBuilder = class {
   constructor() {
     this._peers = /* @__PURE__ */ new Set();
@@ -1248,7 +1365,7 @@ var TestPeer = class {
 var pipeStreams = (stream1, stream2) => {
   (0, import_node_stream3.pipeline)(stream1, stream2, (err) => {
     if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
-      import_log4.log.catch(err, void 0, {
+      import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
         L: 106,
         S: void 0,
@@ -1258,7 +1375,7 @@ var pipeStreams = (stream1, stream2) => {
   });
   (0, import_node_stream3.pipeline)(stream2, stream1, (err) => {
     if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
-      import_log4.log.catch(err, void 0, {
+      import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
         L: 111,
         S: void 0,
@@ -1283,10 +1400,10 @@ var TestConnection = class {
 // packages/core/mesh/teleport/src/testing/test-extension.ts
 var import_async5 = require("@dxos/async");
 var import_invariant5 = require("@dxos/invariant");
-var import_log5 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
 var import_rpc2 = require("@dxos/rpc");
-var __dxlog_file6 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/testing/test-extension.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-extension.ts";
 var TestExtension = class {
   constructor(callbacks = {}) {
     this.callbacks = callbacks;
@@ -1298,7 +1415,7 @@ var TestExtension = class {
     return this.extensionContext?.remotePeerId;
   }
   async onOpen(context) {
-    (0, import_log5.log)("onOpen", {
+    (0, import_log6.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
     }, {
@@ -1336,7 +1453,7 @@ var TestExtension = class {
     this.open.wake();
   }
   async onClose(err) {
-    (0, import_log5.log)("onClose", {
+    (0, import_log6.log)("onClose", {
       err
     }, {
       F: __dxlog_file6,
@@ -1349,7 +1466,7 @@ var TestExtension = class {
     await this._rpc?.close();
   }
   async onAbort(err) {
-    (0, import_log5.log)("onAbort", {
+    (0, import_log6.log)("onAbort", {
       err
     }, {
       F: __dxlog_file6,
@@ -1390,10 +1507,10 @@ var TestExtension = class {
 var import_node_crypto = require("node:crypto");
 var import_async6 = require("@dxos/async");
 var import_invariant6 = require("@dxos/invariant");
-var import_log6 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var import_protocols4 = require("@dxos/protocols");
 var import_rpc3 = require("@dxos/rpc");
-var __dxlog_file7 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/testing/test-extension-with-streams.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-extension-with-streams.ts";
 var TestExtensionWithStreams = class {
   constructor(callbacks = {}) {
     this.callbacks = callbacks;
@@ -1455,7 +1572,7 @@ var TestExtensionWithStreams = class {
     });
     streamEntry.reportingTimer = setInterval(() => {
       const { bytesSent, bytesReceived, sendErrors, receiveErrors } = streamEntry;
-      import_log6.log.trace("dxos.test.stream-stats", {
+      import_log7.log.trace("dxos.test.stream-stats", {
         streamTag,
         bytesSent,
         bytesReceived,
@@ -1496,7 +1613,7 @@ var TestExtensionWithStreams = class {
     };
   }
   async onOpen(context) {
-    (0, import_log6.log)("onOpen", {
+    (0, import_log7.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
     }, {
@@ -1546,7 +1663,7 @@ var TestExtensionWithStreams = class {
     this.open.wake();
   }
   async onClose(err) {
-    (0, import_log6.log)("onClose", {
+    (0, import_log7.log)("onClose", {
       err
     }, {
       F: __dxlog_file7,
@@ -1557,7 +1674,7 @@ var TestExtensionWithStreams = class {
     await this.callbacks.onClose?.();
     this.closed.wake();
     for (const [streamTag, stream] of Object.entries(this._streams)) {
-      (0, import_log6.log)("closing stream", {
+      (0, import_log7.log)("closing stream", {
         streamTag
       }, {
         F: __dxlog_file7,
@@ -1571,7 +1688,7 @@ var TestExtensionWithStreams = class {
     await this._rpc?.close();
   }
   async onAbort(err) {
-    (0, import_log6.log)("onAbort", {
+    (0, import_log7.log)("onAbort", {
       err
     }, {
       F: __dxlog_file7,
@@ -1649,7 +1766,7 @@ var TestExtensionWithStreams = class {
 // packages/core/mesh/teleport/src/rpc-extension.ts
 var import_invariant7 = require("@dxos/invariant");
 var import_rpc4 = require("@dxos/rpc");
-var __dxlog_file8 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/rpc-extension.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/rpc-extension.ts";
 var RpcExtension = class {
   constructor(_rpcParams) {
     this._rpcParams = _rpcParams;