@whereby.com/media 8.2.2 → 8.2.4

package/dist/index.cjs

@@ -544,25 +544,22 @@ class Session {
             this.pc.addTrack(track, stream);
         });
     }
-    addTrack(track, stream) {
+    addTrack(track) {
         var _a;
         if (track.kind === "video" && ((_a = this._mediaPrefs) === null || _a === void 0 ? void 0 : _a.wantsVideo) === false) {
             return;
         }
-        if (!stream) {
-            stream = this.streams[0];
-        }
+        const stream = this.streams[0];
+        this._incrementAnalyticMetric("P2PSessionAddTrack");
+        rtcStats.sendEvent("P2PSessionAddTrack", {
+            trackId: track.id,
+            kind: track.kind,
+            hasSessionStream: !!stream,
+            trackOfSameKindInStream: !!(stream === null || stream === void 0 ? void 0 : stream.getTracks().filter((t) => t.kind === track.kind && t.id !== track.id).length),
+        });
         stream === null || stream === void 0 ? void 0 : stream.addTrack(track);
         this.pc.addTrack(track, stream);
     }
-    removeTrack(track) {
-        const stream = this.streams[0];
-        stream.removeTrack(track);
-        const sender = this.pc.getSenders().find((sender) => sender.track === track);
-        if (sender) {
-            this.pc.removeTrack(sender);
-        }
-    }
     removeStream(stream) {
         const streamIdIndex = this.streamIds.indexOf(stream.id);
         if (streamIdIndex !== -1) {
@@ -660,6 +657,7 @@ class Session {
         pc.oniceconnectionstatechange = null;
         pc.onicecandidate = null;
         pc.ontrack = null;
+        pc.onconnectionstatechange = null;
         try {
             pc.close();
         }
@@ -2543,7 +2541,8 @@ class P2pRtcManager {
             P2PMicNotWorking: 0,
             P2PLocalNetworkFailed: 0,
             P2PRelayedIceCandidate: 0,
-            P2PAddStoppedVideoTrack: 0,
+            P2PSessionAddTrack: 0,
+            P2PAddTrackToPeerConnections: 0,
         };
     }
     numberOfPeerconnections() {
@@ -3101,8 +3100,6 @@ class P2pRtcManager {
         }
         if (this._localCameraStream && !this._localCameraStream.getVideoTracks().length && this._stoppedVideoTrack) {
             pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
-            this.analytics.P2PAddStoppedVideoTrack++;
-            rtcStats.sendEvent("P2PAddStoppedVideoTrack", { trackId: this._stoppedVideoTrack.id });
         }
         return session;
     }
@@ -3126,9 +3123,15 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.addStream(stream));
         });
     }
-    _addTrackToPeerConnections(track, stream) {
+    _addTrackToPeerConnections(track) {
+        this.analytics.P2PAddTrackToPeerConnections++;
+        rtcStats.sendEvent("P2PAddTrackToPeerConnections", {
+            trackId: track.id,
+            kind: track.kind,
+            readyState: track.readyState,
+        });
         this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.addTrack(track, stream));
+            this._withForcedRenegotiation(session, () => session.addTrack(track));
         });
     }
     _replaceTrackToPeerConnections(oldTrack, newTrack) {
@@ -3164,11 +3167,6 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.removeStream(stream));
         });
     }
-    _removeTrackFromPeerConnections(track) {
-        this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.removeTrack(track));
-        });
-    }
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;

package/dist/index.d.cts

