@dxos/teleport 0.3.7 → 0.3.8-main.598e316

package/dist/lib/node/testing/index.cjs

@@ -42,25 +42,165 @@ module.exports = __toCommonJS(testing_exports);
 var import_node_stream3 = require("node:stream");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log5 = require("@dxos/log");
+var import_log6 = require("@dxos/log");
 
 // packages/core/mesh/teleport/src/teleport.ts
-var import_async4 = require("@dxos/async");
-var import_context2 = require("@dxos/context");
+var import_async5 = require("@dxos/async");
+var import_context3 = require("@dxos/context");
 var import_debug2 = require("@dxos/debug");
 var import_invariant4 = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
-var import_log4 = require("@dxos/log");
-var import_protocols2 = require("@dxos/protocols");
+var import_log5 = require("@dxos/log");
+var import_protocols3 = require("@dxos/protocols");
+
+// packages/core/mesh/teleport/src/control-extension.ts
+var import_async = require("@dxos/async");
+var import_context = require("@dxos/context");
+var import_log = require("@dxos/log");
+var import_protocols = require("@dxos/protocols");
 var import_rpc = require("@dxos/rpc");
 var import_util = require("@dxos/util");
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/control-extension.ts";
+var HEARTBEAT_RTT_WARN_THRESH = 1e4;
+var ControlExtension = class {
+  constructor(opts, localPeerId, remotePeerId) {
+    this.opts = opts;
+    this.localPeerId = localPeerId;
+    this.remotePeerId = remotePeerId;
+    this._ctx = new import_context.Context({
+      onError: (err) => {
+        this._extensionContext.close(err);
+      }
+    });
+    this.onExtensionRegistered = new import_util.Callback();
+  }
+  async registerExtension(name) {
+    await this._rpc.rpc.Control.registerExtension({
+      name
+    });
+  }
+  async onOpen(extensionContext) {
+    this._extensionContext = extensionContext;
+    this._rpc = (0, import_rpc.createProtoRpcPeer)({
+      requested: {
+        Control: import_protocols.schema.getService("dxos.mesh.teleport.control.ControlService")
+      },
+      exposed: {
+        Control: import_protocols.schema.getService("dxos.mesh.teleport.control.ControlService")
+      },
+      handlers: {
+        Control: {
+          registerExtension: async (request) => {
+            this.onExtensionRegistered.call(request.name);
+          },
+          heartbeat: async (request) => {
+            (0, import_log.log)("received heartbeat request", {
+              ts: request.requestTimestamp,
+              localPeerId: this.localPeerId.truncate(),
+              remotePeerId: this.remotePeerId.truncate()
+            }, {
+              F: __dxlog_file,
+              L: 66,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            return {
+              requestTimestamp: request.requestTimestamp
+            };
+          }
+        }
+      },
+      port: await extensionContext.createPort("rpc", {
+        contentType: 'application/x-protobuf; messageType="dxos.rpc.Message"'
+      }),
+      timeout: this.opts.heartbeatTimeout
+    });
+    await this._rpc.open();
+    (0, import_async.scheduleTaskInterval)(this._ctx, async () => {
+      const reqTS = /* @__PURE__ */ new Date();
+      try {
+        const resp = await (0, import_async.asyncTimeout)(this._rpc.rpc.Control.heartbeat({
+          requestTimestamp: reqTS
+        }), this.opts.heartbeatTimeout);
+        const now = Date.now();
+        if (resp.requestTimestamp instanceof Date) {
+          if (now - resp.requestTimestamp.getTime() > (HEARTBEAT_RTT_WARN_THRESH < this.opts.heartbeatTimeout ? HEARTBEAT_RTT_WARN_THRESH : this.opts.heartbeatTimeout / 2)) {
+            import_log.log.warn(`heartbeat RTT for Teleport > ${HEARTBEAT_RTT_WARN_THRESH / 1e3}s`, {
+              rtt: now - resp.requestTimestamp.getTime(),
+              localPeerId: this.localPeerId.truncate(),
+              remotePeerId: this.remotePeerId.truncate()
+            }, {
+              F: __dxlog_file,
+              L: 103,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          } else {
+            (0, import_log.log)("heartbeat RTT", {
+              rtt: now - resp.requestTimestamp.getTime(),
+              localPeerId: this.localPeerId.truncate(),
+              remotePeerId: this.remotePeerId.truncate()
+            }, {
+              F: __dxlog_file,
+              L: 109,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+          }
+        }
+      } catch (err) {
+        const now = Date.now();
+        if (err instanceof import_protocols.RpcClosedError) {
+          (0, import_log.log)("ignoring RpcClosedError in heartbeat", void 0, {
+            F: __dxlog_file,
+            L: 119,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        if (err instanceof import_async.TimeoutError) {
+          (0, import_log.log)("timeout waiting for heartbeat response", {
+            err,
+            delay: now - reqTS.getTime()
+          }, {
+            F: __dxlog_file,
+            L: 123,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this.opts.onTimeout(err);
+        } else {
+          import_log.log.info("other error waiting for heartbeat response", {
+            err,
+            delay: now - reqTS.getTime()
+          }, {
+            F: __dxlog_file,
+            L: 126,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this.opts.onTimeout(err);
+        }
+      }
+    }, this.opts.heartbeatInterval);
+  }
+  async onClose(err) {
+    await this._ctx.dispose();
+    await this._rpc.close();
+  }
+  async onAbort(err) {
+    await this._ctx.dispose();
+    await this._rpc.abort();
+  }
+};
 
 // packages/core/mesh/teleport/src/muxing/framer.ts
 var import_node_stream = require("node:stream");
-var import_async = require("@dxos/async");
+var import_async2 = require("@dxos/async");
 var import_invariant = require("@dxos/invariant");
-var import_log = require("@dxos/log");
-var __dxlog_file = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/muxing/framer.ts";
+var import_log2 = require("@dxos/log");
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/framer.ts";
 var FRAME_LENGTH_SIZE = 2;
 var Framer = class {
   constructor() {
@@ -72,7 +212,7 @@ var Framer = class {
     this._bytesSent = 0;
     this._bytesReceived = 0;
     this._writable = true;
-    this.drain = new import_async.Event();
+    this.drain = new import_async2.Event();
     // TODO(egorgripasov): Consider using a Transform stream if it provides better backpressure handling.
     this._stream = new import_node_stream.Duplex({
       objectMode: false,
@@ -81,7 +221,7 @@ var Framer = class {
       },
       write: (chunk, encoding, callback) => {
         (0, import_invariant.invariant)(!this._subscribeCb, "Internal Framer bug. Concurrent writes detected.", {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 40,
           S: this,
           A: [
@@ -125,7 +265,7 @@ var Framer = class {
       },
       subscribe: (callback) => {
         (0, import_invariant.invariant)(!this._messageCb, "Rpc port already has a message listener.", {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 79,
           S: this,
           A: [
@@ -181,16 +321,16 @@ 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,
+      import_log2.log.info("framer destroyed while there are still read bytes in the buffer.", void 0, {
+        F: __dxlog_file2,
         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,
+      import_log2.log.warn("framer destroyed while there are still write bytes in the buffer.", void 0, {
+        F: __dxlog_file2,
         L: 143,
         S: this,
         C: (f, a) => f(...a)
@@ -223,19 +363,19 @@ var encodeFrame = (payload) => {
 
 // packages/core/mesh/teleport/src/muxing/muxer.ts
 var import_node_stream2 = require("node:stream");
-var import_async3 = require("@dxos/async");
-var import_context = require("@dxos/context");
+var import_async4 = require("@dxos/async");
+var import_context2 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
 var import_invariant3 = require("@dxos/invariant");
-var import_log3 = require("@dxos/log");
-var import_protocols = require("@dxos/protocols");
+var import_log4 = require("@dxos/log");
+var import_protocols2 = require("@dxos/protocols");
 
 // packages/core/mesh/teleport/src/muxing/balancer.ts
 var varint = __toESM(require("varint"));
-var import_async2 = require("@dxos/async");
+var import_async3 = require("@dxos/async");
 var import_invariant2 = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
-var __dxlog_file2 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/muxing/balancer.ts";
+var import_log3 = require("@dxos/log");
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/balancer.ts";
 var MAX_CHUNK_SIZE = 8192;
 var Balancer = class {
   constructor(_sysChannelId) {
@@ -246,7 +386,7 @@ var Balancer = class {
     this._sendBuffers = /* @__PURE__ */ new Map();
     this._receiveBuffers = /* @__PURE__ */ new Map();
     this._sending = false;
-    this.incomingData = new import_async2.Event();
+    this.incomingData = new import_async3.Event();
     this.stream = this._framer.stream;
     this._channels.push(_sysChannelId);
     this._framer.port.subscribe(this._processIncomingMessage.bind(this));
@@ -265,8 +405,8 @@ var Balancer = class {
   }
   pushData(data, trigger, channelId) {
     this._enqueueChunk(data, trigger, channelId);
-    this._sendChunks().catch((err) => import_log2.log.catch(err, void 0, {
-      F: __dxlog_file2,
+    this._sendChunks().catch((err) => import_log3.log.catch(err, void 0, {
+      F: __dxlog_file3,
       L: 75,
       S: this,
       C: (f, a) => f(...a)
@@ -274,8 +414,8 @@ var Balancer = class {
   }
   destroy() {
     if (this._sendBuffers.size !== 0) {
-      import_log2.log.warn("destroying balancer with pending calls", void 0, {
-        F: __dxlog_file2,
+      import_log3.log.info("destroying balancer with pending calls", void 0, {
+        F: __dxlog_file3,
         L: 80,
         S: this,
         C: (f, a) => f(...a)
@@ -370,15 +510,15 @@ var Balancer = class {
     chunk = this._getNextChunk();
     while (chunk) {
       if (!this._framer.writable) {
-        (0, import_log2.log)("PAUSE for drain", void 0, {
-          F: __dxlog_file2,
+        (0, import_log3.log)("PAUSE for drain", void 0, {
+          F: __dxlog_file3,
           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,
+        (0, import_log3.log)("RESUME for drain", void 0, {
+          F: __dxlog_file3,
           L: 181,
           S: this,
           C: (f, a) => f(...a)
@@ -388,10 +528,10 @@ var Balancer = class {
         await this._framer.port.send(chunk.msg);
         chunk.trigger?.wake();
       } catch (err) {
-        (0, import_log2.log)("Error sending chunk", {
+        (0, import_log3.log)("Error sending chunk", {
           err
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 187,
           S: this,
           C: (f, a) => f(...a)
@@ -401,7 +541,7 @@ var Balancer = class {
       chunk = this._getNextChunk();
     }
     (0, import_invariant2.invariant)(this._sendBuffers.size === 0, "sendBuffers not empty", {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 192,
       S: this,
       A: [
@@ -440,8 +580,8 @@ 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 Command = import_protocols.schema.getCodecForType("dxos.mesh.muxer.Command");
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/muxer.ts";
+var Command = import_protocols2.schema.getCodecForType("dxos.mesh.muxer.Command");
 var DEFAULT_SEND_COMMAND_TIMEOUT = 6e4;
 var DESTROY_COMMAND_SEND_TIMEOUT = 5e3;
 var STATS_INTERVAL = 1e3;
@@ -453,15 +593,15 @@ var Muxer = class {
     this._balancer = new Balancer(SYSTEM_CHANNEL_ID);
     this._channelsByLocalId = /* @__PURE__ */ new Map();
     this._channelsByTag = /* @__PURE__ */ new Map();
-    this._ctx = new import_context.Context();
+    this._ctx = new import_context2.Context();
     this._nextId = 1;
     this._closing = false;
     this._destroying = false;
     this._disposed = false;
     this._lastStats = void 0;
     this._lastChannelStats = /* @__PURE__ */ new Map();
-    this.afterClosed = new import_async3.Event();
-    this.statsUpdated = new import_async3.Event();
+    this.afterClosed = new import_async4.Event();
+    this.statsUpdated = new import_async4.Event();
     this.stream = this._balancer.stream;
     this._balancer.incomingData.on(async (msg) => {
       await this._handleCommand(Command.decode(msg));
@@ -479,7 +619,7 @@ var Muxer = class {
       contentType: opts.contentType
     });
     (0, import_invariant3.invariant)(!channel.push, `Channel already open: ${tag}`, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 140,
       S: this,
       A: [
@@ -527,7 +667,7 @@ var Muxer = class {
       contentType: opts.contentType
     });
     (0, import_invariant3.invariant)(!channel.push, `Channel already open: ${tag}`, {
-      F: __dxlog_file3,
+      F: __dxlog_file4,
       L: 192,
       S: this,
       A: [
@@ -551,7 +691,7 @@ var Muxer = class {
       },
       subscribe: (cb) => {
         (0, import_invariant3.invariant)(!callback, "Only one subscriber is allowed", {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 214,
           S: this,
           A: [
@@ -583,8 +723,8 @@ var Muxer = class {
   // initiate graceful close
   async close(err) {
     if (this._destroying) {
-      (0, import_log3.log)("already destroying, ignoring graceful close request", void 0, {
-        F: __dxlog_file3,
+      (0, import_log4.log)("already destroying, ignoring graceful close request", void 0, {
+        F: __dxlog_file4,
         L: 247,
         S: this,
         C: (f, a) => f(...a)
@@ -592,8 +732,8 @@ var Muxer = class {
       return;
     }
     if (this._closing) {
-      (0, import_log3.log)("already closing, ignoring graceful close request", void 0, {
-        F: __dxlog_file3,
+      (0, import_log4.log)("already closing, ignoring graceful close request", void 0, {
+        F: __dxlog_file4,
         L: 251,
         S: this,
         C: (f, a) => f(...a)
@@ -606,10 +746,10 @@ var Muxer = class {
         error: err?.message
       }
     }, SYSTEM_CHANNEL_ID, DESTROY_COMMAND_SEND_TIMEOUT).catch(async (err2) => {
-      (0, import_log3.log)("error sending close command", {
+      (0, import_log4.log)("error sending close command", {
         err: err2
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 266,
         S: this,
         C: (f, a) => f(...a)
@@ -619,7 +759,7 @@ var Muxer = class {
     await Promise.race([
       new Promise((_resolve, reject) => {
         setTimeout(() => {
-          reject(new import_protocols.TimeoutError("gracefully closing muxer"));
+          reject(new import_protocols2.TimeoutError("gracefully closing muxer"));
         }, GRACEFUL_CLOSE_TIMEOUT);
       }),
       (async () => {
@@ -630,8 +770,8 @@ var Muxer = class {
   // force close without confirmation
   async destroy(err) {
     if (this._destroying) {
-      (0, import_log3.log)("already destroying, ignoring destroy request", void 0, {
-        F: __dxlog_file3,
+      (0, import_log4.log)("already destroying, ignoring destroy request", void 0, {
+        F: __dxlog_file4,
         L: 287,
         S: this,
         C: (f, a) => f(...a)
@@ -641,8 +781,8 @@ var Muxer = class {
     this._destroying = true;
     void this._ctx.dispose();
     if (this._closing) {
-      (0, import_log3.log)("destroy cancelling graceful close", void 0, {
-        F: __dxlog_file3,
+      (0, import_log4.log)("destroy cancelling graceful close", void 0, {
+        F: __dxlog_file4,
         L: 293,
         S: this,
         C: (f, a) => f(...a)
@@ -654,10 +794,10 @@ var Muxer = class {
           error: err?.message
         }
       }, SYSTEM_CHANNEL_ID).catch(async (err2) => {
-        (0, import_log3.log)("error sending courtesy close command", {
+        (0, import_log4.log)("error sending courtesy close command", {
           err: err2
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 306,
           S: this,
           C: (f, a) => f(...a)
@@ -665,10 +805,10 @@ var Muxer = class {
       });
     }
     this.dispose(err).catch((err2) => {
-      (0, import_log3.log)("error disposing after destroy", {
+      (0, import_log4.log)("error disposing after destroy", {
         err: err2
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 311,
         S: this,
         C: (f, a) => f(...a)
@@ -678,8 +818,8 @@ var Muxer = class {
   // 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,
+      (0, import_log4.log)("already destroyed, ignoring dispose request", void 0, {
+        F: __dxlog_file4,
         L: 319,
         S: this,
         C: (f, a) => f(...a)
@@ -698,10 +838,10 @@ var Muxer = class {
   }
   async _handleCommand(cmd) {
     if (this._disposed) {
-      import_log3.log.warn("Received command after destroy", {
+      import_log4.log.warn("Received command after disposed", {
         cmd
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file4,
         L: 341,
         S: this,
         C: (f, a) => f(...a)
@@ -710,16 +850,16 @@ var Muxer = class {
     }
     if (cmd.close) {
       if (!this._closing) {
-        (0, import_log3.log)("received peer close, initiating my own graceful close", void 0, {
-          F: __dxlog_file3,
+        (0, import_log4.log)("received peer close, initiating my own graceful close", void 0, {
+          F: __dxlog_file4,
           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,
+        (0, import_log4.log)("received close from peer, already closing", void 0, {
+          F: __dxlog_file4,
           L: 350,
           S: this,
           C: (f, a) => f(...a)
@@ -745,10 +885,10 @@ var Muxer = class {
     } else if (cmd.data) {
       const stream = this._channelsByLocalId.get(cmd.data.channelId) ?? (0, import_debug.failUndefined)();
       if (!stream.push) {
-        import_log3.log.warn("Received data for channel before it was opened", {
+        import_log4.log.warn("Received data for channel before it was opened", {
           tag: stream.tag
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file4,
           L: 379,
           S: this,
           C: (f, a) => f(...a)
@@ -759,8 +899,19 @@ var Muxer = class {
     }
   }
   async _sendCommand(cmd, channelId = -1, timeout = DEFAULT_SEND_COMMAND_TIMEOUT) {
+    if (this._disposed) {
+      import_log4.log.info("ignoring sendCommand after disposed", {
+        cmd
+      }, {
+        F: __dxlog_file4,
+        L: 388,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
     try {
-      const trigger = new import_async3.Trigger();
+      const trigger = new import_async4.Trigger();
       this._balancer.pushData(Command.encode(cmd), trigger, channelId);
       await trigger.wait({
         timeout
@@ -771,7 +922,7 @@ var Muxer = class {
   }
   _getOrCreateStream(params) {
     if (this._channelsByTag.size === 0) {
-      (0, import_async3.scheduleTaskInterval)(this._ctx, async () => this._emitStats(), STATS_INTERVAL);
+      (0, import_async4.scheduleTaskInterval)(this._ctx, async () => this._emitStats(), STATS_INTERVAL);
     }
     let channel = this._channelsByTag.get(params.tag);
     if (!channel) {
@@ -796,12 +947,12 @@ var Muxer = class {
   }
   async _sendData(channel, data, timeout) {
     if (data.length > MAX_SAFE_FRAME_SIZE) {
-      import_log3.log.warn("frame size exceeds maximum safe value", {
+      import_log4.log.warn("frame size exceeds maximum safe value", {
         size: data.length,
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
-        F: __dxlog_file3,
-        L: 425,
+        F: __dxlog_file4,
+        L: 429,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -878,17 +1029,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_file5 = "/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({
+    this._ctx = new import_context3.Context({
       onError: (err) => {
         void this.destroy(err).catch(() => {
-          import_log4.log.error("Error during destroy", err, {
-            F: __dxlog_file4,
-            L: 47,
+          import_log5.log.error("Error during destroy", err, {
+            F: __dxlog_file5,
+            L: 38,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -896,35 +1047,14 @@ var Teleport = class {
       }
     });
     this._muxer = new Muxer();
-    this._control = new ControlExtension({
-      heartbeatInterval: CONTROL_HEARTBEAT_INTERVAL,
-      heartbeatTimeout: CONTROL_HEARTBEAT_TIMEOUT,
-      onTimeout: () => {
-        if (this._destroying || this._aborting) {
-          return;
-        }
-        (0, import_log4.log)("abort teleport due to onTimeout in ControlExtension", void 0, {
-          F: __dxlog_file4,
-          L: 62,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this.abort(new import_protocols2.TimeoutError("control extension")).catch((err) => import_log4.log.catch(err, void 0, {
-          F: __dxlog_file4,
-          L: 63,
-          S: this,
-          C: (f, a) => f(...a)
-        }));
-      }
-    });
     this._extensions = /* @__PURE__ */ new Map();
     this._remoteExtensions = /* @__PURE__ */ new Set();
     this._open = false;
     this._destroying = false;
     this._aborting = false;
     (0, import_invariant4.invariant)(typeof initiator === "boolean", void 0, {
-      F: __dxlog_file4,
-      L: 75,
+      F: __dxlog_file5,
+      L: 55,
       S: this,
       A: [
         "typeof initiator === 'boolean'",
@@ -932,8 +1062,8 @@ var Teleport = class {
       ]
     });
     (0, import_invariant4.invariant)(import_keys.PublicKey.isPublicKey(localPeerId), void 0, {
-      F: __dxlog_file4,
-      L: 76,
+      F: __dxlog_file5,
+      L: 56,
       S: this,
       A: [
         "PublicKey.isPublicKey(localPeerId)",
@@ -941,8 +1071,8 @@ var Teleport = class {
       ]
     });
     (0, import_invariant4.invariant)(import_keys.PublicKey.isPublicKey(remotePeerId), void 0, {
-      F: __dxlog_file4,
-      L: 77,
+      F: __dxlog_file5,
+      L: 57,
       S: this,
       A: [
         "PublicKey.isPublicKey(remotePeerId)",
@@ -952,18 +1082,39 @@ var Teleport = class {
     this.initiator = initiator;
     this.localPeerId = localPeerId;
     this.remotePeerId = remotePeerId;
+    this._control = new ControlExtension({
+      heartbeatInterval: CONTROL_HEARTBEAT_INTERVAL,
+      heartbeatTimeout: CONTROL_HEARTBEAT_TIMEOUT,
+      onTimeout: () => {
+        if (this._destroying || this._aborting) {
+          return;
+        }
+        import_log5.log.info("abort teleport due to onTimeout in ControlExtension", void 0, {
+          F: __dxlog_file5,
+          L: 70,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this.abort(new import_protocols3.TimeoutError("control extension")).catch((err) => import_log5.log.catch(err, void 0, {
+          F: __dxlog_file5,
+          L: 71,
+          S: this,
+          C: (f, a) => f(...a)
+        }));
+      }
+    }, this.localPeerId, this.remotePeerId);
     this._control.onExtensionRegistered.set(async (name) => {
-      (0, import_log4.log)("remote extension", {
+      (0, import_log5.log)("remote extension", {
         name
       }, {
-        F: __dxlog_file4,
-        L: 83,
+        F: __dxlog_file5,
+        L: 79,
         S: this,
         C: (f, a) => f(...a)
       });
       (0, import_invariant4.invariant)(!this._remoteExtensions.has(name), "Remote extension already exists", {
-        F: __dxlog_file4,
-        L: 84,
+        F: __dxlog_file5,
+        L: 80,
         S: this,
         A: [
           "!this._remoteExtensions.has(name)",
@@ -982,9 +1133,9 @@ var Teleport = class {
     {
       this._muxer.stream.on("close", async () => {
         if (this._destroying || this._aborting) {
-          (0, import_log4.log)("destroy teleport due to muxer stream close, skipping due to already destroying/aborting", void 0, {
-            F: __dxlog_file4,
-            L: 100,
+          (0, import_log5.log)("destroy teleport due to muxer stream close, skipping due to already destroying/aborting", void 0, {
+            F: __dxlog_file5,
+            L: 96,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -997,7 +1148,7 @@ var Teleport = class {
       });
     }
     this._muxer.statsUpdated.on((stats) => {
-      import_log4.log.trace("dxos.mesh.teleport.stats", {
+      import_log5.log.trace("dxos.mesh.teleport.stats", {
         localPeerId,
         remotePeerId,
         bytesSent: stats.bytesSent,
@@ -1006,8 +1157,8 @@ var Teleport = class {
         bytesReceivedRate: stats.bytesReceivedRate,
         channels: stats.channels
       }, {
-        F: __dxlog_file4,
-        L: 113,
+        F: __dxlog_file5,
+        L: 109,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1043,9 +1194,9 @@ var Teleport = class {
       try {
         await extension.onAbort(err);
       } catch (err2) {
-        import_log4.log.catch(err2, void 0, {
-          F: __dxlog_file4,
-          L: 166,
+        import_log5.log.catch(err2, void 0, {
+          F: __dxlog_file5,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1066,9 +1217,9 @@ var Teleport = class {
       try {
         await extension.onClose(err);
       } catch (err2) {
-        import_log4.log.catch(err2, void 0, {
-          F: __dxlog_file4,
-          L: 190,
+        import_log5.log.catch(err2, void 0, {
+          F: __dxlog_file5,
+          L: 186,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1080,35 +1231,35 @@ var Teleport = class {
     if (!this._open) {
       throw new Error("Not open");
     }
-    (0, import_log4.log)("addExtension", {
+    (0, import_log5.log)("addExtension", {
       name
     }, {
-      F: __dxlog_file4,
-      L: 202,
+      F: __dxlog_file5,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
     this._setExtension(name, extension);
-    (0, import_async4.scheduleTask)(this._ctx, async () => {
+    (0, import_async5.scheduleTask)(this._ctx, async () => {
       try {
         await this._control.registerExtension(name);
       } catch (err) {
-        if (err instanceof import_protocols2.RpcClosedError) {
+        if (err instanceof import_protocols3.RpcClosedError) {
           return;
         }
         throw err;
       }
     });
     if (this._remoteExtensions.has(name)) {
-      (0, import_async4.scheduleTask)(this._ctx, async () => {
+      (0, import_async5.scheduleTask)(this._ctx, async () => {
         await this._openExtension(name);
       });
     }
   }
   _setExtension(extensionName, extension) {
     (0, import_invariant4.invariant)(!extensionName.includes("/"), "Invalid extension name", {
-      F: __dxlog_file4,
-      L: 226,
+      F: __dxlog_file5,
+      L: 222,
       S: this,
       A: [
         "!extensionName.includes('/')",
@@ -1116,8 +1267,8 @@ var Teleport = class {
       ]
     });
     (0, import_invariant4.invariant)(!this._extensions.has(extensionName), "Extension already exists", {
-      F: __dxlog_file4,
-      L: 227,
+      F: __dxlog_file5,
+      L: 223,
       S: this,
       A: [
         "!this._extensions.has(extensionName)",
@@ -1127,11 +1278,11 @@ var Teleport = class {
     this._extensions.set(extensionName, extension);
   }
   async _openExtension(extensionName) {
-    (0, import_log4.log)("open extension", {
+    (0, import_log5.log)("open extension", {
       extensionName
     }, {
-      F: __dxlog_file4,
-      L: 232,
+      F: __dxlog_file5,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1142,8 +1293,8 @@ var Teleport = class {
       remotePeerId: this.remotePeerId,
       createPort: async (channelName, opts) => {
         (0, import_invariant4.invariant)(!channelName.includes("/"), "Invalid channel name", {
-          F: __dxlog_file4,
-          L: 240,
+          F: __dxlog_file5,
+          L: 236,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1154,8 +1305,8 @@ var Teleport = class {
       },
       createStream: async (channelName, opts) => {
         (0, import_invariant4.invariant)(!channelName.includes("/"), "Invalid channel name", {
-          F: __dxlog_file4,
-          L: 244,
+          F: __dxlog_file5,
+          L: 240,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1165,86 +1316,31 @@ var Teleport = class {
         return this._muxer.createStream(`${extensionName}/${channelName}`, opts);
       },
       close: (err) => {
-        void (0, import_async4.runInContextAsync)(this._ctx, async () => {
+        void (0, import_async5.runInContextAsync)(this._ctx, async () => {
           await this.close(err);
         });
       }
     };
     await extension.onOpen(context);
-    (0, import_log4.log)("extension opened", {
+    (0, import_log5.log)("extension opened", {
       extensionName
     }, {
-      F: __dxlog_file4,
-      L: 255,
+      F: __dxlog_file5,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
   }
 };
 _ts_decorate([
-  import_async4.synchronized
+  import_async5.synchronized
 ], Teleport.prototype, "abort", null);
 _ts_decorate([
-  import_async4.synchronized
+  import_async5.synchronized
 ], Teleport.prototype, "destroy", null);
-var ControlExtension = class {
-  constructor(opts) {
-    this.opts = opts;
-    this._ctx = new import_context2.Context({
-      onError: (err) => {
-        this._extensionContext.close(err);
-      }
-    });
-    this.onExtensionRegistered = new import_util.Callback();
-  }
-  async registerExtension(name) {
-    await this._rpc.rpc.Control.registerExtension({
-      name
-    });
-  }
-  async onOpen(extensionContext) {
-    this._extensionContext = extensionContext;
-    this._rpc = (0, import_rpc.createProtoRpcPeer)({
-      requested: {
-        Control: import_protocols2.schema.getService("dxos.mesh.teleport.control.ControlService")
-      },
-      exposed: {
-        Control: import_protocols2.schema.getService("dxos.mesh.teleport.control.ControlService")
-      },
-      handlers: {
-        Control: {
-          registerExtension: async (request) => {
-            this.onExtensionRegistered.call(request.name);
-          },
-          heartbeat: async (request) => {
-          }
-        }
-      },
-      port: await extensionContext.createPort("rpc", {
-        contentType: 'application/x-protobuf; messagType="dxos.rpc.Message"'
-      })
-    });
-    await this._rpc.open();
-    (0, import_async4.scheduleTaskInterval)(this._ctx, async () => {
-      try {
-        await (0, import_async4.asyncTimeout)(this._rpc.rpc.Control.heartbeat(), this.opts.heartbeatTimeout);
-      } catch (err) {
-        this.opts.onTimeout();
-      }
-    }, this.opts.heartbeatInterval);
-  }
-  async onClose(err) {
-    await this._ctx.dispose();
-    await this._rpc.close();
-  }
-  async onAbort(err) {
-    await this._ctx.dispose();
-    await this._rpc.abort();
-  }
-};
 
 // packages/core/mesh/teleport/src/testing/test-builder.ts
-var __dxlog_file5 = "/mnt/ramdisk/work/packages/core/mesh/teleport/src/testing/test-builder.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-builder.ts";
 var TestBuilder = class {
   constructor() {
     this._peers = /* @__PURE__ */ new Set();
@@ -1264,7 +1360,7 @@ var TestBuilder = class {
   }
   async connect(peer1, peer2) {
     (0, import_invariant5.invariant)(peer1 !== peer2, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 37,
       S: this,
       A: [
@@ -1273,7 +1369,7 @@ var TestBuilder = class {
       ]
     });
     (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 38,
       S: this,
       A: [
@@ -1282,7 +1378,7 @@ var TestBuilder = class {
       ]
     });
     (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 39,
       S: this,
       A: [
@@ -1310,7 +1406,7 @@ var TestBuilder = class {
   }
   async disconnect(peer1, peer2) {
     (0, import_invariant5.invariant)(peer1 !== peer2, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 51,
       S: this,
       A: [
@@ -1319,7 +1415,7 @@ var TestBuilder = class {
       ]
     });
     (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 52,
       S: this,
       A: [
@@ -1328,7 +1424,7 @@ var TestBuilder = class {
       ]
     });
     (0, import_invariant5.invariant)(this._peers.has(peer1), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 53,
       S: this,
       A: [
@@ -1339,7 +1435,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_invariant5.invariant)(connection1, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 62,
       S: this,
       A: [
@@ -1348,7 +1444,7 @@ var TestBuilder = class {
       ]
     });
     (0, import_invariant5.invariant)(connection2, void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 63,
       S: this,
       A: [
@@ -1378,7 +1474,7 @@ var TestPeer = class {
   }
   async openConnection(connection) {
     (0, import_invariant5.invariant)(this.connections.has(connection), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 84,
       S: this,
       A: [
@@ -1391,7 +1487,7 @@ var TestPeer = class {
   }
   async closeConnection(connection) {
     (0, import_invariant5.invariant)(this.connections.has(connection), void 0, {
-      F: __dxlog_file5,
+      F: __dxlog_file6,
       L: 90,
       S: this,
       A: [
@@ -1412,8 +1508,8 @@ var TestPeer = class {
 var pipeStreams = (stream1, stream2) => {
   (0, import_node_stream3.pipeline)(stream1, stream2, (err) => {
     if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
-      import_log5.log.catch(err, void 0, {
-        F: __dxlog_file5,
+      import_log6.log.catch(err, void 0, {
+        F: __dxlog_file6,
         L: 106,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1422,8 +1518,8 @@ var pipeStreams = (stream1, stream2) => {
   });
   (0, import_node_stream3.pipeline)(stream2, stream1, (err) => {
     if (err && err.code !== "ERR_STREAM_PREMATURE_CLOSE") {
-      import_log5.log.catch(err, void 0, {
-        F: __dxlog_file5,
+      import_log6.log.catch(err, void 0, {
+        F: __dxlog_file6,
         L: 111,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1445,28 +1541,28 @@ var TestConnection = class {
 };
 
 // packages/core/mesh/teleport/src/testing/test-extension.ts
-var import_async5 = require("@dxos/async");
+var import_async6 = require("@dxos/async");
 var import_invariant6 = require("@dxos/invariant");
-var import_log6 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
+var import_log7 = require("@dxos/log");
+var import_protocols4 = 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_file7 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-extension.ts";
 var TestExtension = class {
   constructor(callbacks = {}) {
     this.callbacks = callbacks;
-    this.open = new import_async5.Trigger();
-    this.closed = new import_async5.Trigger();
-    this.aborted = new import_async5.Trigger();
+    this.open = new import_async6.Trigger();
+    this.closed = new import_async6.Trigger();
+    this.aborted = new import_async6.Trigger();
   }
   get remotePeerId() {
     return this.extensionContext?.remotePeerId;
   }
   async onOpen(context) {
-    (0, import_log6.log)("onOpen", {
+    (0, import_log7.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 34,
       S: this,
       C: (f, a) => f(...a)
@@ -1477,10 +1573,10 @@ var TestExtension = class {
         contentType: 'application/x-protobuf; messageType="dxos.rpc.Message"'
       }),
       requested: {
-        TestService: import_protocols3.schema.getService("example.testing.rpc.TestService")
+        TestService: import_protocols4.schema.getService("example.testing.rpc.TestService")
       },
       exposed: {
-        TestService: import_protocols3.schema.getService("example.testing.rpc.TestService")
+        TestService: import_protocols4.schema.getService("example.testing.rpc.TestService")
       },
       handlers: {
         TestService: {
@@ -1500,10 +1596,10 @@ var TestExtension = class {
     this.open.wake();
   }
   async onClose(err) {
-    (0, import_log6.log)("onClose", {
+    (0, import_log7.log)("onClose", {
       err
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 68,
       S: this,
       C: (f, a) => f(...a)
@@ -1513,10 +1609,10 @@ var TestExtension = class {
     await this._rpc?.close();
   }
   async onAbort(err) {
-    (0, import_log6.log)("onAbort", {
+    (0, import_log7.log)("onAbort", {
       err
     }, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 75,
       S: this,
       C: (f, a) => f(...a)
@@ -1529,11 +1625,11 @@ var TestExtension = class {
     await this.open.wait({
       timeout: 1500
     });
-    const res = await (0, import_async5.asyncTimeout)(this._rpc.rpc.TestService.testCall({
+    const res = await (0, import_async6.asyncTimeout)(this._rpc.rpc.TestService.testCall({
       data: message
     }), 1500);
     (0, import_invariant6.invariant)(res.data === message, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file7,
       L: 84,
       S: this,
       A: [
@@ -1552,18 +1648,18 @@ 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_async7 = require("@dxos/async");
 var import_invariant7 = require("@dxos/invariant");
-var import_log7 = require("@dxos/log");
-var import_protocols4 = require("@dxos/protocols");
+var import_log8 = require("@dxos/log");
+var import_protocols5 = 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_file8 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-extension-with-streams.ts";
 var TestExtensionWithStreams = class {
   constructor(callbacks = {}) {
     this.callbacks = callbacks;
-    this.open = new import_async6.Trigger();
-    this.closed = new import_async6.Trigger();
-    this.aborted = new import_async6.Trigger();
+    this.open = new import_async7.Trigger();
+    this.closed = new import_async7.Trigger();
+    this.aborted = new import_async7.Trigger();
     this._streams = /* @__PURE__ */ new Map();
   }
   get remotePeerId() {
@@ -1571,7 +1667,7 @@ var TestExtensionWithStreams = class {
   }
   async _openStream(streamTag, interval = 5, chunkSize = 2048) {
     (0, import_invariant7.invariant)(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 39,
       S: this,
       A: [
@@ -1619,7 +1715,7 @@ var TestExtensionWithStreams = class {
     });
     streamEntry.reportingTimer = setInterval(() => {
       const { bytesSent, bytesReceived, sendErrors, receiveErrors } = streamEntry;
-      import_log7.log.trace("dxos.test.stream-stats", {
+      import_log8.log.trace("dxos.test.stream-stats", {
         streamTag,
         bytesSent,
         bytesReceived,
@@ -1628,7 +1724,7 @@ var TestExtensionWithStreams = class {
         from: this.extensionContext?.localPeerId,
         to: this.extensionContext?.remotePeerId
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 93,
         S: this,
         C: (f, a) => f(...a)
@@ -1637,7 +1733,7 @@ var TestExtensionWithStreams = class {
   }
   _closeStream(streamTag) {
     (0, import_invariant7.invariant)(this._streams.has(streamTag), `Stream does not exist: ${streamTag}`, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 106,
       S: this,
       A: [
@@ -1660,11 +1756,11 @@ var TestExtensionWithStreams = class {
     };
   }
   async onOpen(context) {
-    (0, import_log7.log)("onOpen", {
+    (0, import_log8.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 128,
       S: this,
       C: (f, a) => f(...a)
@@ -1675,10 +1771,10 @@ var TestExtensionWithStreams = class {
         contentType: 'application/x-protobuf; messageType="dxos.rpc.Message"'
       }),
       requested: {
-        TestServiceWithStreams: import_protocols4.schema.getService("example.testing.rpc.TestServiceWithStreams")
+        TestServiceWithStreams: import_protocols5.schema.getService("example.testing.rpc.TestServiceWithStreams")
       },
       exposed: {
-        TestServiceWithStreams: import_protocols4.schema.getService("example.testing.rpc.TestServiceWithStreams")
+        TestServiceWithStreams: import_protocols5.schema.getService("example.testing.rpc.TestServiceWithStreams")
       },
       handlers: {
         TestServiceWithStreams: {
@@ -1710,10 +1806,10 @@ var TestExtensionWithStreams = class {
     this.open.wake();
   }
   async onClose(err) {
-    (0, import_log7.log)("onClose", {
+    (0, import_log8.log)("onClose", {
       err
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 179,
       S: this,
       C: (f, a) => f(...a)
@@ -1721,10 +1817,10 @@ var TestExtensionWithStreams = class {
     await this.callbacks.onClose?.();
     this.closed.wake();
     for (const [streamTag, stream] of Object.entries(this._streams)) {
-      (0, import_log7.log)("closing stream", {
+      (0, import_log8.log)("closing stream", {
         streamTag
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file8,
         L: 183,
         S: this,
         C: (f, a) => f(...a)
@@ -1735,10 +1831,10 @@ var TestExtensionWithStreams = class {
     await this._rpc?.close();
   }
   async onAbort(err) {
-    (0, import_log7.log)("onAbort", {
+    (0, import_log8.log)("onAbort", {
       err
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
@@ -1760,7 +1856,7 @@ var TestExtensionWithStreams = class {
       streamLoadChunkSize
     });
     (0, import_invariant7.invariant)(data === streamTag, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 207,
       S: this,
       A: [
@@ -1779,7 +1875,7 @@ var TestExtensionWithStreams = class {
       data: streamTag
     });
     (0, import_invariant7.invariant)(data === streamTag, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file8,
       L: 220,
       S: this,
       A: [