@whereby.com/media 2.8.3 → 2.8.5

package/dist/index.cjs

@@ -1650,8 +1650,7 @@ class ServerSocket {
         if (this._serverSideDisconnectDurationLimitOn)
             this._keepAliveManager = new KeepAliveManager(this);
         this._socket.on("room_joined", (payload) => {
-            const { error } = payload;
-            if (!error) {
+            if (!("error" in payload)) {
                 this.joinRoomFinished = true;
             }
         });
@@ -2020,7 +2019,7 @@ const adapter$5 = (_a$5 = adapterRaw.default) !== null && _a$5 !== void 0 ? _a$5
 const logger$8 = new Logger();
 const browserName$2 = (_b$2 = adapter$5.browserDetails) === null || _b$2 === void 0 ? void 0 : _b$2.browser;
 const browserVersion$1 = adapter$5.browserDetails.version;
-function setCodecPreferenceSDP(sdp, redOn) {
+function setCodecPreferenceSDP({ sdp, redOn, incrementAnalyticMetric }) {
     var _a, _b;
     try {
         const sdpObject = sdpTransform__namespace.parse(sdp);
@@ -2058,7 +2057,10 @@ function setCodecPreferenceSDP(sdp, redOn) {
         return newSdp;
     }
     catch (error) {
+        incrementAnalyticMetric("P2PSetCodecPreferenceError");
+        rtcStats.sendEvent("P2PSetCodecPreferenceError", { error });
         logger$8.error("setCodecPreferenceSDP error:", error);
+        return sdp;
     }
 }
 function cleanSdp(sdp) {
@@ -2346,25 +2348,35 @@ class Session {
             this.earlyIceCandidates = [];
         });
     }
-    handleOffer(message) {
+    handleOffer(offer) {
         if (!this.canModifyPeerConnection()) {
             return new Promise((resolve) => {
-                this.pending.push(() => this.handleOffer(message).then(resolve));
+                this.pending.push(() => this.handleOffer(offer).then(resolve));
             });
         }
         this.isOperationPending = true;
-        let sdp = message.sdp;
+        let sdp = offer.sdp;
         sdp = filterMidExtension(sdp);
         sdp = filterMsidSemantic(sdp);
-        const desc = { type: message.type, sdp };
+        const desc = { type: offer.type, sdp };
         let answerToSignal;
         return this._setRemoteDescription(desc)
             .then(() => {
             return this.pc.createAnswer();
         })
             .then((answer) => {
-            answerToSignal = answer;
-            return this.pc.setLocalDescription(answer);
+            if (!answer.sdp) {
+                this._incrementAnalyticMetric("P2PCreateAnswerNoSDP");
+                rtcStats.sendEvent("P2PCreateAnswerNoSDP", {});
+                throw new Error("SDP undefined while creating answer");
+            }
+            else {
+                answerToSignal = {
+                    sdp: answer.sdp,
+                    type: answer.type,
+                };
+                return this.pc.setLocalDescription(answer);
+            }
         })
             .then(() => {
             return setVideoBandwidthUsingSetParameters(this.pc, this.bandwidth);
@@ -2619,8 +2631,8 @@ if (browserName$1 === "chrome") {
     });
 }
 class P2pRtcManager {
-    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, }) {
-        const { name, session, iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds } = room;
+    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features }) {
+        const { name, session, iceServers, turnServers, mediaserverConfigTtlSeconds } = room;
         this._selfId = selfId;
         this._roomName = name;
         this._roomSessionId = session && session.id;
@@ -2650,7 +2662,6 @@ class P2pRtcManager {
             this.analytics.camTrackEndedCount++;
         };
         this._updateAndScheduleMediaServersRefresh({
-            sfuServer,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -2685,13 +2696,16 @@ class P2pRtcManager {
             P2PReplaceTrackSourceKindNotFound: 0,
             P2PRemoveStreamNoPC: 0,
             P2POnTrackNoStream: 0,
+            P2PSetCodecPreferenceError: 0,
+            P2PCreateOfferNoSDP: 0,
+            P2PCreateAnswerNoSDP: 0,
         };
     }
     numberOfPeerconnections() {
         return Object.keys(this.peerConnections).length;
     }
     isInitializedWith({ selfId, roomName, isSfu }) {
-        return this._selfId === selfId && this._roomName === roomName && isSfu === !!this._sfuServer;
+        return this._selfId === selfId && this._roomName === roomName && !isSfu;
     }
     supportsScreenShareAudio() {
         return true;
@@ -2805,13 +2819,12 @@ class P2pRtcManager {
                     logger$6.warn("No RTCPeerConnection on SDP_OFFER", data);
                     return;
                 }
-                const offer = this._transformIncomingSdp(data.message);
                 (_b = (_a = session
-                    .handleOffer(offer)
+                    .handleOffer(data.message)
                     .then((answer) => {
                     this._emitServerEvent(RELAY_MESSAGES.SDP_ANSWER, {
                         receiverId: data.clientId,
-                        message: this._transformOutgoingSdp(answer),
+                        message: answer,
                     });
                 })).catch) === null || _b === void 0 ? void 0 : _b.call(_a, (e) => {
                     this.analytics.numPcOnOfferFailure++;
@@ -2824,15 +2837,13 @@ class P2pRtcManager {
                     logger$6.warn("No RTCPeerConnection on SDP_ANSWER", data);
                     return;
                 }
-                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) => {
+                (_b = (_a = session.handleAnswer(data.message)) === null || _a === void 0 ? void 0 : _a.catch) === null || _b === void 0 ? void 0 : _b.call(_a, (e) => {
                     logger$6.warn("Could not set remote description from remote answer: ", e);
                     this.analytics.numPcOnAnswerFailure++;
                 });
             }),
             this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
-                const { error } = payload;
-                if (error || !this._wasScreenSharing) {
+                if ("error" in payload || !this._wasScreenSharing) {
                     return;
                 }
                 const screenShareStreamId = Object.keys(this.localStreams).find((id) => id !== CAMERA_STREAM_ID);
@@ -2907,9 +2918,6 @@ class P2pRtcManager {
         if (previousStatus === newStatus) {
             return;
         }
-        if (session.peerConnectionId === this._selfId) {
-            return;
-        }
         if (previousStatus === TYPES.CONNECTION_DISCONNECTED &&
             newStatus === TYPES.CONNECTING) {
             return;
@@ -3008,13 +3016,6 @@ class P2pRtcManager {
         const streamIds = this._getNonLocalCameraStreamIds();
         return streamIds.length === 0 ? null : this.localStreams[streamIds[0]];
     }
-    _transformIncomingSdp(original) {
-        const sdp = original.sdp ? original.sdp : original.sdpU;
-        return { type: original.type, sdp };
-    }
-    _transformOutgoingSdp(original) {
-        return { type: original.type, sdpU: original.sdp, sdp: original.sdp };
-    }
     _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
@@ -3249,10 +3250,9 @@ class P2pRtcManager {
         delete this.localStreams[streamId];
         this._deleteEnabledLocalStreamId(streamId);
     }
-    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds }) {
+    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;
-        this._sfuServer = sfuServer;
         this._mediaserverConfigTtlSeconds = mediaserverConfigTtlSeconds;
         this._clearMediaServersRefresh();
         if (!mediaserverConfigTtlSeconds) {
@@ -3380,10 +3380,19 @@ class P2pRtcManager {
         this._setCodecPreferences(pc).then(() => pc
             .createOffer(constraints || this.offerOptions)
             .then((offer) => {
+            if (!offer.sdp) {
+                this.analytics.P2PCreateOfferNoSDP++;
+                rtcStats.sendEvent("P2PCreateOfferNoSDP", {});
+                throw new Error("SDP undefined while creating offer");
+            }
             if (rtpAbsCaptureTimeOn)
                 offer.sdp = addAbsCaptureTimeExtMap(offer.sdp);
             if (browserName$1 === "firefox") {
-                offer.sdp = setCodecPreferenceSDP(offer.sdp, redOn);
+                offer.sdp = setCodecPreferenceSDP({
+                    sdp: offer.sdp,
+                    redOn,
+                    incrementAnalyticMetric: (metric) => this.analytics[metric]++,
+                });
             }
             if (cleanSdpOn)
                 offer.sdp = cleanSdp(offer.sdp);
@@ -3396,7 +3405,7 @@ class P2pRtcManager {
                 .then(() => {
                 this._emitServerEvent(RELAY_MESSAGES.SDP_OFFER, {
                     receiverId: clientId,
-                    message: this._transformOutgoingSdp(offer),
+                    message: offer,
                 });
             });
         })
@@ -4521,8 +4530,8 @@ const OUTBOUND_SCREEN_OUTBOUND_STREAM_ID = uuid.v4();
 if (browserName === "chrome")
     window.document.addEventListener("beforeunload", () => (unloading = true));
 class VegaRtcManager {
-    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, eventClaim, }) {
-        const { session, iceServers, turnServers, sfuServer, sfuServers, mediaserverConfigTtlSeconds } = room;
+    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, eventClaim }) {
+        const { session, iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds } = room;
         this._selfId = selfId;
         this._room = room;
         this._roomSessionId = session === null || session === void 0 ? void 0 : session.id;
@@ -4576,7 +4585,6 @@ class VegaRtcManager {
         };
         this._updateAndScheduleMediaServersRefresh({
             sfuServer,
-            sfuServers,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -4603,13 +4611,14 @@ class VegaRtcManager {
             camTrackEndedCount: 0,
         };
     }
-    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, sfuServers, mediaserverConfigTtlSeconds, }) {
-        var _a, _b, _c;
+    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds, }) {
+        var _a, _b, _c, _d;
         this._iceServers = iceServers;
         this._turnServers = turnServers;
-        this._sfuServer = sfuServer;
-        this._sfuServers = sfuServers;
-        if (!sfuServers && (sfuServer === null || sfuServer === void 0 ? void 0 : sfuServer.fallbackServers)) {
+        if (sfuServer) {
+            this._sfuServer = sfuServer;
+        }
+        if (sfuServer === null || sfuServer === void 0 ? void 0 : sfuServer.fallbackServers) {
             this._sfuServers = sfuServer.fallbackServers.map((entry) => ({
                 host: entry.host || entry.fqdn,
                 dc: entry.dc,
@@ -4619,14 +4628,14 @@ class VegaRtcManager {
         (_a = this._vegaConnectionManager) === null || _a === void 0 ? void 0 : _a.updateHostList(this._features.sfuServersOverride ||
             this._sfuServers ||
             this._features.sfuServerOverrideHost ||
-            sfuServer.url);
+            ((_b = this._sfuServer) === null || _b === void 0 ? void 0 : _b.url));
         const iceServersList = {
             iceServers: this._features.turnServersOn ? this._turnServers : this._iceServers,
         };
         iceServersList.iceServers = turnServerOverride(iceServersList.iceServers, this._features.turnServerOverrideHost);
         if (browserName !== "firefox") {
-            (_b = this._sendTransport) === null || _b === void 0 ? void 0 : _b.updateIceServers(iceServersList);
-            (_c = this._receiveTransport) === null || _c === void 0 ? void 0 : _c.updateIceServers(iceServersList);
+            (_c = this._sendTransport) === null || _c === void 0 ? void 0 : _c.updateIceServers(iceServersList);
+            (_d = this._receiveTransport) === null || _d === void 0 ? void 0 : _d.updateIceServers(iceServersList);
         }
         this._clearMediaServersRefresh();
         if (!mediaserverConfigTtlSeconds) {
@@ -4680,6 +4689,7 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        var _a;
         if (this._isConnectingOrConnected)
             return;
         if (!this._serverSocket.isConnected()) {
@@ -4695,7 +4705,7 @@ class VegaRtcManager {
             const hostList = this._features.sfuServersOverride ||
                 this._sfuServers ||
                 this._features.sfuServerOverrideHost ||
-                this._sfuServer.url;
+                ((_a = this._sfuServer) === null || _a === void 0 ? void 0 : _a.url);
             this._vegaConnectionManager = createVegaConnectionManager({
                 initialHostList: hostList,
                 getUrlForHost: (host) => {
@@ -6005,9 +6015,10 @@ class RtcManagerDispatcher {
     constructor({ emitter, serverSocket, webrtcProvider, features, }) {
         this.emitter = emitter;
         this.currentManager = null;
-        serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, ({ room, selfId, error, eventClaim }) => {
-            if (error)
+        serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
+            if ("error" in payload)
                 return;
+            const { room, selfId, eventClaim } = payload;
             const config = {
                 selfId,
                 room,