@whereby.com/media 2.6.7 → 2.6.9

package/dist/index.mjs

@@ -2146,7 +2146,7 @@ var _a$4;
 const adapter$4 = (_a$4 = adapterRaw.default) !== null && _a$4 !== void 0 ? _a$4 : adapterRaw;
 const logger$7 = new Logger();
 class Session {
-    constructor({ peerConnectionId, bandwidth, deprioritizeH264Encoding, incrementAnalyticMetric, }) {
+    constructor({ peerConnectionId, clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, shouldAddLocalVideo, incrementAnalyticMetric, }) {
         this.peerConnectionId = peerConnectionId;
         this.relayCandidateSeen = false;
         this.serverReflexiveCandidateSeen = false;
@@ -2155,7 +2155,24 @@ class Session {
         this.ipv6HostCandidateTeredoSeen = false;
         this.ipv6HostCandidate6to4Seen = false;
         this.mdnsHostCandidateSeen = false;
-        this.pc = null;
+        this.peerConnectionConfig = peerConnectionConfig;
+        this.shouldAddLocalVideo = shouldAddLocalVideo;
+        this.clientId = clientId;
+        this.pc = new RTCPeerConnection(this.peerConnectionConfig);
+        this.signalingState = this.pc.signalingState;
+        this.pc.addEventListener("signalingstatechange", () => {
+            if (this.signalingState === this.pc.signalingState) {
+                return;
+            }
+            this.signalingState = this.pc.signalingState;
+            if (this.pc.signalingState === "stable") {
+                this.isOperationPending = false;
+                const action = this.pending.shift();
+                if (action) {
+                    action.apply();
+                }
+            }
+        });
         this.wasEverConnected = false;
         this.connectionStatus = null;
         this.stats = {
@@ -2175,27 +2192,6 @@ class Session {
         this._deprioritizeH264Encoding = deprioritizeH264Encoding;
         this._incrementAnalyticMetric = incrementAnalyticMetric;
     }
-    setAndGetPeerConnection({ clientId, constraints, peerConnectionConfig, shouldAddLocalVideo, }) {
-        this.peerConnectionConfig = peerConnectionConfig;
-        this.shouldAddLocalVideo = shouldAddLocalVideo;
-        this.clientId = clientId;
-        this.pc = new RTCPeerConnection(peerConnectionConfig);
-        this.signalingState = this.pc.signalingState;
-        this.pc.addEventListener("signalingstatechange", () => {
-            if (this.signalingState === this.pc.signalingState) {
-                return;
-            }
-            this.signalingState = this.pc.signalingState;
-            if (this.pc.signalingState === "stable") {
-                this.isOperationPending = false;
-                const action = this.pending.shift();
-                if (action) {
-                    action.apply();
-                }
-            }
-        });
-        return this.pc;
-    }
     addStream(stream) {
         this.streamIds.push(stream.id);
         this.streams.push(stream);
@@ -2288,8 +2284,6 @@ class Session {
         const desc = { type: message.type, sdp };
         return this._setRemoteDescription(desc).then(() => {
             return setVideoBandwidthUsingSetParameters(this.pc, this.bandwidth);
-        }, (e) => {
-            logger$7.warn("Could not set remote description from remote answer: ", e);
         });
     }
     addIceCandidate(candidate) {
@@ -2332,7 +2326,7 @@ class Session {
         return this.pc && this.pc.connectionState === "connected";
     }
     replaceTrack(oldTrack, newTrack) {
-        var _a;
+        var _a, _b;
         const pc = this.pc;
         if (!pc) {
             rtcStats.sendEvent("P2PReplaceTrackNoPC", {
@@ -2423,11 +2417,12 @@ class Session {
         setTimeout(() => {
             pc.onnegotiationneeded = onn;
         }, 0);
-        if (pc.localDescription.type === "offer") {
+        if (((_b = pc.localDescription) === null || _b === void 0 ? void 0 : _b.type) === "offer") {
             return pc
                 .createOffer()
                 .then((offer) => {
-                offer.sdp = replaceSSRCs(pc.localDescription.sdp, offer.sdp);
+                var _a;
+                offer.sdp = replaceSSRCs((_a = pc.localDescription) === null || _a === void 0 ? void 0 : _a.sdp, offer.sdp);
                 return pc.setLocalDescription(offer);
             })
                 .then(() => {
@@ -2440,12 +2435,14 @@ class Session {
                 return pc.createAnswer();
             })
                 .then((answer) => {
-                answer.sdp = replaceSSRCs(pc.localDescription.sdp, answer.sdp);
+                var _a;
+                answer.sdp = replaceSSRCs((_a = pc.localDescription) === null || _a === void 0 ? void 0 : _a.sdp, answer.sdp);
                 return pc.setLocalDescription(answer);
             });
         }
     }
     changeBandwidth(bandwidth) {
+        var _a;
         if (bandwidth === this.bandwidth) {
             return;
         }
@@ -2454,22 +2451,24 @@ class Session {
             return;
         }
         this.bandwidth = bandwidth;
-        if (!this.pc.localDescription || this.pc.localDescription.type === "") {
+        if (((_a = this.pc.localDescription) === null || _a === void 0 ? void 0 : _a.type) === "") {
+            this._incrementAnalyticMetric("P2PChangeBandwidthEmptySDPType");
+            return;
+        }
+        if (!this.pc.localDescription) {
             return;
         }
         setVideoBandwidthUsingSetParameters(this.pc, this.bandwidth);
     }
     setAudioOnly(enable, excludedTrackIds = []) {
-        this.pc
-            .getTransceivers()
-            .filter((videoTransceiver) => {
+        var _a;
+        (_a = this.pc) === null || _a === void 0 ? void 0 : _a.getTransceivers().filter((videoTransceiver) => {
             var _a, _b, _c, _d, _e, _f;
             return (videoTransceiver === null || videoTransceiver === void 0 ? void 0 : videoTransceiver.direction) !== "recvonly" &&
                 ((_b = (_a = videoTransceiver === null || videoTransceiver === void 0 ? void 0 : videoTransceiver.receiver) === null || _a === void 0 ? void 0 : _a.track) === null || _b === void 0 ? void 0 : _b.kind) === "video" &&
                 !excludedTrackIds.includes((_d = (_c = videoTransceiver === null || videoTransceiver === void 0 ? void 0 : videoTransceiver.receiver) === null || _c === void 0 ? void 0 : _c.track) === null || _d === void 0 ? void 0 : _d.id) &&
                 !excludedTrackIds.includes((_f = (_e = videoTransceiver === null || videoTransceiver === void 0 ? void 0 : videoTransceiver.sender) === null || _e === void 0 ? void 0 : _e.track) === null || _f === void 0 ? void 0 : _f.id);
-        })
-            .forEach((videoTransceiver) => {
+        }).forEach((videoTransceiver) => {
             videoTransceiver.direction = enable ? "sendonly" : "sendrecv";
         });
     }
@@ -2590,9 +2589,6 @@ var rtcManagerEvents = {
     SFU_CONNECTION_INFO: "sfu_connection_info",
     COLOCATION_SPEAKER: "colocation_speaker",
     DOMINANT_SPEAKER: "dominant_speaker",
-    PC_SLD_FAILURE: "pc_sld_failure",
-    PC_ON_ANSWER_FAILURE: "pc_on_answer_failure",
-    PC_ON_OFFER_FAILURE: "pc_on_offer_failure",
 };
 
 var _a$2, _b$1, _c;
@@ -2635,10 +2631,12 @@ class P2pRtcManager {
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading: unloading$1 });
             this._emit(rtcManagerEvents.MICROPHONE_STOPPED_WORKING, {});
+            this.analytics.micTrackEndedCount++;
         };
         this._videoTrackOnEnded = () => {
             rtcStats.sendEvent("video_ended", { unloading: unloading$1 });
             this._emit(rtcManagerEvents.CAMERA_STOPPED_WORKING, {});
+            this.analytics.camTrackEndedCount++;
         };
         this._updateAndScheduleMediaServersRefresh({
             sfuServer,
@@ -2659,6 +2657,14 @@ class P2pRtcManager {
             numIceIpv6TeredoSeen: 0,
             numIceIpv6SixToFour: 0,
             numIceMdnsSeen: 0,
+            micTrackEndedCount: 0,
+            camTrackEndedCount: 0,
+            numPcSldFailure: 0,
+            numPcOnAnswerFailure: 0,
+            numPcOnOfferFailure: 0,
+            P2PChangeBandwidthEmptySDPType: 0,
+            P2PNegotiationNeeded: 0,
+            P2PSessionAlreadyCreated: 0,
         };
     }
     numberOfPeerconnections() {
@@ -2778,7 +2784,7 @@ class P2pRtcManager {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
                     return;
                 }
-                const offer = this._transformIncomingSdp(data.message, session.pc);
+                const offer = this._transformIncomingSdp(data.message);
                 (_b = (_a = session
                     .handleOffer(offer)
                     .then((answer) => {
@@ -2787,7 +2793,7 @@ class P2pRtcManager {
                         message: this._transformOutgoingSdp(answer),
                     });
                 })).catch) === null || _b === void 0 ? void 0 : _b.call(_a, (e) => {
-                    this._emit(rtcManagerEvents.PC_ON_OFFER_FAILURE, e);
+                    this.analytics.numPcOnOfferFailure++;
                 });
             }),
             this._serverSocket.on(RELAY_MESSAGES.SDP_ANSWER, (data) => {
@@ -2797,9 +2803,10 @@ class P2pRtcManager {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
                     return;
                 }
-                const answer = this._transformIncomingSdp(data.message, session.pc);
+                const answer = this._transformIncomingSdp(data.message);
                 (_b = (_a = session.handleAnswer(answer)) === null || _a === void 0 ? void 0 : _a.catch) === null || _b === void 0 ? void 0 : _b.call(_a, (e) => {
-                    this._emit(rtcManagerEvents.PC_ON_ANSWER_FAILURE, e);
+                    logger$6.warn("Could not set remote description from remote answer: ", e);
+                    this.analytics.numPcOnAnswerFailure++;
                 });
             }),
             this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
@@ -2935,7 +2942,7 @@ class P2pRtcManager {
         }
         return this.peerConnections[peerConnectionId];
     }
-    _getOrCreateSession(peerConnectionId, initialBandwidth) {
+    _getOrCreateSession({ peerConnectionId, clientId, initialBandwidth, peerConnectionConfig, shouldAddLocalVideo, }) {
         let session = this.peerConnections[peerConnectionId];
         if (session === undefined) {
             const deprioritizeH264Encoding = browserName$1 === "safari" &&
@@ -2944,12 +2951,22 @@ class P2pRtcManager {
                 this._features.deprioritizeH264OnSafari;
             this.peerConnections[peerConnectionId] = session = new Session({
                 peerConnectionId,
+                clientId,
+                peerConnectionConfig,
                 bandwidth: initialBandwidth,
                 deprioritizeH264Encoding,
+                shouldAddLocalVideo,
                 incrementAnalyticMetric: (metric) => this.analytics[metric]++,
             });
             this.totalSessionsCreated++;
         }
+        else {
+            this.analytics.P2PSessionAlreadyCreated++;
+            rtcStats.sendEvent("P2PSessionAlreadyCreated", {
+                clientId,
+                peerConnectionId,
+            });
+        }
         return session;
     }
     _getLocalCameraStream() {
@@ -2965,7 +2982,7 @@ class P2pRtcManager {
         const streamIds = this._getNonLocalCameraStreamIds();
         return streamIds.length === 0 ? null : this.localStreams[streamIds[0]];
     }
-    _transformIncomingSdp(original, _) {
+    _transformIncomingSdp(original) {
         return { type: original.type, sdp: original.sdpU };
     }
     _transformOutgoingSdp(original) {
@@ -2978,34 +2995,33 @@ class P2pRtcManager {
         if (!clientId) {
             throw new Error("clientId is missing");
         }
-        const session = this._getOrCreateSession(peerConnectionId, initialBandwidth);
+        const peerConnectionConfig = {
+            iceServers: this._features.turnServersOn ? this._turnServers : this._iceServers,
+        };
         const constraints = { optional: [] };
+        constraints.optional.push({ rtcStatsRoomSessionId: this._roomSessionId });
+        constraints.optional.push({ rtcStatsClientId: this._selfId });
+        constraints.optional.push({ rtcStatsPeerId: peerConnectionId });
+        constraints.optional.push({ rtcStatsConferenceId: this._roomName });
         if (browserName$1 === "chrome") {
             constraints.optional.push({
                 googCpuOveruseDetection: true,
             });
+            peerConnectionConfig.sdpSemantics = "unified-plan";
         }
-        constraints.optional.push({ rtcStatsRoomSessionId: this._roomSessionId });
-        constraints.optional.push({ rtcStatsClientId: this._selfId });
-        constraints.optional.push({ rtcStatsPeerId: peerConnectionId });
-        constraints.optional.push({ rtcStatsConferenceId: this._roomName });
-        const peerConnectionConfig = {
-            iceServers: this._features.turnServersOn ? this._turnServers : this._iceServers,
-        };
         peerConnectionConfig.iceServers = turnServerOverride(peerConnectionConfig.iceServers, this._features.turnServerOverrideHost);
         external_stun_servers(peerConnectionConfig, this._features);
         maybeTurnOnly(peerConnectionConfig, this._features);
-        if (browserName$1 === "chrome") {
-            peerConnectionConfig.sdpSemantics = "unified-plan";
-        }
-        const pc = session.setAndGetPeerConnection({
-            constraints,
+        const session = this._getOrCreateSession({
+            peerConnectionId,
+            clientId,
+            initialBandwidth,
             peerConnectionConfig,
             shouldAddLocalVideo,
-            clientId,
         });
         setTimeout(() => this._emit(rtcManagerEvents.NEW_PC), 0);
         this.analytics.numNewPc++;
+        const { pc } = session;
         pc.ontrack = (event) => {
             const stream = event.streams[0];
             if (stream.id === "default" && stream.getAudioTracks().length === 0) {
@@ -3348,7 +3364,7 @@ class P2pRtcManager {
             pc.setLocalDescription(offer)
                 .catch((e) => {
                 logger$6.warn("RTCPeerConnection.setLocalDescription() failed with local offer", e);
-                this._emit(rtcManagerEvents.PC_SLD_FAILURE, e);
+                this.analytics.numPcSldFailure++;
                 throw e;
             })
                 .then(() => {
@@ -3364,7 +3380,7 @@ class P2pRtcManager {
     }
     _withForcedRenegotiation(session, action) {
         const pc = session.pc;
-        const originalOnnegotationneeded = pc.onnegotationneeded;
+        const originalOnnegotationneeded = pc.onnegotiationneeded;
         pc.onnegotiationneeded = null;
         action();
         this._negotiatePeerConnection(session.clientId, session);
@@ -3429,7 +3445,7 @@ class P2pRtcManager {
                         if (!session.publicHostCandidateSeen &&
                             !session.relayCandidateSeen &&
                             !session.serverReflexiveCandidateSeen) {
-                            if (pc.iceConnectionState !== "connected" || pc.iceConnectionState !== "completed")
+                            if (pc.iceConnectionState !== "connected" && pc.iceConnectionState !== "completed")
                                 this.analytics.numIceNoPublicIpGatheredIn3sec++;
                         }
                     }, ICE_PUBLIC_IP_GATHERING_TIMEOUT);
@@ -3513,6 +3529,8 @@ class P2pRtcManager {
             }
         };
         pc.onnegotiationneeded = () => {
+            this.analytics.P2PNegotiationNeeded++;
+            rtcStats.sendEvent("P2PNegotiationNeeded", {});
             if (pc.iceConnectionState === "new" || !session.connectionStatus) {
                 return;
             }
@@ -4525,10 +4543,12 @@ class VegaRtcManager {
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading });
             this._emitToPWA(rtcManagerEvents.MICROPHONE_STOPPED_WORKING, {});
+            this.analytics.micTrackEndedCount++;
         };
         this._videoTrackOnEnded = () => {
             rtcStats.sendEvent("video_ended", { unloading });
             this._emitToPWA(rtcManagerEvents.CAMERA_STOPPED_WORKING, {});
+            this.analytics.camTrackEndedCount++;
         };
         this._updateAndScheduleMediaServersRefresh({
             sfuServer,
@@ -4555,6 +4575,8 @@ class VegaRtcManager {
             vegaIceRestartMissingTransport: 0,
             vegaIceRestartWrongTransportId: 0,
             vegaNonErrorRejectionValueGUMError: 0,
+            micTrackEndedCount: 0,
+            camTrackEndedCount: 0,
         };
     }
     _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, sfuServers, mediaserverConfigTtlSeconds, }) {
@@ -7008,8 +7030,12 @@ class BandwidthTester extends EventEmitter {
                 this._sendTransport.getStats(),
                 this._receiveTransport.getStats(),
             ]);
-            const { recvStats: [remoteRecvStats = null] = [] } = yield this._vegaConnection.request("getTransportStats");
-            const { availableOutgoingBitrate = 5000000 } = remoteRecvStats || {};
+            let availableOutgoingBitrate = 5000000;
+            try {
+                availableOutgoingBitrate = (yield this._vegaConnection.request("getTransportStats")).recvStats[0]
+                    .availableOutgoingBitrate;
+            }
+            catch (_a) { }
             let outboundPackets = 0;
             let remotePacketsLost = 0;
             localSendStats.forEach((localSendStat) => {