@dxos/teleport 0.3.9-main.3a0f16f → 0.3.9-main.3fcc0fa

package/dist/lib/browser/{chunk-HMQK4NR4.mjs → chunk-CZZOJEEL.mjs}

@@ -12,7 +12,7 @@ import { Context as Context3 } from "@dxos/context";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
+import { log as log5, logInfo as logInfo2 } from "@dxos/log";
 import { RpcClosedError as RpcClosedError2, TimeoutError as TimeoutError2 } from "@dxos/protocols";
 
 // packages/core/mesh/teleport/src/control-extension.ts
@@ -325,11 +325,11 @@ var encodeFrame = (payload) => {
 
 // packages/core/mesh/teleport/src/muxing/muxer.ts
 import { Duplex as Duplex2 } from "@dxos/node-std/stream";
-import { scheduleTaskInterval as scheduleTaskInterval2, Event as Event3, Trigger } from "@dxos/async";
+import { scheduleTaskInterval as scheduleTaskInterval2, Event as Event3, Trigger, asyncTimeout as asyncTimeout2 } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { failUndefined } from "@dxos/debug";
 import { invariant as invariant3 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
+import { log as log4, logInfo } from "@dxos/log";
 import { schema as schema2, TimeoutError } from "@dxos/protocols";
 
 // packages/core/mesh/teleport/src/muxing/balancer.ts
@@ -542,6 +542,16 @@ var decodeChunk = (data, withLength) => {
 };
 
 // packages/core/mesh/teleport/src/muxing/muxer.ts
+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 = schema2.getCodecForType("dxos.mesh.muxer.Command");
 var DEFAULT_SEND_COMMAND_TIMEOUT = 6e4;
@@ -569,6 +579,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.
@@ -582,7 +598,7 @@ var Muxer = class {
     });
     invariant3(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file4,
-      L: 140,
+      L: 151,
       S: this,
       A: [
         "!channel.push",
@@ -638,7 +654,7 @@ var Muxer = class {
     });
     invariant3(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file4,
-      L: 200,
+      L: 211,
       S: this,
       A: [
         "!channel.push",
@@ -662,7 +678,7 @@ var Muxer = class {
       subscribe: (cb) => {
         invariant3(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file4,
-          L: 222,
+          L: 233,
           S: this,
           A: [
             "!callback",
@@ -695,7 +711,7 @@ var Muxer = class {
     if (this._destroying) {
       log4("already destroying, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 255,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -704,7 +720,7 @@ var Muxer = class {
     if (this._closing) {
       log4("already closing, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 259,
+        L: 270,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -720,29 +736,20 @@ var Muxer = class {
         err: err2
       }, {
         F: __dxlog_file4,
-        L: 274,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._dispose(err2);
     });
-    await Promise.race([
-      new Promise((_resolve, reject) => {
-        setTimeout(() => {
-          reject(new TimeoutError("gracefully closing muxer"));
-        }, GRACEFUL_CLOSE_TIMEOUT);
-      }),
-      (async () => {
-        await this._dispose(err);
-      })()
-    ]);
+    await asyncTimeout2(this._dispose(err), GRACEFUL_CLOSE_TIMEOUT, new TimeoutError("gracefully closing muxer"));
   }
   // force close without confirmation
   async destroy(err) {
     if (this._destroying) {
       log4("already destroying, ignoring destroy request", void 0, {
         F: __dxlog_file4,
-        L: 296,
+        L: 298,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -753,7 +760,7 @@ var Muxer = class {
     if (this._closing) {
       log4("destroy cancelling graceful close", void 0, {
         F: __dxlog_file4,
-        L: 302,
+        L: 304,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -768,7 +775,7 @@ var Muxer = class {
           err: err2
         }, {
           F: __dxlog_file4,
-          L: 315,
+          L: 317,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -779,7 +786,7 @@ var Muxer = class {
         err: err2
       }, {
         F: __dxlog_file4,
-        L: 320,
+        L: 322,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -790,7 +797,7 @@ var Muxer = class {
     if (this._disposed) {
       log4("already destroyed, ignoring dispose request", void 0, {
         F: __dxlog_file4,
-        L: 328,
+        L: 330,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -813,7 +820,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 351,
+        L: 353,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -823,7 +830,7 @@ var Muxer = class {
       if (!this._closing) {
         log4("received peer close, initiating my own graceful close", void 0, {
           F: __dxlog_file4,
-          L: 357,
+          L: 359,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -831,7 +838,7 @@ var Muxer = class {
       } else {
         log4("received close from peer, already closing", void 0, {
           F: __dxlog_file4,
-          L: 360,
+          L: 362,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -860,7 +867,7 @@ var Muxer = class {
           tag: stream.tag
         }, {
           F: __dxlog_file4,
-          L: 389,
+          L: 391,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -875,7 +882,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 398,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -923,7 +930,7 @@ var Muxer = class {
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
         F: __dxlog_file4,
-        L: 439,
+        L: 441,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -998,9 +1005,12 @@ var Muxer = class {
     this.statsUpdated.emit(this._lastStats);
   }
 };
+_ts_decorate([
+  logInfo
+], Muxer.prototype, "sessionIdString", null);
 
 // packages/core/mesh/teleport/src/teleport.ts
-function _ts_decorate(decorators, target, key, desc) {
+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);
@@ -1020,7 +1030,7 @@ var Teleport = class {
         void this.destroy(err).catch(() => {
           log5.error("Error during destroy", err, {
             F: __dxlog_file5,
-            L: 38,
+            L: 39,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1035,7 +1045,7 @@ var Teleport = class {
     this._aborting = false;
     invariant4(typeof initiator === "boolean", void 0, {
       F: __dxlog_file5,
-      L: 55,
+      L: 56,
       S: this,
       A: [
         "typeof initiator === 'boolean'",
@@ -1044,7 +1054,7 @@ var Teleport = class {
     });
     invariant4(PublicKey.isPublicKey(localPeerId), void 0, {
       F: __dxlog_file5,
-      L: 56,
+      L: 57,
       S: this,
       A: [
         "PublicKey.isPublicKey(localPeerId)",
@@ -1053,7 +1063,7 @@ var Teleport = class {
     });
     invariant4(PublicKey.isPublicKey(remotePeerId), void 0, {
       F: __dxlog_file5,
-      L: 57,
+      L: 58,
       S: this,
       A: [
         "PublicKey.isPublicKey(remotePeerId)",
@@ -1072,13 +1082,13 @@ var Teleport = class {
         }
         log5.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 TimeoutError2("control extension")).catch((err) => log5.catch(err, void 0, {
           F: __dxlog_file5,
-          L: 71,
+          L: 72,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1089,13 +1099,13 @@ var Teleport = class {
         name
       }, {
         F: __dxlog_file5,
-        L: 79,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
       invariant4(!this._remoteExtensions.has(name), "Remote extension already exists", {
         F: __dxlog_file5,
-        L: 80,
+        L: 81,
         S: this,
         A: [
           "!this._remoteExtensions.has(name)",
@@ -1116,7 +1126,7 @@ var Teleport = class {
         if (this._destroying || this._aborting) {
           log5("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)
           });
@@ -1139,12 +1149,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;
   }
@@ -1154,10 +1167,18 @@ var Teleport = class {
   /**
   * Blocks until the handshake is complete.
   */
-  async open() {
+  async open(sessionId = PublicKey.random()) {
+    this._sessionId = sessionId;
+    log5("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);
@@ -1177,7 +1198,7 @@ var Teleport = class {
       } catch (err2) {
         log5.catch(err2, void 0, {
           F: __dxlog_file5,
-          L: 162,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1200,7 +1221,7 @@ var Teleport = class {
       } catch (err2) {
         log5.catch(err2, void 0, {
           F: __dxlog_file5,
-          L: 186,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1216,7 +1237,7 @@ var Teleport = class {
       name
     }, {
       F: __dxlog_file5,
-      L: 198,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1240,7 +1261,7 @@ var Teleport = class {
   _setExtension(extensionName, extension) {
     invariant4(!extensionName.includes("/"), "Invalid extension name", {
       F: __dxlog_file5,
-      L: 222,
+      L: 233,
       S: this,
       A: [
         "!extensionName.includes('/')",
@@ -1249,7 +1270,7 @@ var Teleport = class {
     });
     invariant4(!this._extensions.has(extensionName), "Extension already exists", {
       F: __dxlog_file5,
-      L: 223,
+      L: 234,
       S: this,
       A: [
         "!this._extensions.has(extensionName)",
@@ -1263,7 +1284,7 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file5,
-      L: 228,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1275,7 +1296,7 @@ var Teleport = class {
       createPort: async (channelName, opts) => {
         invariant4(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file5,
-          L: 236,
+          L: 247,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1287,7 +1308,7 @@ var Teleport = class {
       createStream: async (channelName, opts) => {
         invariant4(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file5,
-          L: 240,
+          L: 251,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -1307,16 +1328,19 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file5,
-      L: 251,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
   }
 };
-_ts_decorate([
+_ts_decorate2([
+  logInfo2
+], Teleport.prototype, "sessionIdString", null);
+_ts_decorate2([
   synchronized
 ], Teleport.prototype, "abort", null);
-_ts_decorate([
+_ts_decorate2([
   synchronized
 ], Teleport.prototype, "destroy", null);
 
@@ -1463,7 +1487,7 @@ var TestPeer = class {
         ""
       ]
     });
-    await connection.teleport.open();
+    await connection.teleport.open(PublicKey2.random());
     await this.onOpen(connection);
   }
   async closeConnection(connection) {
@@ -1522,7 +1546,7 @@ var TestConnection = class {
 };
 
 // packages/core/mesh/teleport/src/testing/test-extension.ts
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger2 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout3, Trigger as Trigger2 } from "@dxos/async";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
 import { schema as schema3 } from "@dxos/protocols";
@@ -1606,7 +1630,7 @@ var TestExtension = class {
     await this.open.wait({
       timeout: 1500
     });
-    const res = await asyncTimeout2(this._rpc.rpc.TestService.testCall({
+    const res = await asyncTimeout3(this._rpc.rpc.TestService.testCall({
       data: message
     }), 1500);
     invariant6(res.data === message, void 0, {
@@ -1899,4 +1923,4 @@ export {
   TestExtension,
   TestExtensionWithStreams
 };
-//# sourceMappingURL=chunk-HMQK4NR4.mjs.map
+//# sourceMappingURL=chunk-CZZOJEEL.mjs.map