@whereby.com/media 2.8.2 → 2.8.4

package/dist/index.cjs

@@ -1427,7 +1427,7 @@ class ReconnectManager extends EventEmitter {
             clearTimeout(client.timeout);
             delete this._clients[clientId];
         }
-        (_a = this.rtcManager) === null || _a === void 0 ? void 0 : _a.disconnect(clientId, null, payload.eventClaim);
+        (_a = this.rtcManager) === null || _a === void 0 ? void 0 : _a.disconnect(clientId, payload.eventClaim);
         this.emit(PROTOCOL_RESPONSES.CLIENT_LEFT, payload);
     }
     _onPendingClientLeft(payload) {
@@ -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;
             }
         });
@@ -2234,7 +2233,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, clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, shouldAddLocalVideo, incrementAnalyticMetric, }) {
+    constructor({ peerConnectionId, clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, incrementAnalyticMetric, }) {
         this.peerConnectionId = peerConnectionId;
         this.relayCandidateSeen = false;
         this.serverReflexiveCandidateSeen = false;
@@ -2244,7 +2243,6 @@ class Session {
         this.ipv6HostCandidate6to4Seen = false;
         this.mdnsHostCandidateSeen = false;
         this.peerConnectionConfig = peerConnectionConfig;
-        this.shouldAddLocalVideo = shouldAddLocalVideo;
         this.clientId = clientId;
         this.pc = new RTCPeerConnection(this.peerConnectionConfig);
         this.signalingState = this.pc.signalingState;
@@ -2312,11 +2310,13 @@ class Session {
         }
     }
     removeStream(stream) {
-        for (let i = 0; i < this.streamIds.length; i++) {
-            if (this.streamIds[i] === stream.id) {
-                this.streamIds.splice(i, 1);
-                this.streams.splice(i, 1);
-            }
+        const streamIdIndex = this.streamIds.indexOf(stream.id);
+        if (streamIdIndex !== -1) {
+            this.streamIds.splice(streamIdIndex, 1);
+        }
+        const streamIndex = this.streams.indexOf(stream);
+        if (streamIndex !== -1) {
+            this.streams.splice(streamIndex, 1);
         }
         if (this.pc) {
             if (this.pc.removeTrack) {
@@ -2582,57 +2582,6 @@ const TYPES = {
     CONNECTION_DISCONNECTED: "connection_disconnected",
 };
 
-const CAMERA_STREAM_ID$1 = "0";
-const STREAM_TYPES = {
-    CAMERA: "camera",
-    SCREEN_SHARE: "screen_share",
-};
-class RtcStream {
-    constructor(id, type) {
-        this.id = "" + id;
-        this.type = type;
-        this.isEnabled = true;
-        this.hasSupportForAutoSuperSize = false;
-        this.isAudioEnabled = true;
-        this.isVideoEnabled = true;
-        this.status = TYPES.CONNECTING;
-        this.stream = null;
-        this.streamId = null;
-    }
-    setup(stream) {
-        this.stream = stream;
-        this.streamId = stream.id;
-        this.setVideoEnabled(this.isVideoEnabled && stream.getVideoTracks().length > 0);
-        this.setAudioEnabled(this.isAudioEnabled && stream.getAudioTracks().length > 0);
-        return this;
-    }
-    setStatus(status) {
-        this.status = status;
-        return this;
-    }
-    setVideoEnabled(isEnabled) {
-        this.isVideoEnabled = isEnabled;
-        if (!this.stream) {
-            return;
-        }
-        this.stream.getVideoTracks().forEach((track) => {
-            track.enabled = isEnabled;
-        });
-    }
-    setAudioEnabled(isEnabled) {
-        this.isAudioEnabled = isEnabled;
-        if (!this.stream) {
-            return;
-        }
-        this.stream.getAudioTracks().forEach((track) => {
-            track.enabled = isEnabled;
-        });
-    }
-    static getCameraId() {
-        return CAMERA_STREAM_ID$1;
-    }
-}
-
 var rtcManagerEvents = {
     CAMERA_NOT_WORKING: "camera_not_working",
     CONNECTION_BLOCKED_BY_NETWORK: "connection_blocked_by_network",
@@ -2647,11 +2596,16 @@ var rtcManagerEvents = {
     DOMINANT_SPEAKER: "dominant_speaker",
 };
 
+const CAMERA_STREAM_ID = "0";
+const STREAM_TYPES = {
+    webcam: "webcam",
+    screenshare: "screenshare",
+};
+
 var _a$2, _b$1, _c;
 const adapter$2 = (_a$2 = adapterRaw.default) !== null && _a$2 !== void 0 ? _a$2 : adapterRaw;
 const logger$6 = new Logger();
 const ICE_PUBLIC_IP_GATHERING_TIMEOUT = 3 * 1000;
-const CAMERA_STREAM_ID = RtcStream.getCameraId();
 const browserName$1 = (_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
 const browserVersion = adapter$2.browserDetails.version;
 if (browserName$1 === "firefox" && adapter$2.browserShim && "shimGetDisplayMedia" in adapter$2.browserShim) {
@@ -2664,8 +2618,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;
@@ -2695,7 +2649,6 @@ class P2pRtcManager {
             this.analytics.camTrackEndedCount++;
         };
         this._updateAndScheduleMediaServersRefresh({
-            sfuServer,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -2736,7 +2689,7 @@ class P2pRtcManager {
         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;
@@ -2876,13 +2829,9 @@ class P2pRtcManager {
                 });
             }),
             this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
-                var _a, _b;
-                if (payload === null || payload === void 0 ? void 0 : payload.error) {
+                if ("error" in payload || !this._wasScreenSharing) {
                     return;
                 }
-                const isSfu = (_b = (_a = payload === null || payload === void 0 ? void 0 : payload.room) === null || _a === void 0 ? void 0 : _a.sfuServer) !== null && _b !== void 0 ? _b : false;
-                if (isSfu || !this._wasScreenSharing)
-                    return;
                 const screenShareStreamId = Object.keys(this.localStreams).find((id) => id !== CAMERA_STREAM_ID);
                 if (!screenShareStreamId) {
                     return;
@@ -2898,6 +2847,15 @@ class P2pRtcManager {
                     hasAudioTrack,
                 });
             }),
+            this._serverSocket.on(PROTOCOL_RESPONSES.SCREENSHARE_STOPPED, (payload) => {
+                const session = this._getSession(payload.clientId);
+                if (session) {
+                    const streamIdIndex = session.streamIds.indexOf(payload.streamId);
+                    if (streamIdIndex !== -1) {
+                        session.streamIds.splice(streamIdIndex, 1);
+                    }
+                }
+            }),
         ];
     }
     sendAudioMutedStats(muted) {
@@ -2946,9 +2904,6 @@ class P2pRtcManager {
         if (previousStatus === newStatus) {
             return;
         }
-        if (session.peerConnectionId === this._selfId) {
-            return;
-        }
         if (previousStatus === TYPES.CONNECTION_DISCONNECTED &&
             newStatus === TYPES.CONNECTING) {
             return;
@@ -3009,7 +2964,7 @@ class P2pRtcManager {
         }
         return this.peerConnections[peerConnectionId];
     }
-    _getOrCreateSession({ peerConnectionId, clientId, initialBandwidth, peerConnectionConfig, shouldAddLocalVideo, }) {
+    _getOrCreateSession({ peerConnectionId, clientId, initialBandwidth, peerConnectionConfig, }) {
         let session = this.peerConnections[peerConnectionId];
         if (session === undefined) {
             const deprioritizeH264Encoding = browserName$1 === "safari" &&
@@ -3022,7 +2977,6 @@ class P2pRtcManager {
                 peerConnectionConfig,
                 bandwidth: initialBandwidth,
                 deprioritizeH264Encoding,
-                shouldAddLocalVideo,
                 incrementAnalyticMetric: (metric) => this.analytics[metric]++,
             });
         }
@@ -3055,7 +3009,7 @@ class P2pRtcManager {
     _transformOutgoingSdp(original) {
         return { type: original.type, sdpU: original.sdp, sdp: original.sdp };
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, }) {
+    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
         }
@@ -3084,7 +3038,6 @@ class P2pRtcManager {
             clientId,
             initialBandwidth,
             peerConnectionConfig,
-            shouldAddLocalVideo,
         });
         setTimeout(() => this._emit(rtcManagerEvents.NEW_PC), 0);
         this.analytics.numNewPc++;
@@ -3095,7 +3048,7 @@ class P2pRtcManager {
                 this.analytics.P2POnTrackNoStream++;
                 rtcStats.sendEvent("P2POnTrackNoStream", {
                     trackKind: event.track.kind,
-                    trackId: event.track.id
+                    trackId: event.track.id,
                 });
                 return;
             }
@@ -3182,30 +3135,28 @@ class P2pRtcManager {
             }
         };
         const localCameraStream = this.localStreams[CAMERA_STREAM_ID];
-        if (shouldAddLocalVideo && localCameraStream) {
+        if (localCameraStream) {
             session.addStream(localCameraStream);
         }
-        if (shouldAddLocalVideo) {
-            Object.keys(this.localStreams).forEach((id) => {
-                if (id === CAMERA_STREAM_ID) {
-                    return;
-                }
-                const screenshareStream = this.localStreams[id];
-                if (isOfferer) {
-                    session.addStream(screenshareStream);
-                }
-                else {
-                    session.afterConnected.then(() => {
-                        this._emitServerEvent(PROTOCOL_REQUESTS.START_SCREENSHARE, {
-                            receiverId: session.clientId,
-                            streamId: screenshareStream.id,
-                            hasAudioTrack: !!screenshareStream.getAudioTracks().length,
-                        });
-                        this._withForcedRenegotiation(session, () => session.addStream(screenshareStream));
+        Object.keys(this.localStreams).forEach((id) => {
+            if (id === CAMERA_STREAM_ID) {
+                return;
+            }
+            const screenshareStream = this.localStreams[id];
+            if (isOfferer) {
+                session.addStream(screenshareStream);
+            }
+            else {
+                session.afterConnected.then(() => {
+                    this._emitServerEvent(PROTOCOL_REQUESTS.START_SCREENSHARE, {
+                        receiverId: session.clientId,
+                        streamId: screenshareStream.id,
+                        hasAudioTrack: !!screenshareStream.getAudioTracks().length,
                     });
-                }
-            });
-        }
+                    this._withForcedRenegotiation(session, () => session.addStream(screenshareStream));
+                });
+            }
+        });
         return session;
     }
     _cleanup(peerConnectionId) {
@@ -3292,10 +3243,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) {
@@ -3342,7 +3292,6 @@ class P2pRtcManager {
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
-            shouldAddLocalVideo: true,
             isOfferer: true,
         });
         this._negotiatePeerConnection(clientId, session);
@@ -3486,12 +3435,11 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, }) {
+    _createP2pSession({ clientId, initialBandwidth, isOfferer = false, }) {
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
             initialBandwidth,
-            shouldAddLocalVideo,
             isOfferer,
         });
         const pc = session.pc;
@@ -3499,10 +3447,7 @@ class P2pRtcManager {
             this._setJitterBufferTarget(pc);
         }
         const localCameraStream = this.localStreams[CAMERA_STREAM_ID];
-        if (shouldAddLocalVideo &&
-            localCameraStream &&
-            !localCameraStream.getVideoTracks().length &&
-            this._stoppedVideoTrack) {
+        if (localCameraStream && !localCameraStream.getVideoTracks().length && this._stoppedVideoTrack) {
             pc.addTrack(this._stoppedVideoTrack, localCameraStream);
         }
         pc.onicegatheringstatechange = (event) => {
@@ -3608,7 +3553,7 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
+    acceptNewStream({ streamId, clientId }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
@@ -3624,7 +3569,6 @@ class P2pRtcManager {
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
-            shouldAddLocalVideo: !!shouldAddLocalVideo,
             isOfferer: false,
         });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
@@ -3731,6 +3675,9 @@ class P2pRtcManager {
     hasClient(clientId) {
         return Object.keys(this.peerConnections).includes(clientId);
     }
+    shouldAcceptStreamsFromBothSides() {
+        return false;
+    }
 }
 
 class KalmanFilter {
@@ -4567,8 +4514,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;
@@ -4622,7 +4569,6 @@ class VegaRtcManager {
         };
         this._updateAndScheduleMediaServersRefresh({
             sfuServer,
-            sfuServers,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -4649,13 +4595,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,
@@ -4665,14 +4612,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) {
@@ -4726,6 +4673,7 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        var _a;
         if (this._isConnectingOrConnected)
             return;
         if (!this._serverSocket.isConnected()) {
@@ -4741,7 +4689,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) => {
@@ -5483,14 +5431,14 @@ class VegaRtcManager {
     setRoomSessionId(roomSessionId) {
         this._roomSessionId = roomSessionId;
     }
-    disconnect(clientIdOrStreamId, _activeBreakout, eventClaim) {
+    disconnect(clientId, eventClaim) {
         var _a;
-        logger$2.info("disconnect() [clientIdOrStreamId:%s, eventClaim:%s]", clientIdOrStreamId, eventClaim);
-        const clientState = this._clientStates.get(clientIdOrStreamId);
+        logger$2.info("disconnect() [clientId:%s, eventClaim:%s]", clientId, eventClaim);
+        const clientState = this._clientStates.get(clientId);
         if (clientState) {
             clientState.hasAcceptedWebcamStream = false;
             clientState.hasAcceptedScreenStream = false;
-            this._syncIncomingStreamsWithPWA(clientIdOrStreamId);
+            this._syncIncomingStreamsWithPWA(clientId);
         }
         if (eventClaim) {
             this._eventClaim = eventClaim;
@@ -5532,7 +5480,7 @@ class VegaRtcManager {
         this._sendMicScore(this._micPaused ? 0 : data.out);
     }
     addNewStream(streamId, stream, audioPaused, videoPaused, beforeEffectTracks = []) {
-        if (streamId === "0") {
+        if (streamId === CAMERA_STREAM_ID) {
             this._micPaused = audioPaused;
             this._webcamPaused = videoPaused;
             const videoTrack = stream.getVideoTracks()[0];
@@ -5999,7 +5947,7 @@ class VegaRtcManager {
                 clientId,
                 stream: webcamStream,
                 streamId: camStreamId,
-                streamType: "webcam",
+                streamType: STREAM_TYPES.webcam,
             });
             clientState.hasEmittedWebcamStream = true;
         }
@@ -6008,7 +5956,7 @@ class VegaRtcManager {
                 clientId,
                 stream: screenStream,
                 streamId: screenShareStreamId,
-                streamType: "screenshare",
+                streamType: STREAM_TYPES.screenshare,
             });
             clientState.hasEmittedScreenStream = true;
         }
@@ -6051,9 +5999,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,
@@ -7580,6 +7529,7 @@ exports.RtcEventNames = void 0;
 exports.ADDITIONAL_SCREEN_SHARE_SETTINGS = ADDITIONAL_SCREEN_SHARE_SETTINGS;
 exports.AUDIO_SETTINGS = AUDIO_SETTINGS;
 exports.BandwidthTester = BandwidthTester;
+exports.CAMERA_STREAM_ID = CAMERA_STREAM_ID;
 exports.EVENTS = EVENTS;
 exports.KNOCK_MESSAGES = KNOCK_MESSAGES;
 exports.KalmanFilter = KalmanFilter;
@@ -7594,7 +7544,6 @@ exports.PROTOCOL_RESPONSES = PROTOCOL_RESPONSES;
 exports.RELAY_MESSAGES = RELAY_MESSAGES;
 exports.ReconnectManager = ReconnectManager;
 exports.RtcManagerDispatcher = RtcManagerDispatcher;
-exports.RtcStream = RtcStream;
 exports.SCREEN_SHARE_SETTINGS = SCREEN_SHARE_SETTINGS;
 exports.SCREEN_SHARE_SIMULCAST_SETTINGS = SCREEN_SHARE_SIMULCAST_SETTINGS;
 exports.STREAM_TYPES = STREAM_TYPES;