@dxos/teleport 0.3.4 → 0.3.5-main.1429e83

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();
   }
 };
@@ -198,15 +215,16 @@ var import_node_stream2 = require("node:stream");
 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_invariant3 = require("@dxos/invariant");
+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_invariant2 = require("@dxos/invariant");
+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) {
@@ -216,6 +234,7 @@ var Balancer = class {
     this._framer = new Framer();
     this._sendBuffers = /* @__PURE__ */ new Map();
     this._receiveBuffers = /* @__PURE__ */ new Map();
+    this._sending = false;
     this.incomingData = new import_async2.Event();
     this.stream = this._framer.stream;
     this._channels.push(_sysChannelId);
@@ -234,39 +253,23 @@ var Balancer = class {
     this._channels.push(channel);
   }
   pushData(data, trigger, channelId) {
-    const noCalls = this._sendBuffers.size === 0;
-    if (!this._channels.includes(channelId)) {
-      throw new Error(`Unknown channel ${channelId}`);
-    }
-    if (!this._sendBuffers.has(channelId)) {
-      this._sendBuffers.set(channelId, []);
-    }
-    const sendBuffer = this._sendBuffers.get(channelId);
-    const chunks = [];
-    for (let idx = 0; idx < data.length; idx += MAX_CHUNK_SIZE) {
-      chunks.push(data.subarray(idx, idx + MAX_CHUNK_SIZE));
-    }
-    chunks.forEach((chunk, index) => {
-      const msg = encodeChunk({
-        chunk,
-        channelId,
-        dataLength: index === 0 ? data.length : void 0
-      });
-      sendBuffer.push({
-        msg,
-        trigger: index === chunks.length - 1 ? trigger : void 0
-      });
-    });
-    if (noCalls) {
-      this._sendChunk().catch((err) => import_log.log.catch(err, void 0, {
+    this._enqueueChunk(data, trigger, channelId);
+    this._sendChunks().catch((err) => import_log2.log.catch(err, void 0, {
+      F: __dxlog_file2,
+      L: 75,
+      S: this,
+      C: (f, a) => f(...a)
+    }));
+  }
+  destroy() {
+    if (this._sendBuffers.size !== 0) {
+      import_log2.log.warn("destroying balancer with pending calls", void 0, {
         F: __dxlog_file2,
-        L: 100,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
-      }));
+      });
     }
-  }
-  destroy() {
     this._sendBuffers.clear();
     this._framer.destroy();
   }
@@ -303,36 +306,99 @@ var Balancer = class {
     this._lastCallerIndex = (this._lastCallerIndex + 1) % this._channels.length;
     return this._channels[index];
   }
+  _enqueueChunk(data, trigger, channelId) {
+    if (!this._channels.includes(channelId)) {
+      throw new Error(`Unknown channel ${channelId}`);
+    }
+    if (!this._sendBuffers.has(channelId)) {
+      this._sendBuffers.set(channelId, []);
+    }
+    const sendBuffer = this._sendBuffers.get(channelId);
+    const chunks = [];
+    for (let idx = 0; idx < data.length; idx += MAX_CHUNK_SIZE) {
+      chunks.push(data.subarray(idx, idx + MAX_CHUNK_SIZE));
+    }
+    chunks.forEach((chunk, index) => {
+      const msg = encodeChunk({
+        chunk,
+        channelId,
+        dataLength: index === 0 ? data.length : void 0
+      });
+      sendBuffer.push({
+        msg,
+        trigger: index === chunks.length - 1 ? trigger : void 0
+      });
+    });
+  }
+  // get the next chunk or null if there are no chunks remaining
   _getNextChunk() {
     let chunk;
-    while (!chunk) {
+    while (this._sendBuffers.size > 0) {
       const channelId = this._getNextCallerId();
       const sendBuffer = this._sendBuffers.get(channelId);
       if (!sendBuffer) {
         continue;
       }
       chunk = sendBuffer.shift();
+      if (!chunk) {
+        continue;
+      }
       if (sendBuffer.length === 0) {
         this._sendBuffers.delete(channelId);
       }
+      return chunk;
     }
-    return chunk;
+    return null;
   }
-  async _sendChunk() {
-    if (this._sendBuffers.size === 0) {
+  async _sendChunks() {
+    if (this._sending) {
       return;
     }
-    if (!this._framer.writable) {
-      await this._framer.drain.waitForCount(1);
-    }
-    const chunk = this._getNextChunk();
-    try {
-      await this._framer.port.send(chunk.msg);
-      chunk.trigger?.wake();
-    } catch (err) {
-      chunk.trigger?.throw(err);
+    this._sending = true;
+    let chunk;
+    chunk = this._getNextChunk();
+    while (chunk) {
+      if (!this._framer.writable) {
+        (0, import_log2.log)("PAUSE for drain", void 0, {
+          F: __dxlog_file2,
+          L: 179,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        await this._framer.drain.waitForCount(1);
+        (0, import_log2.log)("RESUME for drain", void 0, {
+          F: __dxlog_file2,
+          L: 181,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        await this._framer.port.send(chunk.msg);
+        chunk.trigger?.wake();
+      } catch (err) {
+        (0, import_log2.log)("Error sending chunk", {
+          err
+        }, {
+          F: __dxlog_file2,
+          L: 187,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        chunk.trigger?.throw(err);
+      }
+      chunk = this._getNextChunk();
     }
-    await this._sendChunk();
+    (0, import_invariant2.invariant)(this._sendBuffers.size === 0, "sendBuffers not empty", {
+      F: __dxlog_file2,
+      L: 192,
+      S: this,
+      A: [
+        "this._sendBuffers.size === 0",
+        "'sendBuffers not empty'"
+      ]
+    });
+    this._sending = false;
   }
 };
 var encodeChunk = ({ channelId, dataLength, chunk }) => {
@@ -363,11 +429,14 @@ 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 DEFAULT_SEND_COMMAND_TIMEOUT = 6e4;
+var DESTROY_COMMAND_SEND_TIMEOUT = 5e3;
 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);
@@ -375,17 +444,17 @@ var Muxer = class {
     this._channelsByTag = /* @__PURE__ */ new Map();
     this._ctx = new import_context.Context();
     this._nextId = 1;
-    this._destroyed = false;
+    this._closing = false;
     this._destroying = false;
+    this._disposed = 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) => {
       await this._handleCommand(Command.decode(msg));
     });
-    (0, import_async3.scheduleTaskInterval)(this._ctx, async () => this._emitStats(), STATS_INTERVAL);
   }
   /**
   * Creates a duplex Node.js-style stream.
@@ -398,9 +467,9 @@ var Muxer = class {
       tag,
       contentType: opts.contentType
     });
-    (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
+    (0, import_invariant3.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 136,
+      L: 140,
       S: this,
       A: [
         "!channel.push",
@@ -446,9 +515,9 @@ var Muxer = class {
       tag,
       contentType: opts.contentType
     });
-    (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
+    (0, import_invariant3.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 188,
+      L: 192,
       S: this,
       A: [
         "!channel.push",
@@ -466,13 +535,13 @@ var Muxer = class {
       }
     };
     const port = {
-      send: async (data) => {
-        await this._sendData(channel, data);
+      send: async (data, timeout) => {
+        await this._sendData(channel, data, timeout);
       },
       subscribe: (cb) => {
-        (0, import_invariant2.invariant)(!callback, "Only one subscriber is allowed", {
+        (0, import_invariant3.invariant)(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file3,
-          L: 210,
+          L: 214,
           S: this,
           A: [
             "!callback",
@@ -500,61 +569,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: 247,
+        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: 251,
+        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, DESTROY_COMMAND_SEND_TIMEOUT).catch(async (err2) => {
+      (0, import_log3.log)("error sending close command", {
+        err: err2
+      }, {
+        F: __dxlog_file3,
+        L: 266,
+        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: 287,
+        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: 293,
+        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: 306,
+          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: 311,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    });
   }
-  _dispose(err) {
-    if (this._destroyed) {
+  // complete the termination, graceful or otherwise
+  async dispose(err) {
+    if (this._disposed) {
+      (0, import_log3.log)("already destroyed, ignoring dispose request", void 0, {
+        F: __dxlog_file3,
+        L: 319,
+        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._disposed = 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._disposed) {
+      import_log3.log.warn("Received command after destroy", {
         cmd
       }, {
         F: __dxlog_file3,
-        L: 293,
+        L: 341,
         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: 347,
+          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: 350,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      return;
+    }
     if (cmd.openChannel) {
       const channel = this._getOrCreateStream({
         tag: cmd.openChannel.tag,
@@ -573,31 +734,34 @@ 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: 379,
           S: this,
           C: (f, a) => f(...a)
         });
         return;
       }
       stream.push(cmd.data.data);
-    } else if (cmd.destroy) {
-      this._dispose();
     }
   }
-  async _sendCommand(cmd, channelId = -1) {
+  async _sendCommand(cmd, channelId = -1, timeout = DEFAULT_SEND_COMMAND_TIMEOUT) {
     try {
       const trigger = new import_async3.Trigger();
       this._balancer.pushData(Command.encode(cmd), trigger, channelId);
-      await trigger.wait();
+      await trigger.wait({
+        timeout
+      });
     } catch (err) {
       await this.destroy(err);
     }
   }
   _getOrCreateStream(params) {
+    if (this._channelsByTag.size === 0) {
+      (0, import_async3.scheduleTaskInterval)(this._ctx, async () => this._emitStats(), STATS_INTERVAL);
+    }
     let channel = this._channelsByTag.get(params.tag);
     if (!channel) {
       channel = {
@@ -619,14 +783,14 @@ var Muxer = class {
     }
     return channel;
   }
-  async _sendData(channel, data) {
+  async _sendData(channel, data, timeout) {
     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: 425,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -641,7 +805,7 @@ var Muxer = class {
         channelId: channel.remoteId,
         data
       }
-    }, channel.id);
+    }, channel.id, timeout);
   }
   _destroyChannel(channel, err) {
     if (channel.destroy) {
@@ -651,7 +815,7 @@ var Muxer = class {
     this._channelsByTag.delete(channel.tag);
   }
   async _emitStats() {
-    if (this._destroyed || this._destroying) {
+    if (this._disposed || this._destroying) {
       this._lastStats = void 0;
       this._lastChannelStats.clear();
       return;
@@ -696,9 +860,9 @@ var Muxer = class {
 var import_async4 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
-var import_invariant3 = require("@dxos/invariant");
+var import_invariant4 = 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,15 +876,17 @@ 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 CONTROL_HEARTBEAT_INTERVAL = 1e4;
+var CONTROL_HEARTBEAT_TIMEOUT = 6e4;
 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,
+            L: 47,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -729,21 +895,21 @@ var Teleport = class {
     });
     this._muxer = new Muxer();
     this._control = new ControlExtension({
-      heartbeatInterval: 1e4,
-      heartbeatTimeout: 1e4,
+      heartbeatInterval: CONTROL_HEARTBEAT_INTERVAL,
+      heartbeatTimeout: CONTROL_HEARTBEAT_TIMEOUT,
       onTimeout: () => {
         if (this._destroying || this._aborting) {
           return;
         }
-        (0, import_log3.log)("destroy teleport due to onTimeout in ControlExtension", void 0, {
+        (0, import_log4.log)("abort teleport due to onTimeout in ControlExtension", void 0, {
           F: __dxlog_file4,
-          L: 59,
+          L: 62,
           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.abort(new import_protocols2.TimeoutError("control extension")).catch((err) => import_log4.log.catch(err, void 0, {
           F: __dxlog_file4,
-          L: 60,
+          L: 63,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -754,27 +920,27 @@ var Teleport = class {
     this._open = false;
     this._destroying = false;
     this._aborting = false;
-    (0, import_invariant3.invariant)(typeof initiator === "boolean", void 0, {
+    (0, import_invariant4.invariant)(typeof initiator === "boolean", void 0, {
       F: __dxlog_file4,
-      L: 72,
+      L: 75,
       S: this,
       A: [
         "typeof initiator === 'boolean'",
         ""
       ]
     });
-    (0, import_invariant3.invariant)(import_keys.PublicKey.isPublicKey(localPeerId), void 0, {
+    (0, import_invariant4.invariant)(import_keys.PublicKey.isPublicKey(localPeerId), void 0, {
       F: __dxlog_file4,
-      L: 73,
+      L: 76,
       S: this,
       A: [
         "PublicKey.isPublicKey(localPeerId)",
         ""
       ]
     });
-    (0, import_invariant3.invariant)(import_keys.PublicKey.isPublicKey(remotePeerId), void 0, {
+    (0, import_invariant4.invariant)(import_keys.PublicKey.isPublicKey(remotePeerId), void 0, {
       F: __dxlog_file4,
-      L: 74,
+      L: 77,
       S: this,
       A: [
         "PublicKey.isPublicKey(remotePeerId)",
@@ -785,17 +951,17 @@ 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,
-        L: 80,
+        L: 83,
         S: this,
         C: (f, a) => f(...a)
       });
-      (0, import_invariant3.invariant)(!this._remoteExtensions.has(name), "Remote extension already exists", {
+      (0, import_invariant4.invariant)(!this._remoteExtensions.has(name), "Remote extension already exists", {
         F: __dxlog_file4,
-        L: 81,
+        L: 84,
         S: this,
         A: [
           "!this._remoteExtensions.has(name)",
@@ -814,9 +980,9 @@ 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,
+            L: 100,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -829,7 +995,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,
@@ -839,7 +1005,7 @@ var Teleport = class {
         channels: stats.channels
       }, {
         F: __dxlog_file4,
-        L: 110,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -875,9 +1041,9 @@ 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,
+          L: 166,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -898,25 +1064,25 @@ 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,
+          L: 190,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     }
-    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,
-      L: 199,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -938,18 +1104,18 @@ var Teleport = class {
     }
   }
   _setExtension(extensionName, extension) {
-    (0, import_invariant3.invariant)(!extensionName.includes("/"), "Invalid extension name", {
+    (0, import_invariant4.invariant)(!extensionName.includes("/"), "Invalid extension name", {
       F: __dxlog_file4,
-      L: 223,
+      L: 226,
       S: this,
       A: [
         "!extensionName.includes('/')",
         "'Invalid extension name'"
       ]
     });
-    (0, import_invariant3.invariant)(!this._extensions.has(extensionName), "Extension already exists", {
+    (0, import_invariant4.invariant)(!this._extensions.has(extensionName), "Extension already exists", {
       F: __dxlog_file4,
-      L: 224,
+      L: 227,
       S: this,
       A: [
         "!this._extensions.has(extensionName)",
@@ -959,11 +1125,11 @@ 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,
-      L: 229,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -973,9 +1139,9 @@ var Teleport = class {
       localPeerId: this.localPeerId,
       remotePeerId: this.remotePeerId,
       createPort: async (channelName, opts) => {
-        (0, import_invariant3.invariant)(!channelName.includes("/"), "Invalid channel name", {
+        (0, import_invariant4.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
-          L: 237,
+          L: 240,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -985,9 +1151,9 @@ var Teleport = class {
         return this._muxer.createPort(`${extensionName}/${channelName}`, opts);
       },
       createStream: async (channelName, opts) => {
-        (0, import_invariant3.invariant)(!channelName.includes("/"), "Invalid channel name", {
+        (0, import_invariant4.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
-          L: 241,
+          L: 244,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1003,11 +1169,11 @@ var Teleport = class {
       }
     };
     await extension.onOpen(context);
-    (0, import_log3.log)("extension opened", {
+    (0, import_log4.log)("extension opened", {
       extensionName
     }, {
       F: __dxlog_file4,
-      L: 252,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1077,10 +1243,10 @@ var ControlExtension = class {
 
 // packages/core/mesh/teleport/src/testing/test-builder.ts
 var import_node_stream3 = require("node:stream");
-var import_invariant4 = require("@dxos/invariant");
+var import_invariant5 = 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();
@@ -1099,7 +1265,7 @@ var TestBuilder = class {
     await Promise.all(Array.from(this._peers).map((agent) => agent.destroy()));
   }
   async connect(peer1, peer2) {
-    (0, import_invariant4.invariant)(peer1 !== peer2, void 0, {
+    (0, import_invariant5.invariant)(peer1 !== peer2, void 0, {
       F: __dxlog_file5,
       L: 37,
       S: this,
@@ -1108,7 +1274,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    (0, import_invariant4.invariant)(this._peers.has(peer1), void 0, {
+    (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 38,
       S: this,
@@ -1117,7 +1283,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    (0, import_invariant4.invariant)(this._peers.has(peer1), void 0, {
+    (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 39,
       S: this,
@@ -1145,7 +1311,7 @@ var TestBuilder = class {
     ];
   }
   async disconnect(peer1, peer2) {
-    (0, import_invariant4.invariant)(peer1 !== peer2, void 0, {
+    (0, import_invariant5.invariant)(peer1 !== peer2, void 0, {
       F: __dxlog_file5,
       L: 51,
       S: this,
@@ -1154,7 +1320,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    (0, import_invariant4.invariant)(this._peers.has(peer1), void 0, {
+    (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 52,
       S: this,
@@ -1163,7 +1329,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    (0, import_invariant4.invariant)(this._peers.has(peer1), void 0, {
+    (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
       F: __dxlog_file5,
       L: 53,
       S: this,
@@ -1174,7 +1340,7 @@ var TestBuilder = class {
     });
     const connection1 = Array.from(peer1.connections).find((connection) => connection.remotePeerId.equals(peer2.peerId));
     const connection2 = Array.from(peer2.connections).find((connection) => connection.remotePeerId.equals(peer1.peerId));
-    (0, import_invariant4.invariant)(connection1, void 0, {
+    (0, import_invariant5.invariant)(connection1, void 0, {
       F: __dxlog_file5,
       L: 62,
       S: this,
@@ -1183,7 +1349,7 @@ var TestBuilder = class {
         ""
       ]
     });
-    (0, import_invariant4.invariant)(connection2, void 0, {
+    (0, import_invariant5.invariant)(connection2, void 0, {
       F: __dxlog_file5,
       L: 63,
       S: this,
@@ -1213,7 +1379,7 @@ var TestPeer = class {
     return connection;
   }
   async openConnection(connection) {
-    (0, import_invariant4.invariant)(this.connections.has(connection), void 0, {
+    (0, import_invariant5.invariant)(this.connections.has(connection), void 0, {
       F: __dxlog_file5,
       L: 84,
       S: this,
@@ -1226,7 +1392,7 @@ var TestPeer = class {
     await this.onOpen(connection);
   }
   async closeConnection(connection) {
-    (0, import_invariant4.invariant)(this.connections.has(connection), void 0, {
+    (0, import_invariant5.invariant)(this.connections.has(connection), void 0, {
       F: __dxlog_file5,
       L: 90,
       S: this,
@@ -1248,7 +1414,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 +1424,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,
@@ -1282,11 +1448,11 @@ 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_invariant6 = require("@dxos/invariant");
+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 +1464,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 +1502,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 +1515,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,
@@ -1368,7 +1534,7 @@ var TestExtension = class {
     const res = await (0, import_async5.asyncTimeout)(this._rpc.rpc.TestService.testCall({
       data: message
     }), 1500);
-    (0, import_invariant5.invariant)(res.data === message, void 0, {
+    (0, import_invariant6.invariant)(res.data === message, void 0, {
       F: __dxlog_file6,
       L: 84,
       S: this,
@@ -1389,11 +1555,11 @@ var TestExtension = class {
 // packages/core/mesh/teleport/src/testing/test-extension-with-streams.ts
 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_invariant7 = require("@dxos/invariant");
+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;
@@ -1406,7 +1572,7 @@ var TestExtensionWithStreams = class {
     return this.extensionContext?.remotePeerId;
   }
   async _openStream(streamTag, interval = 5, chunkSize = 2048) {
-    (0, import_invariant6.invariant)(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
+    (0, import_invariant7.invariant)(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
       F: __dxlog_file7,
       L: 39,
       S: this,
@@ -1455,7 +1621,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,
@@ -1472,7 +1638,7 @@ var TestExtensionWithStreams = class {
     }, 100);
   }
   _closeStream(streamTag) {
-    (0, import_invariant6.invariant)(this._streams.has(streamTag), `Stream does not exist: ${streamTag}`, {
+    (0, import_invariant7.invariant)(this._streams.has(streamTag), `Stream does not exist: ${streamTag}`, {
       F: __dxlog_file7,
       L: 106,
       S: this,
@@ -1496,7 +1662,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 +1712,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 +1723,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 +1737,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,
@@ -1595,7 +1761,7 @@ var TestExtensionWithStreams = class {
       streamLoadInterval,
       streamLoadChunkSize
     });
-    (0, import_invariant6.invariant)(data === streamTag, void 0, {
+    (0, import_invariant7.invariant)(data === streamTag, void 0, {
       F: __dxlog_file7,
       L: 207,
       S: this,
@@ -1614,7 +1780,7 @@ var TestExtensionWithStreams = class {
     const { data, bytesSent, bytesReceived, sendErrors, receiveErrors, runningTime } = await this._rpc.rpc.TestServiceWithStreams.closeTestStream({
       data: streamTag
     });
-    (0, import_invariant6.invariant)(data === streamTag, void 0, {
+    (0, import_invariant7.invariant)(data === streamTag, void 0, {
       F: __dxlog_file7,
       L: 220,
       S: this,
@@ -1647,9 +1813,9 @@ var TestExtensionWithStreams = class {
 };
 
 // packages/core/mesh/teleport/src/rpc-extension.ts
-var import_invariant7 = require("@dxos/invariant");
+var import_invariant8 = 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;
@@ -1665,7 +1831,7 @@ var RpcExtension = class {
     return this._extensionContext.remotePeerId;
   }
   get rpc() {
-    (0, import_invariant7.invariant)(this._rpc, void 0, {
+    (0, import_invariant8.invariant)(this._rpc, void 0, {
       F: __dxlog_file8,
       L: 32,
       S: this,