@observertc/observer-js 1.3.0-rc.3 → 1.3.0-rc.5

package/dist/index.mjs

@@ -178,11 +178,11 @@ var SinkRegistry = class {
   }
   /** End every sink of this registry and of its descendants. */
   clear() {
-    for (const sink of [...this._sinks.values()]) {
+    for (const [id, sink] of [...this._sinks.entries()]) {
       try {
         sink.end();
       } catch (err) {
-        logger.warn("Sink %s failed to end: %o", sink.id, err);
+        logger.warn("Sink %s failed to end: %o", id, err);
       }
     }
   }
@@ -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) {
@@ -3124,7 +3130,7 @@ var ObservedClient = class extends EventEmitter3 {
   /** The distinct `publicAddress`es currently known by this client's open peer connections. */
   /**
    * The sink this client's samples are written to: whatever is registered under its client id in
-   * `call.sinks` (the one `createClientSink` returned, or a sink the application added), if any.
+   * `call.sinks` (the one created through `saveClientSamples`, or a sink the application added), if any.
    */
   get sink() {
     return this.call.sinks.get(this.clientId);
@@ -5277,17 +5283,26 @@ var ObservedCall = class extends EventEmitter4 {
     if (!client.leftAt) return;
     this.endedAt = Math.max(this.endedAt ?? client.leftAt, client.leftAt);
   }
-  /** Emit an Observer-bus event scoped to this call. */
   _createClientSink(clientId) {
-    const createClientSink = this.observer.config.createClientSink;
-    if (!createClientSink) return void 0;
+    const config = this.observer.config.saveClientSamples;
+    if (!config || !config.jsonlPath && !config.sink) return void 0;
+    if (config.jsonlPath && config.sink) {
+      logger6.warn("saveClientSamples: give either jsonlPath or sink, not both; no client samples are saved");
+      return void 0;
+    }
     if (this.observer.sinks.get(clientId)) {
       logger6.warn("No sample sink for client %s in call %s: sink id %s is already in use", clientId, this.callId, clientId);
       return void 0;
     }
-    const destination = createClientSink({ id: clientId, observedCall: this, clientId });
-    return destination ? this.sinks.createFromDestination(clientId, destination) : void 0;
+    const params = { id: clientId, observedCall: this, clientId };
+    if (config.jsonlPath) {
+      const jsonlPath = config.jsonlPath(params);
+      return jsonlPath === void 0 ? void 0 : this.sinks.createFromDestination(clientId, { jsonlPath });
+    }
+    const sink = config.sink?.(params);
+    return sink ? this.sinks.createFromDestination(clientId, { sink }) : void 0;
   }
+  /** Emit an Observer-bus event scoped to this call. */
   _notify(type, ...args) {
     this.observer.emit(type, ...args);
   }
@@ -8035,6 +8050,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);
@@ -8046,6 +8062,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**.
@@ -8121,6 +8139,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()) {
@@ -8135,7 +8154,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);
     }