@@ -1294,8 +1294,7 @@ declare class Session {
     pendingReplaceTrackActions: (() => Promise<void>)[];
     constructor({ clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, incrementAnalyticMetric, mediaPrefs, }: P2PSessionOptions);
     addStream(stream: MediaStream): void;
-    addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
-    removeTrack(track: MediaStreamTrack): void;
+    addTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
     _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
     handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
@@ -1345,7 +1344,8 @@ type P2PAnalytics = {
     P2PMicNotWorking: number;
     P2PLocalNetworkFailed: number;
     P2PRelayedIceCandidate: number;
-    P2PAddStoppedVideoTrack: number;
+    P2PSessionAddTrack: number;
+    P2PAddTrackToPeerConnections: number;
 };
 type P2PAnalyticMetric = keyof P2PAnalytics;
 type P2PIncrementAnalyticMetric = (metric: P2PAnalyticMetric) => void;
@@ -1417,10 +1417,9 @@ declare class P2pRtcManager implements RtcManager {
     _cleanup(clientId: string): void;
     _forEachPeerConnection(func: any): void;
     _addStreamToPeerConnections(stream: MediaStream): void;
-    _addTrackToPeerConnections(track: MediaStreamTrack, stream?: MediaStream): void;
+    _addTrackToPeerConnections(track: MediaStreamTrack): void;
     _replaceTrackToPeerConnections(oldTrack: any, newTrack: any): Promise<void | any[]>;
     _removeStreamFromPeerConnections(stream: MediaStream): void;
-    _removeTrackFromPeerConnections(track: MediaStreamTrack): void;
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }: SignalMediaServerConfig): void;
     _clearMediaServersRefresh(): void;
     _monitorAudioTrack(track: MediaStreamTrack): void;

package/dist/index.d.mts

@@ -1294,8 +1294,7 @@ declare class Session {
     pendingReplaceTrackActions: (() => Promise<void>)[];
     constructor({ clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, incrementAnalyticMetric, mediaPrefs, }: P2PSessionOptions);
     addStream(stream: MediaStream): void;
-    addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
-    removeTrack(track: MediaStreamTrack): void;
+    addTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
     _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
     handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
@@ -1345,7 +1344,8 @@ type P2PAnalytics = {
     P2PMicNotWorking: number;
     P2PLocalNetworkFailed: number;
     P2PRelayedIceCandidate: number;
-    P2PAddStoppedVideoTrack: number;
+    P2PSessionAddTrack: number;
+    P2PAddTrackToPeerConnections: number;
 };
 type P2PAnalyticMetric = keyof P2PAnalytics;
 type P2PIncrementAnalyticMetric = (metric: P2PAnalyticMetric) => void;
@@ -1417,10 +1417,9 @@ declare class P2pRtcManager implements RtcManager {
     _cleanup(clientId: string): void;
     _forEachPeerConnection(func: any): void;
     _addStreamToPeerConnections(stream: MediaStream): void;
-    _addTrackToPeerConnections(track: MediaStreamTrack, stream?: MediaStream): void;
+    _addTrackToPeerConnections(track: MediaStreamTrack): void;
     _replaceTrackToPeerConnections(oldTrack: any, newTrack: any): Promise<void | any[]>;
     _removeStreamFromPeerConnections(stream: MediaStream): void;
-    _removeTrackFromPeerConnections(track: MediaStreamTrack): void;
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }: SignalMediaServerConfig): void;
     _clearMediaServersRefresh(): void;
     _monitorAudioTrack(track: MediaStreamTrack): void;

package/dist/index.d.ts

@@ -1294,8 +1294,7 @@ declare class Session {
     pendingReplaceTrackActions: (() => Promise<void>)[];
     constructor({ clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, incrementAnalyticMetric, mediaPrefs, }: P2PSessionOptions);
     addStream(stream: MediaStream): void;
-    addTrack(track: MediaStreamTrack, stream?: MediaStream): void;
-    removeTrack(track: MediaStreamTrack): void;
+    addTrack(track: MediaStreamTrack): void;
     removeStream(stream: MediaStream): void;
     _setRemoteDescription(desc: SignalRTCSessionDescription): Promise<void>;
     handleOffer(offer: SignalRTCSessionDescription): Promise<SignalRTCSessionDescription>;
@@ -1345,7 +1344,8 @@ type P2PAnalytics = {
     P2PMicNotWorking: number;
     P2PLocalNetworkFailed: number;
     P2PRelayedIceCandidate: number;
-    P2PAddStoppedVideoTrack: number;
+    P2PSessionAddTrack: number;
+    P2PAddTrackToPeerConnections: number;
 };
 type P2PAnalyticMetric = keyof P2PAnalytics;
 type P2PIncrementAnalyticMetric = (metric: P2PAnalyticMetric) => void;
@@ -1417,10 +1417,9 @@ declare class P2pRtcManager implements RtcManager {
     _cleanup(clientId: string): void;
     _forEachPeerConnection(func: any): void;
     _addStreamToPeerConnections(stream: MediaStream): void;
-    _addTrackToPeerConnections(track: MediaStreamTrack, stream?: MediaStream): void;
+    _addTrackToPeerConnections(track: MediaStreamTrack): void;
     _replaceTrackToPeerConnections(oldTrack: any, newTrack: any): Promise<void | any[]>;
     _removeStreamFromPeerConnections(stream: MediaStream): void;
-    _removeTrackFromPeerConnections(track: MediaStreamTrack): void;
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }: SignalMediaServerConfig): void;
     _clearMediaServersRefresh(): void;
     _monitorAudioTrack(track: MediaStreamTrack): void;

package/dist/index.mjs

@@ -523,25 +523,22 @@ class Session {
             this.pc.addTrack(track, stream);
         });
     }
-    addTrack(track, stream) {
+    addTrack(track) {
         var _a;
         if (track.kind === "video" && ((_a = this._mediaPrefs) === null || _a === void 0 ? void 0 : _a.wantsVideo) === false) {
             return;
         }
-        if (!stream) {
-            stream = this.streams[0];
-        }
+        const stream = this.streams[0];
+        this._incrementAnalyticMetric("P2PSessionAddTrack");
+        rtcStats.sendEvent("P2PSessionAddTrack", {
+            trackId: track.id,
+            kind: track.kind,
+            hasSessionStream: !!stream,
+            trackOfSameKindInStream: !!(stream === null || stream === void 0 ? void 0 : stream.getTracks().filter((t) => t.kind === track.kind && t.id !== track.id).length),
+        });
         stream === null || stream === void 0 ? void 0 : stream.addTrack(track);
         this.pc.addTrack(track, stream);
     }
-    removeTrack(track) {
-        const stream = this.streams[0];
-        stream.removeTrack(track);
-        const sender = this.pc.getSenders().find((sender) => sender.track === track);
-        if (sender) {
-            this.pc.removeTrack(sender);
-        }
-    }
     removeStream(stream) {
         const streamIdIndex = this.streamIds.indexOf(stream.id);
         if (streamIdIndex !== -1) {
@@ -639,6 +636,7 @@ class Session {
         pc.oniceconnectionstatechange = null;
         pc.onicecandidate = null;
         pc.ontrack = null;
+        pc.onconnectionstatechange = null;
         try {
             pc.close();
         }
@@ -2522,7 +2520,8 @@ class P2pRtcManager {
             P2PMicNotWorking: 0,
             P2PLocalNetworkFailed: 0,
             P2PRelayedIceCandidate: 0,
-            P2PAddStoppedVideoTrack: 0,
+            P2PSessionAddTrack: 0,
+            P2PAddTrackToPeerConnections: 0,
         };
     }
     numberOfPeerconnections() {
@@ -3080,8 +3079,6 @@ class P2pRtcManager {
         }
         if (this._localCameraStream && !this._localCameraStream.getVideoTracks().length && this._stoppedVideoTrack) {
             pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
-            this.analytics.P2PAddStoppedVideoTrack++;
-            rtcStats.sendEvent("P2PAddStoppedVideoTrack", { trackId: this._stoppedVideoTrack.id });
         }
         return session;
     }
@@ -3105,9 +3102,15 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.addStream(stream));
         });
     }
-    _addTrackToPeerConnections(track, stream) {
+    _addTrackToPeerConnections(track) {
+        this.analytics.P2PAddTrackToPeerConnections++;
+        rtcStats.sendEvent("P2PAddTrackToPeerConnections", {
+            trackId: track.id,
+            kind: track.kind,
+            readyState: track.readyState,
+        });
         this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.addTrack(track, stream));
+            this._withForcedRenegotiation(session, () => session.addTrack(track));
         });
     }
     _replaceTrackToPeerConnections(oldTrack, newTrack) {
@@ -3143,11 +3146,6 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.removeStream(stream));
         });
     }
