@whereby.com/media 9.7.3 → 10.0.0

package/dist/legacy-esm.js

@@ -2430,79 +2430,11 @@ fromLocation(typeof window !== "undefined" ? window.location : undefined);
 
 var _a$2, _b$1;
 const adapter$2 = (_a$2 = adapterRaw.default) !== null && _a$2 !== void 0 ? _a$2 : adapterRaw;
-const isSafari = ((_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser) === "safari";
-const parseResolution = (res) => res.split(/[^\d]/g).map((n) => parseInt(n, 10));
-function getMediaConstraints({ disableAEC, disableAGC, hd, lax, lowDataMode, preferredDeviceIds, resolution, simulcast, widescreen, }) {
-    var _a, _b;
-    let HIGH_HEIGHT = 480;
-    let LOW_HEIGHT = 240;
-    if (hd) {
-        HIGH_HEIGHT = lax || isSafari ? 720 : { min: 360, ideal: 720 };
-    }
-    if (simulcast) {
-        if (hd === false) {
-            HIGH_HEIGHT = 360;
-            LOW_HEIGHT = 270;
-        }
-        else {
-            LOW_HEIGHT = 360;
-        }
-    }
-    const constraints = {
-        audio: Object.assign({}, (preferredDeviceIds.audioId && { deviceId: preferredDeviceIds.audioId })),
-        video: Object.assign(Object.assign({}, (preferredDeviceIds.videoId ? { deviceId: preferredDeviceIds.videoId } : { facingMode: "user" })), { height: lowDataMode ? LOW_HEIGHT : HIGH_HEIGHT, frameRate: lowDataMode && !simulcast ? 15 : 24 }),
-    };
-    if (lax) {
-        if (!((_a = constraints.audio) === null || _a === void 0 ? void 0 : _a.deviceId))
-            constraints.audio = true;
-        (_b = constraints.video) === null || _b === void 0 ? true : delete _b.facingMode;
-        return constraints;
-    }
-    if (resolution) {
-        const [w, h, fps] = parseResolution(resolution);
-        if (w)
-            constraints.video.width = { exact: w };
-        if (h)
-            constraints.video.height = { exact: h };
-        if (fps)
-            constraints.video.frameRate = { exact: fps };
-        delete constraints.video.facingMode;
-    }
-    else {
-        constraints.video.aspectRatio = widescreen ? 16 / 9 : 4 / 3;
-    }
-    if (disableAGC)
-        constraints.audio.autoGainControl = false;
-    if (disableAEC)
-        constraints.audio.echoCancellation = false;
-    return constraints;
-}
-function getConstraints({ devices, videoId, audioId, options, type = "ideal" }) {
-    const strict = !!devices;
-    const audioDevices = devices === null || devices === void 0 ? void 0 : devices.filter((d) => d.kind === "audioinput");
-    const videoDevices = devices === null || devices === void 0 ? void 0 : devices.filter((d) => d.kind === "videoinput");
-    const useDefaultAudio = !audioId || (strict && !(audioDevices === null || audioDevices === void 0 ? void 0 : audioDevices.some((d) => d.deviceId === audioId)));
-    const useDefaultVideo = !videoId || (strict && !(videoDevices === null || videoDevices === void 0 ? void 0 : videoDevices.some((d) => d.deviceId === videoId)));
-    const constraints = getMediaConstraints(Object.assign({ preferredDeviceIds: {
-            audioId: useDefaultAudio ? null : { [type]: audioId },
-            videoId: useDefaultVideo ? null : { [type]: videoId },
-        } }, options));
-    if (audioId === false || (strict && !(audioDevices === null || audioDevices === void 0 ? void 0 : audioDevices.length))) {
-        delete constraints.audio;
-    }
-    if (videoId === false || (strict && !(videoDevices === null || videoDevices === void 0 ? void 0 : videoDevices.length))) {
-        delete constraints.video;
-    }
-    return constraints;
-}
-
-var _a$1, _b;
-const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$6 = new Logger();
 const ICE_PUBLIC_IP_GATHERING_TIMEOUT = 3 * 1000;
 const ICE_RESTART_DELAY = 2 * 1000;
-const browserName$1 = (_b = adapter$1.browserDetails) === null || _b === void 0 ? void 0 : _b.browser;
-const browserVersion = adapter$1.browserDetails.version;
+const browserName$1 = (_b$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
+const browserVersion = adapter$2.browserDetails.version;
 let unloading$1 = false;
 if (browserName$1 === "chrome") {
     window.document.addEventListener("beforeunload", () => {
@@ -2528,7 +2460,6 @@ class P2pRtcManager {
         this._closed = false;
         this._videoTrackIdByStreamId = {};
         this._fetchMediaServersTimer = null;
-        this._stopCameraTimeout = null;
         this._icePublicIPGatheringTimeoutID = null;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._audioTrackOnEnded = () => {
@@ -2548,7 +2479,6 @@ class P2pRtcManager {
         });
         this.analytics = {
             P2POffendingInitialOffer: 0,
-            P2PNonErrorRejectionValueGUMError: 0,
             numNewPc: 0,
             numIceConnected: 0,
             numIceDisconnected: 0,
@@ -2581,9 +2511,8 @@ class P2pRtcManager {
     isInitializedWith({ selfId, roomName, isSfu }) {
         return this._selfId === selfId && this._roomName === roomName && !isSfu;
     }
-    addCameraStream(stream, { videoPaused, beforeEffectTracks = [] } = { beforeEffectTracks: [] }) {
+    addCameraStream(stream, { beforeEffectTracks = [] } = { beforeEffectTracks: [] }) {
         logger$6.info("addCameraStream: [stream.id: %s]", stream.id);
-        this._webcamPaused = videoPaused;
         if (stream === this._localCameraStream) {
             return;
         }
@@ -3460,65 +3389,7 @@ class P2pRtcManager {
             }
         }
     }
-    stopOrResumeVideo(localStream, enable) {
-        var _a;
-        logger$6.info("stopOrResumeVideo() [enable: %s]", enable);
-        this._webcamPaused = !enable;
-        if (!["chrome", "safari"].includes(browserName$1)) {
-            return;
-        }
-        if (this._stopCameraTimeout) {
-            clearTimeout(this._stopCameraTimeout);
-            this._stopCameraTimeout = null;
-        }
-        if (enable === false) {
-            const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
-            this._stopCameraTimeout = setTimeout(() => {
-                localStream.getVideoTracks().forEach((track) => {
-                    if (track.enabled === false) {
-                        track.stop();
-                        localStream.removeTrack(track);
-                        this._emit(EVENTS.LOCAL_STREAM_TRACK_REMOVED, {
-                            stream: localStream,
-                            track,
-                        });
-                        this._handleStopOrResumeVideo({ enable, track });
-                    }
-                });
-            }, stopCameraDelay);
-        }
-        else {
-            if (localStream.getVideoTracks().length === 0) {
-                const constraints = getConstraints(this._webrtcProvider.getMediaOptions()).video;
-                if (!constraints) {
-                    return;
-                }
-                navigator.mediaDevices
-                    .getUserMedia({ video: constraints })
-                    .then((stream) => {
-                    const track = stream.getVideoTracks()[0];
-                    if (this._webcamPaused) {
-                        track.stop();
-                        return;
-                    }
-                    localStream.addTrack(track);
-                    this._monitorVideoTrack(track);
-                    this._emit(EVENTS.LOCAL_STREAM_TRACK_ADDED, {
-                        streamId: localStream.id,
-                        tracks: [track],
-                        screenShare: false,
-                    });
-                    this._handleStopOrResumeVideo({ enable, track });
-                })
-                    .catch((e) => {
-                    if (!(e instanceof Error)) {
-                        this.analytics.P2PNonErrorRejectionValueGUMError++;
-                        e = new Error(`non-error gUM rejection value: ${JSON.stringify(e)}`);
-                    }
-                    throw e;
-                });
-            }
-        }
+    stopOrResumeVideo() {
     }
     removeScreenshareStream(stream, { requestedByClientId } = {}) {
         logger$6.info("removeScreenshareStream() [stream.id: %s, requestedByClientId: %s]", stream.id, requestedByClientId);
@@ -4386,10 +4257,10 @@ const STREAM_TYPES = {
     screenshare: "screenshare",
 };
 
-var _a;
-const adapter = (_a = adapterRaw.default) !== null && _a !== void 0 ? _a : adapterRaw;
+var _a$1;
+const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
 const logger$2 = new Logger();
-const browserName = adapter.browserDetails.browser;
+const browserName = adapter$1.browserDetails.browser;
 let unloading = false;
 const RESTARTICE_ERROR_RETRY_THRESHOLD_IN_MS = 3500;
 const RESTARTICE_ERROR_MAX_RETRY_COUNT = 5;
@@ -4440,7 +4311,6 @@ class VegaRtcManager {
         this._sndTransportIceRestartPromise = null;
         this._rcvTransportIceRestartPromise = null;
         this._colocation = null;
-        this._stopCameraTimeout = null;
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading });
             this._emitToPWA(rtcManagerEvents.MICROPHONE_STOPPED_WORKING, {});
@@ -4483,7 +4353,6 @@ class VegaRtcManager {
             vegaIceRestarts: 0,
             vegaIceRestartMissingTransport: 0,
             vegaIceRestartWrongTransportId: 0,
-            vegaNonErrorRejectionValueGUMError: 0,
             vegaReplaceTrackNoProducerNoEnabledTrack: 0,
             vegaMicProducerFailed: 0,
             vegaWebcamProducerFailed: 0,
@@ -5533,9 +5402,9 @@ class VegaRtcManager {
             return;
         }
     }
-    stopOrResumeAudio(stream, enabled) {
-        logger$2.info("stopOrResumeAudio() [enabled:%s]", enabled);
-        this._micPaused = !enabled;
+    stopOrResumeAudio({ enable }) {
+        logger$2.info("stopOrResumeAudio() [enable:%s]", enable);
+        this._micPaused = !enable;
         this._pauseResumeMic();
     }
     _handleStopOrResumeVideo({ enable, track }) {
@@ -5550,61 +5419,10 @@ class VegaRtcManager {
             this._sendWebcam(track);
         }
     }
-    stopOrResumeVideo(localStream, enable) {
-        var _a;
+    stopOrResumeVideo({ enable }) {
         logger$2.info("stopOrResumeVideo() [enable:%s]", enable);
         this._webcamPaused = !enable;
         this._pauseResumeWebcam();
-        if (!["chrome", "safari"].includes(browserName)) {
-            return;
-        }
-        if (this._stopCameraTimeout) {
-            clearTimeout(this._stopCameraTimeout);
-            this._stopCameraTimeout = null;
-        }
-        if (!enable) {
-            const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
-            this._stopCameraTimeout = setTimeout(() => {
-                localStream.getVideoTracks().forEach((track) => {
-                    if (track.enabled === false) {
-                        track.stop();
-                        localStream.removeTrack(track);
-                        this._emitToPWA(EVENTS.LOCAL_STREAM_TRACK_REMOVED, {
-                            stream: localStream,
-                            track,
-                        });
-                        this._handleStopOrResumeVideo({ enable, track });
-                    }
-                });
-            }, stopCameraDelay);
-        }
-        else if (localStream.getVideoTracks().length === 0) {
-            const constraints = getConstraints(this._webrtcProvider.getMediaOptions()).video;
-            navigator.mediaDevices
-                .getUserMedia({ video: constraints })
-                .then((stream) => {
-                const track = stream.getVideoTracks()[0];
-                if (this._webcamPaused) {
-                    track.stop();
-                    return;
-                }
-                localStream.addTrack(track);
-                this._monitorVideoTrack(track);
-                this._emitToPWA(EVENTS.LOCAL_STREAM_TRACK_ADDED, {
-                    streamId: localStream.id,
-                    tracks: [track],
-                    screenShare: false,
-                });
-                this._handleStopOrResumeVideo({ enable, track });
-            })
-                .catch((e) => {
-                if (!(e instanceof Error)) {
-                    this.analytics.vegaNonErrorRejectionValueGUMError++;
-                    e = new Error(`non-error gUM rejection value: ${JSON.stringify(e)}`);
-                }
-                throw e;
-            });
-        }
     }
     acceptNewStream({ streamId, clientId }) {
         logger$2.info("acceptNewStream()", { streamId, clientId });
@@ -7213,6 +7031,74 @@ class BandwidthTester extends EventEmitter {
     }
 }
 
+var _a, _b;
+const adapter = (_a = adapterRaw.default) !== null && _a !== void 0 ? _a : adapterRaw;
+const isSafari = ((_b = adapter.browserDetails) === null || _b === void 0 ? void 0 : _b.browser) === "safari";
+const parseResolution = (res) => res.split(/[^\d]/g).map((n) => parseInt(n, 10));
+function getMediaConstraints({ disableAEC, disableAGC, hd, lax, lowDataMode, preferredDeviceIds, resolution, simulcast, widescreen, }) {
+    var _a, _b;
+    let HIGH_HEIGHT = 480;
+    let LOW_HEIGHT = 240;
+    if (hd) {
+        HIGH_HEIGHT = lax || isSafari ? 720 : { min: 360, ideal: 720 };
+    }
+    if (simulcast) {
+        if (hd === false) {
+            HIGH_HEIGHT = 360;
+            LOW_HEIGHT = 270;
+        }
+        else {
+            LOW_HEIGHT = 360;
+        }
+    }
+    const constraints = {
+        audio: Object.assign({}, (preferredDeviceIds.audioId && { deviceId: preferredDeviceIds.audioId })),
+        video: Object.assign(Object.assign({}, (preferredDeviceIds.videoId ? { deviceId: preferredDeviceIds.videoId } : { facingMode: "user" })), { height: lowDataMode ? LOW_HEIGHT : HIGH_HEIGHT, frameRate: lowDataMode && !simulcast ? 15 : 24 }),
+    };
+    if (lax) {
+        if (!((_a = constraints.audio) === null || _a === void 0 ? void 0 : _a.deviceId))
+            constraints.audio = true;
+        (_b = constraints.video) === null || _b === void 0 ? true : delete _b.facingMode;
+        return constraints;
+    }
+    if (resolution) {
+        const [w, h, fps] = parseResolution(resolution);
+        if (w)
+            constraints.video.width = { exact: w };
+        if (h)
+            constraints.video.height = { exact: h };
+        if (fps)
+            constraints.video.frameRate = { exact: fps };
+        delete constraints.video.facingMode;
+    }
+    else {
+        constraints.video.aspectRatio = widescreen ? 16 / 9 : 4 / 3;
+    }
+    if (disableAGC)
+        constraints.audio.autoGainControl = false;
+    if (disableAEC)
+        constraints.audio.echoCancellation = false;
+    return constraints;
+}
+function getConstraints({ devices, videoId, audioId, options, type = "ideal" }) {
+    const strict = !!devices;
+    const audioDevices = devices === null || devices === void 0 ? void 0 : devices.filter((d) => d.kind === "audioinput");
+    const videoDevices = devices === null || devices === void 0 ? void 0 : devices.filter((d) => d.kind === "videoinput");
+    const useDefaultAudio = !audioId || (strict && !(audioDevices === null || audioDevices === void 0 ? void 0 : audioDevices.some((d) => d.deviceId === audioId)));
+    const useDefaultVideo = !videoId || (strict && !(videoDevices === null || videoDevices === void 0 ? void 0 : videoDevices.some((d) => d.deviceId === videoId)));
+    const constraints = getMediaConstraints(Object.assign({ preferredDeviceIds: {
+            audioId: useDefaultAudio ? null : { [type]: audioId },
+            videoId: useDefaultVideo ? null : { [type]: videoId },
+        } }, options));
+    if (audioId === false || (strict && !(audioDevices === null || audioDevices === void 0 ? void 0 : audioDevices.length))) {
+        delete constraints.audio;
+    }
+    if (videoId === false || (strict && !(videoDevices === null || videoDevices === void 0 ? void 0 : videoDevices.length))) {
+        delete constraints.video;
+    }
+    return constraints;
+}
+
 const logger = new Logger();
 const isMobile = typeof navigator !== "undefined" && /mobi/i.test(navigator.userAgent);
 class NoDevicesError extends Error {
@@ -7286,9 +7172,9 @@ function getSettingsFromTrack(kind, track, devices, lastUsedId) {
     settings.deviceId = (_c = track.getConstraints()) === null || _c === void 0 ? void 0 : _c.deviceId;
     return settings;
 }
-function getDeviceData({ audioTrack, videoTrack, devices, stoppedVideoTrack, lastAudioId, lastVideoId, }) {
+function getDeviceData({ audioTrack, videoTrack, devices, lastAudioId, lastVideoId, }) {
     const usable = (d) => ((d === null || d === void 0 ? void 0 : d.readyState) === "live" ? d : null);
-    videoTrack = usable(videoTrack) || stoppedVideoTrack;
+    videoTrack = usable(videoTrack);
     audioTrack = usable(audioTrack);
     const video = getSettingsFromTrack("videoinput", videoTrack, devices, lastVideoId);
     const audio = getSettingsFromTrack("audioinput", audioTrack, devices, lastAudioId);
@@ -7381,8 +7267,12 @@ function getInitialStream(constraintOpt) {
                 }
                 catch (e) {
                     logger.error(e);
+                    lastError = e;
                 }
             }
+            if ((lastError === null || lastError === void 0 ? void 0 : lastError.name) === "NotAllowedError") {
+                return;
+            }
             try {
                 retryOpts.options.lax = true;
                 stream = yield attempt(getConstraints(retryOpts));

package/package.json

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