@dxos/teleport 0.3.9-main.b7e6a67 → 0.3.9-main.c7cd0ec

package/dist/lib/node/{chunk-GK3YA6TG.cjs → chunk-SJ6CXLWF.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_GK3YA6TG_exports = {};
-__export(chunk_GK3YA6TG_exports, {
+var chunk_SJ6CXLWF_exports = {};
+__export(chunk_SJ6CXLWF_exports, {
   Framer: () => Framer,
   Muxer: () => Muxer,
   Teleport: () => Teleport,
@@ -39,7 +39,7 @@ __export(chunk_GK3YA6TG_exports, {
   decodeFrame: () => decodeFrame,
   encodeFrame: () => encodeFrame
 });
-module.exports = __toCommonJS(chunk_GK3YA6TG_exports);
+module.exports = __toCommonJS(chunk_SJ6CXLWF_exports);
 var import_node_stream = require("node:stream");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
@@ -578,6 +578,16 @@ var decodeChunk = (data, withLength) => {
     chunk
   };
 };
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        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 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/muxing/muxer.ts";
 var Command = import_protocols3.schema.getCodecForType("dxos.mesh.muxer.Command");
 var DEFAULT_SEND_COMMAND_TIMEOUT = 6e4;
@@ -605,6 +615,12 @@ var Muxer = class {
       await this._handleCommand(Command.decode(msg));
     });
   }
+  setSessionId(sessionId) {
+    this._sessionId = sessionId;
+  }
+  get sessionIdString() {
+    return this._sessionId ? this._sessionId.truncate() : "none";
+  }
   /**
   * Creates a duplex Node.js-style stream.
   * The remote peer is expected to call `createStream` with the same tag.
@@ -618,7 +634,7 @@ var Muxer = class {
     });
     (0, import_invariant4.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file4,
-      L: 140,
+      L: 151,
       S: this,
       A: [
         "!channel.push",
@@ -637,7 +653,15 @@ var Muxer = class {
       stream.push(data);
     };
     channel.destroy = (err) => {
-      stream.destroy(err);
+      if (err) {
+        if (stream.listeners("error").length > 0) {
+          stream.destroy(err);
+        } else {
+          stream.destroy();
+        }
+      } else {
+        stream.destroy();
+      }
     };
     try {
       await this._sendCommand({
@@ -666,7 +690,7 @@ var Muxer = class {
     });
     (0, import_invariant4.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file4,
-      L: 192,
+      L: 211,
       S: this,
       A: [
         "!channel.push",
@@ -690,7 +714,7 @@ var Muxer = class {
       subscribe: (cb) => {
         (0, import_invariant4.invariant)(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file4,
-          L: 214,
+          L: 233,
           S: this,
           A: [
             "!callback",
@@ -723,7 +747,7 @@ var Muxer = class {
     if (this._destroying) {
       (0, import_log5.log)("already destroying, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 247,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -732,7 +756,7 @@ var Muxer = class {
     if (this._closing) {
       (0, import_log5.log)("already closing, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 251,
+        L: 270,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -748,29 +772,20 @@ var Muxer = class {
         err: err2
       }, {
         F: __dxlog_file4,
-        L: 266,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.dispose(err2);
+      await this._dispose(err2);
     });
-    await Promise.race([
-      new Promise((_resolve, reject) => {
-        setTimeout(() => {
-          reject(new import_protocols3.TimeoutError("gracefully closing muxer"));
-        }, GRACEFUL_CLOSE_TIMEOUT);
-      }),
-      (async () => {
-        await this.dispose(err);
-      })()
-    ]);
+    await (0, import_async4.asyncTimeout)(this._dispose(err), GRACEFUL_CLOSE_TIMEOUT, new import_protocols3.TimeoutError("gracefully closing muxer"));
   }
   // force close without confirmation
   async destroy(err) {
     if (this._destroying) {
       (0, import_log5.log)("already destroying, ignoring destroy request", void 0, {
         F: __dxlog_file4,
-        L: 287,
+        L: 298,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -781,7 +796,7 @@ var Muxer = class {
     if (this._closing) {
       (0, import_log5.log)("destroy cancelling graceful close", void 0, {
         F: __dxlog_file4,
-        L: 293,
+        L: 304,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -796,29 +811,29 @@ var Muxer = class {
           err: err2
         }, {
           F: __dxlog_file4,
-          L: 306,
+          L: 317,
           S: this,
           C: (f, a) => f(...a)
         });
       });
     }
-    this.dispose(err).catch((err2) => {
+    this._dispose(err).catch((err2) => {
       (0, import_log5.log)("error disposing after destroy", {
         err: err2
       }, {
         F: __dxlog_file4,
-        L: 311,
+        L: 322,
         S: this,
         C: (f, a) => f(...a)
       });
     });
   }
   // complete the termination, graceful or otherwise
-  async dispose(err) {
+  async _dispose(err) {
     if (this._disposed) {
       (0, import_log5.log)("already destroyed, ignoring dispose request", void 0, {
         F: __dxlog_file4,
-        L: 319,
+        L: 330,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -830,6 +845,7 @@ var Muxer = class {
       channel.destroy?.(err);
     }
     this._disposed = true;
+    await this._emitStats();
     this.afterClosed.emit(err);
     this._channelsByLocalId.clear();
     this._channelsByTag.clear();
@@ -840,7 +856,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 341,
+        L: 353,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -850,15 +866,15 @@ var Muxer = class {
       if (!this._closing) {
         (0, import_log5.log)("received peer close, initiating my own graceful close", void 0, {
           F: __dxlog_file4,
-          L: 347,
+          L: 359,
           S: this,
           C: (f, a) => f(...a)
         });
-        await this.close();
+        await this.close(new Error("received peer close"));
       } else {
         (0, import_log5.log)("received close from peer, already closing", void 0, {
           F: __dxlog_file4,
-          L: 350,
+          L: 362,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -887,7 +903,7 @@ var Muxer = class {
           tag: stream.tag
         }, {
           F: __dxlog_file4,
-          L: 379,
+          L: 391,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -902,7 +918,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 388,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -950,7 +966,7 @@ var Muxer = class {
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
         F: __dxlog_file4,
-        L: 429,
+        L: 441,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1025,7 +1041,10 @@ var Muxer = class {
     this.statsUpdated.emit(this._lastStats);
   }
 };
-function _ts_decorate(decorators, target, key, desc) {
+_ts_decorate([
+  import_log5.logInfo
+], Muxer.prototype, "sessionIdString", null);
+function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -1045,7 +1064,7 @@ var Teleport = class {
         void this.destroy(err).catch(() => {
           import_log2.log.error("Error during destroy", err, {
             F: __dxlog_file5,
-            L: 38,
+            L: 39,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1060,7 +1079,7 @@ var Teleport = class {
     this._aborting = false;
     (0, import_invariant2.invariant)(typeof initiator === "boolean", void 0, {
       F: __dxlog_file5,
-      L: 55,
+      L: 56,
       S: this,
       A: [
         "typeof initiator === 'boolean'",
@@ -1069,7 +1088,7 @@ var Teleport = class {
     });
     (0, import_invariant2.invariant)(import_keys2.PublicKey.isPublicKey(localPeerId), void 0, {
       F: __dxlog_file5,
-      L: 56,
+      L: 57,
       S: this,
       A: [
         "PublicKey.isPublicKey(localPeerId)",
@@ -1078,7 +1097,7 @@ var Teleport = class {
     });
     (0, import_invariant2.invariant)(import_keys2.PublicKey.isPublicKey(remotePeerId), void 0, {
       F: __dxlog_file5,
-      L: 57,
+      L: 58,
       S: this,
       A: [
         "PublicKey.isPublicKey(remotePeerId)",
@@ -1097,13 +1116,13 @@ var Teleport = class {
         }
         import_log2.log.info("abort teleport due to onTimeout in ControlExtension", void 0, {
           F: __dxlog_file5,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
         this.abort(new import_protocols.TimeoutError("control extension")).catch((err) => import_log2.log.catch(err, void 0, {
           F: __dxlog_file5,
-          L: 71,
+          L: 72,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1114,13 +1133,13 @@ var Teleport = class {
         name
       }, {
         F: __dxlog_file5,
-        L: 79,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
       (0, import_invariant2.invariant)(!this._remoteExtensions.has(name), "Remote extension already exists", {
         F: __dxlog_file5,
-        L: 80,
+        L: 81,
         S: this,
         A: [
           "!this._remoteExtensions.has(name)",
@@ -1141,7 +1160,7 @@ var Teleport = class {
         if (this._destroying || this._aborting) {
           (0, import_log2.log)("destroy teleport due to muxer stream close, skipping due to already destroying/aborting", void 0, {
             F: __dxlog_file5,
-            L: 96,
+            L: 97,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1164,12 +1183,15 @@ var Teleport = class {
         channels: stats.channels
       }, {
         F: __dxlog_file5,
-        L: 109,
+        L: 110,
         S: this,
         C: (f, a) => f(...a)
       });
     });
   }
+  get sessionIdString() {
+    return this._sessionId ? this._sessionId.truncate() : "none";
+  }
   get stream() {
     return this._muxer.stream;
   }
@@ -1179,10 +1201,18 @@ var Teleport = class {
   /**
   * Blocks until the handshake is complete.
   */
-  async open() {
+  async open(sessionId = import_keys2.PublicKey.random()) {
+    this._sessionId = sessionId;
+    (0, import_log2.log)("open", void 0, {
+      F: __dxlog_file5,
+      L: 144,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._setExtension("dxos.mesh.teleport.control", this._control);
     await this._openExtension("dxos.mesh.teleport.control");
     this._open = true;
+    this._muxer.setSessionId(sessionId);
   }
   async close(err) {
     await this.destroy(err);
@@ -1202,7 +1232,7 @@ var Teleport = class {
       } catch (err2) {
         import_log2.log.catch(err2, void 0, {
           F: __dxlog_file5,
-          L: 162,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1225,7 +1255,7 @@ var Teleport = class {
       } catch (err2) {
         import_log2.log.catch(err2, void 0, {
           F: __dxlog_file5,
-          L: 186,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1241,7 +1271,7 @@ var Teleport = class {
       name
     }, {
       F: __dxlog_file5,
-      L: 198,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1265,7 +1295,7 @@ var Teleport = class {
   _setExtension(extensionName, extension) {
     (0, import_invariant2.invariant)(!extensionName.includes("/"), "Invalid extension name", {
       F: __dxlog_file5,
-      L: 222,
+      L: 233,
       S: this,
       A: [
         "!extensionName.includes('/')",
@@ -1274,7 +1304,7 @@ var Teleport = class {
     });
     (0, import_invariant2.invariant)(!this._extensions.has(extensionName), "Extension already exists", {
       F: __dxlog_file5,
-      L: 223,
+      L: 234,
       S: this,
       A: [
         "!this._extensions.has(extensionName)",
@@ -1288,7 +1318,7 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file5,
-      L: 228,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1300,7 +1330,7 @@ var Teleport = class {
       createPort: async (channelName, opts) => {
         (0, import_invariant2.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file5,
-          L: 236,
+          L: 247,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1312,7 +1342,7 @@ var Teleport = class {
       createStream: async (channelName, opts) => {
         (0, import_invariant2.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file5,
-          L: 240,
+          L: 251,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1332,16 +1362,19 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file5,
-      L: 251,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
   }
 };
-_ts_decorate([
+_ts_decorate2([
+  import_log2.logInfo
+], Teleport.prototype, "sessionIdString", null);
+_ts_decorate2([
   import_async.synchronized
 ], Teleport.prototype, "abort", null);
-_ts_decorate([
+_ts_decorate2([
   import_async.synchronized
 ], Teleport.prototype, "destroy", null);
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/teleport/src/testing/test-builder.ts";
@@ -1486,7 +1519,7 @@ var TestPeer = class {
         ""
       ]
     });
-    await connection.teleport.open();
+    await connection.teleport.open(import_keys.PublicKey.random());
     await this.onOpen(connection);
   }
   async closeConnection(connection) {
@@ -1907,4 +1940,4 @@ var TestExtensionWithStreams = class {
   decodeFrame,
   encodeFrame
 });
-//# sourceMappingURL=chunk-GK3YA6TG.cjs.map
+//# sourceMappingURL=chunk-SJ6CXLWF.cjs.map