@whereby.com/media 2.8.2 → 2.8.3

package/dist/legacy-esm.js

@@ -1406,7 +1406,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) {
@@ -2213,7 +2213,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;
@@ -2223,7 +2223,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;
@@ -2291,11 +2290,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) {
@@ -2561,57 +2562,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",
@@ -2626,11 +2576,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) {
@@ -2855,13 +2810,10 @@ class P2pRtcManager {
                 });
             }),
             this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
-                var _a, _b;
-                if (payload === null || payload === void 0 ? void 0 : payload.error) {
+                const { error } = payload;
+                if (error || !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;
@@ -2877,6 +2829,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) {
@@ -2988,7 +2949,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" &&
@@ -3001,7 +2962,6 @@ class P2pRtcManager {
                 peerConnectionConfig,
                 bandwidth: initialBandwidth,
                 deprioritizeH264Encoding,
-                shouldAddLocalVideo,
                 incrementAnalyticMetric: (metric) => this.analytics[metric]++,
             });
         }
@@ -3034,7 +2994,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");
         }
@@ -3063,7 +3023,6 @@ class P2pRtcManager {
             clientId,
             initialBandwidth,
             peerConnectionConfig,
-            shouldAddLocalVideo,
         });
         setTimeout(() => this._emit(rtcManagerEvents.NEW_PC), 0);
         this.analytics.numNewPc++;
@@ -3074,7 +3033,7 @@ class P2pRtcManager {
                 this.analytics.P2POnTrackNoStream++;
                 rtcStats.sendEvent("P2POnTrackNoStream", {
                     trackKind: event.track.kind,
-                    trackId: event.track.id
+                    trackId: event.track.id,
                 });
                 return;
             }
@@ -3161,30 +3120,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) {
@@ -3321,7 +3278,6 @@ class P2pRtcManager {
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
-            shouldAddLocalVideo: true,
             isOfferer: true,
         });
         this._negotiatePeerConnection(clientId, session);
@@ -3465,12 +3421,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;
@@ -3478,10 +3433,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) => {
@@ -3587,7 +3539,7 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
+    acceptNewStream({ streamId, clientId }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
@@ -3603,7 +3555,6 @@ class P2pRtcManager {
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
-            shouldAddLocalVideo: !!shouldAddLocalVideo,
             isOfferer: false,
         });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
@@ -3710,6 +3661,9 @@ class P2pRtcManager {
     hasClient(clientId) {
         return Object.keys(this.peerConnections).includes(clientId);
     }
+    shouldAcceptStreamsFromBothSides() {
+        return false;
+    }
 }
 
 class KalmanFilter {
@@ -5462,14 +5416,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;
@@ -5511,7 +5465,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];
@@ -5978,7 +5932,7 @@ class VegaRtcManager {
                 clientId,
                 stream: webcamStream,
                 streamId: camStreamId,
-                streamType: "webcam",
+                streamType: STREAM_TYPES.webcam,
             });
             clientState.hasEmittedWebcamStream = true;
         }
@@ -5987,7 +5941,7 @@ class VegaRtcManager {
                 clientId,
                 stream: screenStream,
                 streamId: screenShareStreamId,
-                streamType: "screenshare",
+                streamType: STREAM_TYPES.screenshare,
             });
             clientState.hasEmittedScreenStream = true;
         }
@@ -7556,5 +7510,5 @@ var RtcEventNames;
     RtcEventNames["stream_added"] = "stream_added";
 })(RtcEventNames || (RtcEventNames = {}));
 
-export { ADDITIONAL_SCREEN_SHARE_SETTINGS, AUDIO_SETTINGS, BandwidthTester, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, RtcStream, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, changeMediaDirection, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDeviceAsync, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, issueDetectorOrMetricEnabled, maybeRejectNoH264, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceTracksInStream, rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, trackAnnotations, turnServerOverride, variance };
+export { ADDITIONAL_SCREEN_SHARE_SETTINGS, AUDIO_SETTINGS, BandwidthTester, CAMERA_STREAM_ID, EVENTS, KNOCK_MESSAGES, KalmanFilter, Logger, MEDIA_JITTER_BUFFER_TARGET, NoDevicesError, P2pRtcManager, PROTOCOL_ERRORS, PROTOCOL_EVENTS, PROTOCOL_REQUESTS, PROTOCOL_RESPONSES, RELAY_MESSAGES, ReconnectManager, RtcEventNames, RtcManagerDispatcher, SCREEN_SHARE_SETTINGS, SCREEN_SHARE_SIMULCAST_SETTINGS, STREAM_TYPES, ServerSocket, Session, SfuV2Parser, TYPES, VIDEO_SETTINGS_HD, VIDEO_SETTINGS_SD, VIDEO_SETTINGS_VP9, VIDEO_SETTINGS_VP9_LOW_BANDWIDTH, VegaConnection, VegaMediaQualityMonitor, VegaRtcManager, addAbsCaptureTimeExtMap, addExtMap, assert, buildDeviceList, calculateStd, captureAudioSsrcMetrics, captureCandidatePairInfoMetrics, captureCommonSsrcMetrics, captureSsrcInfo, captureVideoSsrcMetrics, changeMediaDirection, cleanSdp, compareLocalDevices, createACFCalculator, createMicAnalyser, createWorker, deprioritizeH264, detectMicrophoneNotWorking, enumerate, external_stun_servers, filterMidExtension, filterMsidSemantic, fromLocation, generateByteString, getConstraints, getCurrentPeerConnections, getDeviceData, getDisplayMedia, getIssuesAndMetrics, getMediaConstraints, getMediaSettings, getMediasoupDeviceAsync, getNumFailedStatsReports, getNumFailedTrackSsrcLookups, getNumMissingTrackSsrcLookups, getPeerConnectionIndex, getStats, getStream, getUpdatedDevices, getUpdatedStats, getUserMedia, hasGetDisplayMedia, ipRegex, isMobile, issueDetectorOrMetricEnabled, maybeRejectNoH264, maybeTurnOnly, modifyMediaCapabilities, removePeerConnection, replaceTracksInStream, rtcManagerEvents, rtcStats, setClientProvider, setCodecPreferenceSDP, setPeerConnectionsForTests, setVideoBandwidthUsingSetParameters, sortCodecs, standardDeviation, startPerformanceMonitor, stopStreamTracks, subscribeIssues, subscribeStats, trackAnnotations, turnServerOverride, variance };
 //# sourceMappingURL=legacy-esm.js.map

package/package.json

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