@dxos/teleport 0.1.56-main.c19b7cd → 0.1.56-main.c277f68

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

@@ -115,7 +115,6 @@ var Framer = class {
         });
       },
       subscribe: (callback) => {
-        var _a;
         (0, import_invariant.invariant)(!this._messageCb, "Rpc port already has a message listener.", {
           F: __dxlog_file,
           L: 73,
@@ -126,7 +125,7 @@ var Framer = class {
           ]
         });
         this._messageCb = callback;
-        (_a = this._subscribeCb) == null ? void 0 : _a.call(this);
+        this._subscribeCb?.();
         return () => {
           this._messageCb = void 0;
         };
@@ -315,16 +314,15 @@ var Balancer = class {
     return chunk;
   }
   async _sendChunks() {
-    var _a, _b;
     if (this._sendBuffers.size === 0) {
       return;
     }
     const chunk = this._getNextChunk();
     try {
       await this._framer.port.send(chunk.msg);
-      (_a = chunk.trigger) == null ? void 0 : _a.wake();
+      chunk.trigger?.wake();
     } catch (err) {
-      (_b = chunk.trigger) == null ? void 0 : _b.throw(err);
+      chunk.trigger?.throw(err);
     }
     await this._sendChunks();
   }
@@ -374,6 +372,7 @@ var Muxer = class {
     this.close = new import_async2.Event();
     this.statsUpdated = new import_async2.Event();
     this.stream = this._balancer.stream;
+    this._lastChannelStats = /* @__PURE__ */ new Map();
     this._balancer.incomingData.on(async (msg) => {
       await this._handleCommand(Command.decode(msg));
     });
@@ -392,7 +391,7 @@ var Muxer = class {
     });
     (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 91,
+      L: 131,
       S: this,
       A: [
         "!channel.push",
@@ -440,7 +439,7 @@ var Muxer = class {
     });
     (0, import_invariant2.invariant)(!channel.push, `Channel already open: ${tag}`, {
       F: __dxlog_file3,
-      L: 143,
+      L: 183,
       S: this,
       A: [
         "!channel.push",
@@ -464,7 +463,7 @@ var Muxer = class {
       subscribe: (cb) => {
         (0, import_invariant2.invariant)(!callback, "Only one subscriber is allowed", {
           F: __dxlog_file3,
-          L: 165,
+          L: 205,
           S: this,
           A: [
             "!callback",
@@ -502,7 +501,7 @@ var Muxer = class {
     this._destroying = true;
     this._sendCommand({
       destroy: {
-        error: err == null ? void 0 : err.message
+        error: err?.message
       }
     }, SYSTEM_CHANNEL_ID).then(() => {
       this._dispose();
@@ -512,26 +511,24 @@ var Muxer = class {
     void this._ctx.dispose();
   }
   _dispose(err) {
-    var _a;
     if (this._destroyed) {
       return;
     }
     this._destroyed = true;
     this._balancer.destroy();
     for (const channel of this._channelsByTag.values()) {
-      (_a = channel.destroy) == null ? void 0 : _a.call(channel, err);
+      channel.destroy?.(err);
     }
     this.close.emit(err);
     this._channelsByLocalId.clear();
     this._channelsByTag.clear();
   }
   async _handleCommand(cmd) {
-    var _a;
     (0, import_log2.log)("Received command", {
       cmd
     }, {
       F: __dxlog_file3,
-      L: 240,
+      L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -543,7 +540,7 @@ var Muxer = class {
         cmd
       }, {
         F: __dxlog_file3,
-        L: 247,
+        L: 287,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -565,13 +562,13 @@ var Muxer = class {
       }
       channel.buffer = [];
     } else if (cmd.data) {
-      const stream = (_a = this._channelsByLocalId.get(cmd.data.channelId)) != null ? _a : (0, import_debug.failUndefined)();
+      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", {
           tag: stream.tag
         }, {
           F: __dxlog_file3,
-          L: 274,
+          L: 314,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -620,7 +617,7 @@ var Muxer = class {
         threshold: MAX_SAFE_FRAME_SIZE
       }, {
         F: __dxlog_file3,
-        L: 318,
+        L: 359,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -646,21 +643,40 @@ var Muxer = class {
   }
   async _emitStats() {
     if (this._destroyed || this._destroying) {
+      this._lastStats = void 0;
+      this._lastChannelStats.clear();
       return;
     }
     const bytesSent = this._balancer.bytesSent;
     const bytesReceived = this._balancer.bytesReceived;
-    this.statsUpdated.emit({
-      channels: Array.from(this._channelsByTag.values()).map((channel) => ({
-        id: channel.id,
-        tag: channel.tag,
-        contentType: channel.contentType,
-        bytesSent: channel.stats.bytesSent,
-        bytesReceived: channel.stats.bytesReceived
-      })),
+    const now = Date.now();
+    const interval = this._lastStats ? (now - this._lastStats.timestamp) / 1e3 : 0;
+    const calculateThroughput = (current, last) => last ? {
+      bytesSentRate: interval ? (current.bytesSent - last.bytesSent) / interval : void 0,
+      bytesReceivedRate: interval ? (current.bytesReceived - last.bytesReceived) / interval : void 0
+    } : {};
+    this._lastStats = {
+      timestamp: now,
+      channels: Array.from(this._channelsByTag.values()).map((channel) => {
+        const stats = {
+          id: channel.id,
+          tag: channel.tag,
+          contentType: channel.contentType,
+          bytesSent: channel.stats.bytesSent,
+          bytesReceived: channel.stats.bytesReceived,
+          ...calculateThroughput(channel.stats, this._lastChannelStats.get(channel.id))
+        };
+        this._lastChannelStats.set(channel.id, stats);
+        return stats;
+      }),
       bytesSent,
-      bytesReceived
-    });
+      bytesReceived,
+      ...calculateThroughput({
+        bytesSent,
+        bytesReceived
+      }, this._lastStats)
+    };
+    this.statsUpdated.emit(this._lastStats);
   }
 };
 
@@ -776,11 +792,13 @@ var Teleport = class {
         localPeerId,
         remotePeerId,
         bytesSent: stats.bytesSent,
+        bytesSentRate: stats.bytesSentRate,
         bytesReceived: stats.bytesReceived,
+        bytesReceivedRate: stats.bytesReceivedRate,
         channels: stats.channels
       }, {
         F: __dxlog_file4,
-        L: 88,
+        L: 89,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -814,7 +832,7 @@ var Teleport = class {
       } catch (err2) {
         import_log3.log.catch(err2, void 0, {
           F: __dxlog_file4,
-          L: 132,
+          L: 137,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -830,7 +848,7 @@ var Teleport = class {
       name
     }, {
       F: __dxlog_file4,
-      L: 144,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -854,7 +872,7 @@ var Teleport = class {
   _setExtension(extensionName, extension) {
     (0, import_invariant3.invariant)(!extensionName.includes("/"), "Invalid extension name", {
       F: __dxlog_file4,
-      L: 168,
+      L: 173,
       S: this,
       A: [
         "!extensionName.includes('/')",
@@ -863,7 +881,7 @@ var Teleport = class {
     });
     (0, import_invariant3.invariant)(!this._extensions.has(extensionName), "Extension already exists", {
       F: __dxlog_file4,
-      L: 169,
+      L: 174,
       S: this,
       A: [
         "!this._extensions.has(extensionName)",
@@ -873,16 +891,15 @@ var Teleport = class {
     this._extensions.set(extensionName, extension);
   }
   async _openExtension(extensionName) {
-    var _a;
     (0, import_log3.log)("open extension", {
       extensionName
     }, {
       F: __dxlog_file4,
-      L: 174,
+      L: 179,
       S: this,
       C: (f, a) => f(...a)
     });
-    const extension = (_a = this._extensions.get(extensionName)) != null ? _a : (0, import_debug2.failUndefined)();
+    const extension = this._extensions.get(extensionName) ?? (0, import_debug2.failUndefined)();
     const context = {
       initiator: this.initiator,
       localPeerId: this.localPeerId,
@@ -890,7 +907,7 @@ var Teleport = class {
       createPort: async (channelName, opts) => {
         (0, import_invariant3.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
-          L: 182,
+          L: 187,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -902,7 +919,7 @@ var Teleport = class {
       createStream: async (channelName, opts) => {
         (0, import_invariant3.invariant)(!channelName.includes("/"), "Invalid channel name", {
           F: __dxlog_file4,
-          L: 186,
+          L: 191,
           S: this,
           A: [
             "!channelName.includes('/')",
@@ -922,7 +939,7 @@ var Teleport = class {
       extensionName
     }, {
       F: __dxlog_file4,
-      L: 197,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1198,11 +1215,9 @@ var TestExtension = class {
     this.closed = new import_async4.Trigger();
   }
   get remotePeerId() {
-    var _a;
-    return (_a = this.extensionContext) == null ? void 0 : _a.remotePeerId;
+    return this.extensionContext?.remotePeerId;
   }
   async onOpen(context) {
-    var _a, _b;
     (0, import_log5.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
@@ -1237,11 +1252,10 @@ var TestExtension = class {
       timeout: 2e3
     });
     await this._rpc.open();
-    await ((_b = (_a = this.callbacks).onOpen) == null ? void 0 : _b.call(_a));
+    await this.callbacks.onOpen?.();
     this.open.wake();
   }
   async onClose(err) {
-    var _a, _b, _c;
     (0, import_log5.log)("onClose", {
       err
     }, {
@@ -1250,9 +1264,9 @@ var TestExtension = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = (_a = this.callbacks).onClose) == null ? void 0 : _b.call(_a));
+    await this.callbacks.onClose?.();
     this.closed.wake();
-    await ((_c = this._rpc) == null ? void 0 : _c.close());
+    await this._rpc?.close();
   }
   async test(message = "test") {
     await this.open.wait({
@@ -1275,8 +1289,7 @@ var TestExtension = class {
   * Force-close the connection.
   */
   async closeConnection(err) {
-    var _a;
-    (_a = this.extensionContext) == null ? void 0 : _a.close(err);
+    this.extensionContext?.close(err);
   }
 };
 
@@ -1296,8 +1309,7 @@ var TestExtensionWithStreams = class {
     this._streams = /* @__PURE__ */ new Map();
   }
   get remotePeerId() {
-    var _a;
-    return (_a = this.extensionContext) == null ? void 0 : _a.remotePeerId;
+    return this.extensionContext?.remotePeerId;
   }
   async _openStream(streamTag, interval = 5, chunkSize = 2048) {
     (0, import_invariant6.invariant)(!this._streams.has(streamTag), `Stream already exists: ${streamTag}`, {
@@ -1348,7 +1360,6 @@ var TestExtensionWithStreams = class {
       networkStream.removeAllListeners();
     });
     streamEntry.reportingTimer = setInterval(() => {
-      var _a, _b;
       const { bytesSent, bytesReceived, sendErrors, receiveErrors } = streamEntry;
       import_log6.log.trace("dxos.test.stream-stats", {
         streamTag,
@@ -1356,8 +1367,8 @@ var TestExtensionWithStreams = class {
         bytesReceived,
         sendErrors,
         receiveErrors,
-        from: (_a = this.extensionContext) == null ? void 0 : _a.localPeerId,
-        to: (_b = this.extensionContext) == null ? void 0 : _b.remotePeerId
+        from: this.extensionContext?.localPeerId,
+        to: this.extensionContext?.remotePeerId
       }, {
         F: __dxlog_file7,
         L: 91,
@@ -1387,11 +1398,10 @@ var TestExtensionWithStreams = class {
       bytesReceived,
       sendErrors,
       receiveErrors,
-      runningTime: Date.now() - (startTimestamp != null ? startTimestamp : 0)
+      runningTime: Date.now() - (startTimestamp ?? 0)
     };
   }
   async onOpen(context) {
-    var _a, _b;
     (0, import_log6.log)("onOpen", {
       localPeerId: context.localPeerId,
       remotePeerId: context.remotePeerId
@@ -1438,11 +1448,10 @@ var TestExtensionWithStreams = class {
       timeout: 2e3
     });
     await this._rpc.open();
-    await ((_b = (_a = this.callbacks).onOpen) == null ? void 0 : _b.call(_a));
+    await this.callbacks.onOpen?.();
     this.open.wake();
   }
   async onClose(err) {
-    var _a, _b, _c;
     (0, import_log6.log)("onClose", {
       err
     }, {
@@ -1451,7 +1460,7 @@ var TestExtensionWithStreams = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await ((_b = (_a = this.callbacks).onClose) == null ? void 0 : _b.call(_a));
+    await this.callbacks.onClose?.();
     this.closed.wake();
     for (const [streamTag, stream] of Object.entries(this._streams)) {
       (0, import_log6.log)("closing stream", {
@@ -1465,7 +1474,7 @@ var TestExtensionWithStreams = class {
       clearTimeout(stream.interval);
       stream.networkStream.destroy();
     }
-    await ((_c = this._rpc) == null ? void 0 : _c.close());
+    await this._rpc?.close();
   }
   async addNewStream(streamLoadInterval, streamLoadChunkSize, streamTag) {
     await this.open.wait({
@@ -1526,8 +1535,7 @@ var TestExtensionWithStreams = class {
   * Force-close the connection.
   */
   async closeConnection(err) {
-    var _a;
-    (_a = this.extensionContext) == null ? void 0 : _a.close(err);
+    this.extensionContext?.close(err);
   }
 };
 // Annotate the CommonJS export names for ESM import in node: