@observertc/observer-js 1.3.0-rc.4 → 1.3.0-rc.6

package/dist/index.mjs

@@ -1778,19 +1778,17 @@ function isPublicIpAddress(address) {
 
 // src/ObservedOutboundTrack.ts
 var ObservedOutboundTrack = class {
-  constructor(timestamp, id, kind, _peerConnection, _outboundRtps, _mediaSource) {
+  constructor(timestamp, id, kind, _peerConnection, _mediaSource) {
     this.timestamp = timestamp;
     this.id = id;
     this.kind = kind;
     this._peerConnection = _peerConnection;
-    this._outboundRtps = _outboundRtps;
     this._mediaSource = _mediaSource;
   }
   timestamp;
   id;
   kind;
   _peerConnection;
-  _outboundRtps;
   _mediaSource;
   _visited = false;
   appData;
@@ -1841,8 +1839,11 @@ var ObservedOutboundTrack = class {
   getPeerConnection() {
     return this._peerConnection;
   }
+  /** The outbound RTPs of this track's media source, looked up on every call. */
   getOutboundRtps() {
-    return this._outboundRtps;
+    const mediaSource = this._mediaSource;
+    if (!mediaSource) return void 0;
+    return [...this._peerConnection.observedOutboundRtps.values()].filter((rtp) => rtp.mediaSourceId === mediaSource.id);
   }
   getMediaSource() {
     return this._mediaSource;
@@ -1861,7 +1862,7 @@ var ObservedOutboundTrack = class {
     this.remoteFractionLost = void 0;
     this.remoteRttInMs = void 0;
     this.qualityLimitationReason = void 0;
-    for (const rtp of this._outboundRtps ?? []) {
+    for (const rtp of this.getOutboundRtps() ?? []) {
       this.bitrate = (this.bitrate ?? 0) + rtp.bitrate;
       this.deltaPacketsSent = (this.deltaPacketsSent ?? 0) + rtp.deltaPacketsSent;
       if (rtp.remoteFractionLost !== void 0) {
@@ -2526,9 +2527,7 @@ var ObservedPeerConnection = class extends EventEmitter2 {
     }
     for (const observedOutboundTrack of [...this.observedOutboundTracks.values()]) {
       if (observedOutboundTrack.visited) continue;
-      this.observedOutboundTracks.delete(observedOutboundTrack.id);
-      this.emit("removed-outbound-track", observedOutboundTrack);
-      this._notify("outbound-track-removed", { ...this.eventScope, observedOutboundTrack });
+      this._removeOutboundTrack(observedOutboundTrack);
     }
     for (const observedPeerConnectionTransport of [...this.observedPeerConnectionTransports.values()]) {
       if (observedPeerConnectionTransport.visited) continue;
@@ -2789,6 +2788,11 @@ var ObservedPeerConnection = class extends EventEmitter2 {
   }
   _updateOutboundTrackSample(stats) {
     let observedOutboundTrack = this.observedOutboundTracks.get(stats.id);
+    const mediaSource = [...this.observedMediaSources.values()].filter((source) => source.trackIdentifier === stats.id).pop();
+    if (observedOutboundTrack && observedOutboundTrack.getMediaSource() !== mediaSource) {
+      this._removeOutboundTrack(observedOutboundTrack);
+      observedOutboundTrack = void 0;
+    }
     if (!observedOutboundTrack) {
       if (!stats.timestamp || !stats.id || !stats.kind) {
         return logger3.warn(
@@ -2796,15 +2800,12 @@ var ObservedPeerConnection = class extends EventEmitter2 {
           stats
         );
       }
-      const observedMediaSource = [...this.observedMediaSources.values()].find((mediaSource) => mediaSource.trackIdentifier === stats.id);
-      const outboundRtps = observedMediaSource ? [...this.observedOutboundRtps.values()].filter((outboundRtp) => outboundRtp.mediaSourceId === observedMediaSource?.id) : void 0;
       observedOutboundTrack = new ObservedOutboundTrack(
         stats.timestamp,
         stats.id,
         stats.kind,
         this,
-        outboundRtps,
-        observedMediaSource
+        mediaSource
       );
       observedOutboundTrack.update(stats);
       this.observedOutboundTracks.set(stats.id, observedOutboundTrack);
@@ -2815,6 +2816,11 @@ var ObservedPeerConnection = class extends EventEmitter2 {
     this._notify("outbound-track-updated", { ...this.eventScope, observedOutboundTrack });
     return observedOutboundTrack;
   }
+  _removeOutboundTrack(observedOutboundTrack) {
+    this.observedOutboundTracks.delete(observedOutboundTrack.id);
+    this.emit("removed-outbound-track", observedOutboundTrack);
+    this._notify("outbound-track-removed", { ...this.eventScope, observedOutboundTrack });
+  }
   _updatePeerConnectionTransportStats(stats) {
     let observedPeerConnectionTransport = this.observedPeerConnectionTransports.get(stats.id);
     if (!observedPeerConnectionTransport) {
@@ -7979,9 +7985,96 @@ var TrendTester = class {
   }
 };
 
-// src/sinks/InMemorySink.ts
+// src/sinks/RollingJsonlFileSink.ts
+import * as fs2 from "fs";
 import { EventEmitter as EventEmitter8 } from "events";
-var InMemorySink = class extends EventEmitter8 {
+var RollingJsonlFileSink = class extends EventEmitter8 {
+  id;
+  _options;
+  _serializeSample;
+  _stream;
+  _path;
+  _index = -1;
+  _openedAt = 0;
+  _bytes = 0;
+  _ended = false;
+  // Resolves once every file closed so far has closed and been announced, in index order: the
+  // streams close independently, so a later file could otherwise be announced before an earlier one.
+  _closing = Promise.resolve();
+  constructor(options) {
+    super();
+    this._options = options;
+    this._serializeSample = options.serializeSample ?? ((record) => JSON.stringify(record));
+    this._open();
+    this.id = options.id ?? this._path;
+  }
+  /** The file currently written to. */
+  get path() {
+    return this._path;
+  }
+  /** The index of the file currently written to. */
+  get index() {
+    return this._index;
+  }
+  get ended() {
+    return this._ended;
+  }
+  write(record) {
+    if (this._ended) return false;
+    const line = `${this._serializeSample(record)}
+`;
+    const bytes = Buffer.byteLength(line);
+    const { maxBytes, maxAgeMs } = this._options;
+    if (maxAgeMs !== void 0 && maxAgeMs <= Date.now() - this._openedAt) this.roll();
+    if (maxBytes !== void 0 && maxBytes < this._bytes + bytes) this.roll();
+    this._bytes += bytes;
+    return this._stream.write(line);
+  }
+  /** Close the current file and continue in a new one. A no-op on an empty file or an ended sink. */
+  roll() {
+    if (this._ended || this._bytes === 0) return;
+    this._closeCurrent();
+    this._open();
+  }
+  /** No more writes: emits `ended`, closes the current file (`file-closed`), then emits `close`. */
+  end() {
+    if (this._ended) return;
+    this._ended = true;
+    this.emit("ended");
+    this._closeCurrent();
+    void this._closing.then(() => {
+      this.emit("finish");
+      this.emit("close");
+    });
+  }
+  _open() {
+    ++this._index;
+    this._openedAt = Date.now();
+    this._bytes = 0;
+    this._path = this._options.path({ index: this._index, openedAt: this._openedAt });
+    const stream = fs2.createWriteStream(this._path, { flags: "a" });
+    stream.on("drain", () => this.emit("drain"));
+    stream.on("error", (err) => this.emit("error", err));
+    this._stream = stream;
+  }
+  _closeCurrent() {
+    const stream = this._stream;
+    const path = this._path;
+    const index = this._index;
+    const closed = new Promise((resolve) => {
+      stream.once("close", () => resolve());
+      stream.once("error", () => resolve());
+    });
+    this._closing = Promise.all([this._closing, closed]).then(() => {
+      this.emit("file-closed", path, index);
+    });
+    stream.end();
+  }
+};
+
+// src/sinks/InMemorySink.ts
+import { EventEmitter as EventEmitter9 } from "events";
+var InMemorySink = class extends EventEmitter9 {
   id;
   samples;
   _ended = false;
@@ -8044,6 +8137,7 @@ var RemoteTrackResolver = class {
       observer.off("outbound-track-updated", onOutboundUpdated);
       this._pendingInboundTracks.clear();
       this._pendingOutboundTracks.clear();
+      this._outboundTrackPublisherIds.clear();
     });
     observer.on("inbound-track-added", onInboundAdded);
     observer.on("inbound-track-removed", onInboundRemoved);
@@ -8055,6 +8149,8 @@ var RemoteTrackResolver = class {
   observedCall;
   resolvers;
   _publisherIdToOutboundTrack = /* @__PURE__ */ new Map();
+  // The publisher id each outbound track was indexed under, so removal does not depend on its current attachments.
+  _outboundTrackPublisherIds = /* @__PURE__ */ new Map();
   _subscriberIdToInboundTrack = /* @__PURE__ */ new Map();
   /**
    * Tracks whose publisher id the strategy could not resolve **yet**.
@@ -8130,6 +8226,7 @@ var RemoteTrackResolver = class {
     }
     this._pendingOutboundTracks.delete(outboundTrack);
     this._publisherIdToOutboundTrack.set(publisherId, outboundTrack);
+    this._outboundTrackPublisherIds.set(outboundTrack, publisherId);
     this.observedCall.unconsumedOutboundTracks.add(outboundTrack);
     for (const observedClient of this.observedCall.observedClients.values()) {
       for (const observedPeerConnection of observedClient.observedPeerConnections.values()) {
@@ -8144,7 +8241,8 @@ var RemoteTrackResolver = class {
   }
   _removeOutboundTrack(outboundTrack) {
     this._pendingOutboundTracks.delete(outboundTrack);
-    const publisherId = this.resolvers.resolveOutboundTrackPublisherId(outboundTrack);
+    const publisherId = this._outboundTrackPublisherIds.get(outboundTrack);
+    this._outboundTrackPublisherIds.delete(outboundTrack);
     if (publisherId && this._publisherIdToOutboundTrack.get(publisherId) === outboundTrack) {
       this._publisherIdToOutboundTrack.delete(publisherId);
     }
@@ -8236,6 +8334,7 @@ export {
   RTT_HISTOGRAM_NUMBER_OF_BUCKETS,
   RemoteTrackResolver,
   RemoteTrackResolverValidator,
+  RollingJsonlFileSink,
   SCORE_HISTOGRAM_BUCKET_WIDTH,
   SCORE_HISTOGRAM_NUMBER_OF_BUCKETS,
   SfuCongestionDetector,