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

package/dist/index.d.mts

@@ -2196,7 +2196,6 @@ declare class ObservedOutboundTrack implements OutboundTrackSample {
     readonly id: string;
     readonly kind: MediaKind;
     private readonly _peerConnection;
-    private readonly _outboundRtps?;
     private readonly _mediaSource?;
     private _visited;
     appData?: Record<string, unknown>;
@@ -2228,11 +2227,12 @@ declare class ObservedOutboundTrack implements OutboundTrackSample {
      * latest tick. Needs a `RemoteTrackResolver`: without links there are no receivers to ask.
      */
     receivedRmsAudioLevel?: number;
-    constructor(timestamp: number, id: string, kind: MediaKind, _peerConnection: ObservedPeerConnection, _outboundRtps?: ObservedOutboundRtp[] | undefined, _mediaSource?: ObservedMediaSource | undefined);
+    constructor(timestamp: number, id: string, kind: MediaKind, _peerConnection: ObservedPeerConnection, _mediaSource?: ObservedMediaSource | undefined);
     get score(): number | undefined;
     get visited(): boolean;
     get degraded(): boolean;
     getPeerConnection(): ObservedPeerConnection;
+    /** The outbound RTPs of this track's media source, looked up on every call. */
     getOutboundRtps(): ObservedOutboundRtp[] | undefined;
     getMediaSource(): ObservedMediaSource | undefined;
     /** The capture device behind this track, when the client sent `AUDIO_INPUT_DEVICE` metadata for it. */
@@ -2695,6 +2695,7 @@ declare class ObservedPeerConnection extends EventEmitter {
     private _updateMediaSourceStats;
     private _updateOutboundRtpStats;
     private _updateOutboundTrackSample;
+    private _removeOutboundTrack;
     private _updatePeerConnectionTransportStats;
     private _updateRemoteInboundRtpStats;
     private _updateRemoteOutboundRtpStats;
@@ -4096,6 +4097,7 @@ declare class RemoteTrackResolver {
     readonly observedCall: ObservedCall;
     private readonly resolvers;
     private readonly _publisherIdToOutboundTrack;
+    private readonly _outboundTrackPublisherIds;
     private readonly _subscriberIdToInboundTrack;
     /**
      * Tracks whose publisher id the strategy could not resolve **yet**.

package/dist/index.d.ts

@@ -2196,7 +2196,6 @@ declare class ObservedOutboundTrack implements OutboundTrackSample {
     readonly id: string;
     readonly kind: MediaKind;
     private readonly _peerConnection;
-    private readonly _outboundRtps?;
     private readonly _mediaSource?;
     private _visited;
     appData?: Record<string, unknown>;
@@ -2228,11 +2227,12 @@ declare class ObservedOutboundTrack implements OutboundTrackSample {
      * latest tick. Needs a `RemoteTrackResolver`: without links there are no receivers to ask.
      */
     receivedRmsAudioLevel?: number;
-    constructor(timestamp: number, id: string, kind: MediaKind, _peerConnection: ObservedPeerConnection, _outboundRtps?: ObservedOutboundRtp[] | undefined, _mediaSource?: ObservedMediaSource | undefined);
+    constructor(timestamp: number, id: string, kind: MediaKind, _peerConnection: ObservedPeerConnection, _mediaSource?: ObservedMediaSource | undefined);
     get score(): number | undefined;
     get visited(): boolean;
     get degraded(): boolean;
     getPeerConnection(): ObservedPeerConnection;
+    /** The outbound RTPs of this track's media source, looked up on every call. */
     getOutboundRtps(): ObservedOutboundRtp[] | undefined;
     getMediaSource(): ObservedMediaSource | undefined;
     /** The capture device behind this track, when the client sent `AUDIO_INPUT_DEVICE` metadata for it. */
@@ -2695,6 +2695,7 @@ declare class ObservedPeerConnection extends EventEmitter {
     private _updateMediaSourceStats;
     private _updateOutboundRtpStats;
     private _updateOutboundTrackSample;
+    private _removeOutboundTrack;
     private _updatePeerConnectionTransportStats;
     private _updateRemoteInboundRtpStats;
     private _updateRemoteOutboundRtpStats;
@@ -4096,6 +4097,7 @@ declare class RemoteTrackResolver {
     readonly observedCall: ObservedCall;
     private readonly resolvers;
     private readonly _publisherIdToOutboundTrack;
+    private readonly _outboundTrackPublisherIds;
     private readonly _subscriberIdToInboundTrack;
     /**
      * Tracks whose publisher id the strategy could not resolve **yet**.

package/dist/index.js

@@ -1912,19 +1912,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;
@@ -1975,8 +1973,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;
@@ -1995,7 +1996,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) {
@@ -2660,9 +2661,7 @@ var ObservedPeerConnection = class extends import_node_events2.EventEmitter {
     }
     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;
@@ -2923,6 +2922,11 @@ var ObservedPeerConnection = class extends import_node_events2.EventEmitter {
   }
   _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(
@@ -2930,15 +2934,12 @@ var ObservedPeerConnection = class extends import_node_events2.EventEmitter {
           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);
@@ -2949,6 +2950,11 @@ var ObservedPeerConnection = class extends import_node_events2.EventEmitter {
     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) {
@@ -8178,6 +8184,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);
@@ -8189,6 +8196,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**.
@@ -8264,6 +8273,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()) {
@@ -8278,7 +8288,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);
     }