@dxos/teleport 0.3.8-next.f4e0086 → 0.3.9-main.14901ff

package/dist/lib/browser/{chunk-C7IP5EHF.mjs → chunk-M7U4KJA7.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
@@ -329,7 +329,7 @@ import { scheduleTaskInterval as scheduleTaskInterval2, Event as Event3, Trigger
 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",
@@ -601,7 +617,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({
@@ -630,7 +654,7 @@ var Muxer = class {
     });
     invariant3(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file4,
-      L: 192,
+      L: 211,
       S: this,
       A: [
         "!channel.push",
@@ -654,7 +678,7 @@ var Muxer = class {
       subscribe: (cb) => {
         invariant3(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file4,
-          L: 214,
+          L: 233,
           S: this,
           A: [
             "!callback",
@@ -687,7 +711,7 @@ var Muxer = class {
     if (this._destroying) {
       log4("already destroying, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 247,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -696,7 +720,7 @@ var Muxer = class {
     if (this._closing) {
       log4("already closing, ignoring graceful close request", void 0, {
         F: __dxlog_file4,
-        L: 251,
+        L: 270,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -712,11 +736,11 @@ 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) => {
@@ -725,7 +749,7 @@ var Muxer = class {
         }, GRACEFUL_CLOSE_TIMEOUT);
       }),
       (async () => {
-        await this.dispose(err);
+        await this._dispose(err);
       })()
     ]);
   }
@@ -734,7 +758,7 @@ var Muxer = class {
     if (this._destroying) {
       log4("already destroying, ignoring destroy request", void 0, {
         F: __dxlog_file4,
-        L: 287,
+        L: 307,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -745,7 +769,7 @@ var Muxer = class {
     if (this._closing) {
       log4("destroy cancelling graceful close", void 0, {
         F: __dxlog_file4,
-        L: 293,
+        L: 313,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -760,29 +784,29 @@ var Muxer = class {
           err: err2
         }, {
           F: __dxlog_file4,
-          L: 306,
+          L: 326,
           S: this,
           C: (f, a) => f(...a)
         });
       });
     }
-    this.dispose(err).catch((err2) => {
+    this._dispose(err).catch((err2) => {
       log4("error disposing after destroy", {
         err: err2
       }, {
         F: __dxlog_file4,
-        L: 311,
+        L: 331,
         S: this,
         C: (f, a) => f(...a)
       });
     });
   }
   // complete the termination, graceful or otherwise
-  async dispose(err) {
+  async _dispose(err) {
     if (this._disposed) {
       log4("already destroyed, ignoring dispose request", void 0, {
         F: __dxlog_file4,
-        L: 319,
+        L: 339,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -794,6 +818,7 @@ var Muxer = class {
       channel.destroy?.(err);
     }
     this._disposed = true;
+    await this._emitStats();
     this.afterClosed.emit(err);
     this._channelsByLocalId.clear();
     this._channelsByTag.clear();
@@ -804,7 +829,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 341,
+        L: 362,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -814,15 +839,15 @@ var Muxer = class {
       if (!this._closing) {
         log4("received peer close, initiating my own graceful close", void 0, {
           F: __dxlog_file4,
-          L: 347,
+          L: 368,
           S: this,
           C: (f, a) => f(...a)
         });
-        await this.close();
+        await this.close(new Error("received peer close"));
       } else {
         log4("received close from peer, already closing", void 0, {
           F: __dxlog_file4,
-          L: 350,
+          L: 371,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -851,7 +876,7 @@ var Muxer = class {
           tag: stream.tag
         }, {
           F: __dxlog_file4,
-          L: 379,
+          L: 400,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -866,7 +891,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file4,
-        L: 388,
+        L: 409,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -914,7 +939,7 @@ var Muxer = class {
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
         F: __dxlog_file4,
-        L: 429,
+        L: 450,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -940,7 +965,17 @@ var Muxer = class {
   }
   async _emitStats() {
     if (this._disposed || this._destroying) {
+      if (!this._lastStats) {
+        return;
+      }
+      const lastStats = this._lastStats;
       this._lastStats = void 0;
+      lastStats.readBufferSize = 0;
+      lastStats.writeBufferSize = 0;
+      for (const c of lastStats.channels) {
+        c.writeBufferSize = 0;
+      }
+      this.statsUpdated.emit(lastStats);
       this._lastChannelStats.clear();
       return;
     }
@@ -979,9 +1014,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);
@@ -1001,7 +1039,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)
           });
@@ -1016,7 +1054,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'",
@@ -1025,7 +1063,7 @@ var Teleport = class {
     });
     invariant4(PublicKey.isPublicKey(localPeerId), void 0, {
       F: __dxlog_file5,
-      L: 56,
+      L: 57,
       S: this,
       A: [
         "PublicKey.isPublicKey(localPeerId)",
@@ -1034,7 +1072,7 @@ var Teleport = class {
     });
     invariant4(PublicKey.isPublicKey(remotePeerId), void 0, {
       F: __dxlog_file5,
-      L: 57,
+      L: 58,
       S: this,
       A: [
         "PublicKey.isPublicKey(remotePeerId)",
@@ -1053,13 +1091,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)
         }));
@@ -1070,13 +1108,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)",
@@ -1097,7 +1135,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)
           });
@@ -1120,12 +1158,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;
   }
@@ -1135,10 +1176,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);
@@ -1158,7 +1207,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)
         });
@@ -1181,7 +1230,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)
         });
@@ -1197,7 +1246,7 @@ var Teleport = class {
       name
     }, {
       F: __dxlog_file5,
-      L: 198,
+      L: 209,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1221,7 +1270,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('/')",
@@ -1230,7 +1279,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)",
@@ -1244,7 +1293,7 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file5,
-      L: 228,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1256,7 +1305,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('/')",
@@ -1268,7 +1317,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('/')",
@@ -1288,16 +1337,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);
 
@@ -1444,7 +1496,7 @@ var TestPeer = class {
         ""
       ]
     });
-    await connection.teleport.open();
+    await connection.teleport.open(PublicKey2.random());
     await this.onOpen(connection);
   }
   async closeConnection(connection) {
@@ -1880,4 +1932,4 @@ export {
   TestExtension,
   TestExtensionWithStreams
 };
-//# sourceMappingURL=chunk-C7IP5EHF.mjs.map
+//# sourceMappingURL=chunk-M7U4KJA7.mjs.map