-    _removeTrackFromPeerConnections(track) {
-        this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.removeTrack(track));
-        });
-    }
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;

package/dist/legacy-esm.js

@@ -523,25 +523,22 @@ class Session {
             this.pc.addTrack(track, stream);
         });
     }
-    addTrack(track, stream) {
+    addTrack(track) {
         var _a;
         if (track.kind === "video" && ((_a = this._mediaPrefs) === null || _a === void 0 ? void 0 : _a.wantsVideo) === false) {
             return;
         }
-        if (!stream) {
-            stream = this.streams[0];
-        }
+        const stream = this.streams[0];
+        this._incrementAnalyticMetric("P2PSessionAddTrack");
+        rtcStats.sendEvent("P2PSessionAddTrack", {
+            trackId: track.id,
+            kind: track.kind,
+            hasSessionStream: !!stream,
+            trackOfSameKindInStream: !!(stream === null || stream === void 0 ? void 0 : stream.getTracks().filter((t) => t.kind === track.kind && t.id !== track.id).length),
+        });
         stream === null || stream === void 0 ? void 0 : stream.addTrack(track);
         this.pc.addTrack(track, stream);
     }
-    removeTrack(track) {
-        const stream = this.streams[0];
-        stream.removeTrack(track);
-        const sender = this.pc.getSenders().find((sender) => sender.track === track);
-        if (sender) {
-            this.pc.removeTrack(sender);
-        }
-    }
     removeStream(stream) {
         const streamIdIndex = this.streamIds.indexOf(stream.id);
         if (streamIdIndex !== -1) {
@@ -639,6 +636,7 @@ class Session {
         pc.oniceconnectionstatechange = null;
         pc.onicecandidate = null;
         pc.ontrack = null;
+        pc.onconnectionstatechange = null;
         try {
             pc.close();
         }
@@ -2522,7 +2520,8 @@ class P2pRtcManager {
             P2PMicNotWorking: 0,
             P2PLocalNetworkFailed: 0,
             P2PRelayedIceCandidate: 0,
-            P2PAddStoppedVideoTrack: 0,
+            P2PSessionAddTrack: 0,
+            P2PAddTrackToPeerConnections: 0,
         };
     }
     numberOfPeerconnections() {
@@ -3080,8 +3079,6 @@ class P2pRtcManager {
         }
         if (this._localCameraStream && !this._localCameraStream.getVideoTracks().length && this._stoppedVideoTrack) {
             pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
-            this.analytics.P2PAddStoppedVideoTrack++;
-            rtcStats.sendEvent("P2PAddStoppedVideoTrack", { trackId: this._stoppedVideoTrack.id });
         }
         return session;
     }
@@ -3105,9 +3102,15 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.addStream(stream));
         });
     }
-    _addTrackToPeerConnections(track, stream) {
+    _addTrackToPeerConnections(track) {
+        this.analytics.P2PAddTrackToPeerConnections++;
+        rtcStats.sendEvent("P2PAddTrackToPeerConnections", {
+            trackId: track.id,
+            kind: track.kind,
+            readyState: track.readyState,
+        });
         this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.addTrack(track, stream));
+            this._withForcedRenegotiation(session, () => session.addTrack(track));
         });
     }
     _replaceTrackToPeerConnections(oldTrack, newTrack) {
@@ -3143,11 +3146,6 @@ class P2pRtcManager {
             this._withForcedRenegotiation(session, () => session.removeStream(stream));
         });
     }
-    _removeTrackFromPeerConnections(track) {
-        this._forEachPeerConnection((session) => {
-            this._withForcedRenegotiation(session, () => session.removeTrack(track));
-        });
-    }
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whereby.com/media",
   "description": "Media library for Whereby",
-  "version": "8.2.2",
+  "version": "8.2.4",
   "license": "MIT",
   "homepage": "https://github.com/whereby/sdk",
   "repository": {