@whereby.com/media 5.0.2 → 6.0.0

package/dist/legacy-esm.js

@@ -2505,11 +2505,75 @@ var rtcManagerEvents = {
 
 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({ audioWanted, videoWanted, disableAEC, disableAGC, hd, lax, lowDataMode, preferredDeviceIds, resolution, simulcast, widescreen, }) {
+    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 { audioId, videoId } = preferredDeviceIds;
+    const constraints = Object.assign(Object.assign({}, (audioWanted && {
+        audio: Object.assign(Object.assign(Object.assign({}, (audioId ? { deviceId: audioId } : {})), (disableAGC ? { autoGainControl: false } : {})), (disableAEC ? { echoCancellation: false } : {})),
+    })), (videoWanted && {
+        video: Object.assign({ height: lowDataMode ? LOW_HEIGHT : HIGH_HEIGHT, frameRate: lowDataMode && !simulcast ? 15 : 24 }, (videoId ? { deviceId: videoId } : { facingMode: "user" })),
+    }));
+    if (lax) {
+        if (audioWanted && !audioId)
+            constraints.audio = true;
+        if (videoWanted && !videoId && typeof constraints.video === "object") {
+            delete constraints.video.facingMode;
+        }
+        return constraints;
+    }
+    if (videoWanted && typeof constraints.video === "object") {
+        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;
+        }
+    }
+    return constraints;
+}
+function getConstraints({ devices, videoId, audioId, options, type = "ideal" }) {
+    const audioDevices = devices.filter((d) => d.kind === "audioinput");
+    const videoDevices = devices.filter((d) => d.kind === "videoinput");
+    const preferredDeviceIds = {};
+    if (typeof audioId === "string" && audioDevices.some((d) => d.deviceId === audioId)) {
+        preferredDeviceIds.audioId = { [type]: audioId };
+    }
+    if (typeof videoId === "string" && videoDevices.some((d) => d.deviceId === videoId)) {
+        preferredDeviceIds.videoId = { [type]: videoId };
+    }
+    const constraints = getMediaConstraints(Object.assign({ preferredDeviceIds, audioWanted: Boolean(audioId) && audioDevices.length > 0, videoWanted: Boolean(videoId) && videoDevices.length > 0 }, options));
+    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$1 = adapter$2.browserDetails) === null || _b$1 === void 0 ? void 0 : _b$1.browser;
-const browserVersion = adapter$2.browserDetails.version;
+const browserName$1 = (_b = adapter$1.browserDetails) === null || _b === void 0 ? void 0 : _b.browser;
+const browserVersion = adapter$1.browserDetails.version;
 let unloading$1 = false;
 if (browserName$1 === "chrome") {
     window.document.addEventListener("beforeunload", () => {
@@ -3494,7 +3558,7 @@ class P2pRtcManager {
         }
         else {
             if (localStream.getVideoTracks().length === 0) {
-                const constraints = this._webrtcProvider.getMediaConstraints().video;
+                const constraints = getConstraints(this._webrtcProvider.getMediaConstraints()).video;
                 if (!constraints) {
                     return;
                 }
@@ -4363,10 +4427,10 @@ const STREAM_TYPES = {
     screenshare: "screenshare",
 };
 
-var _a$1;
-const adapter$1 = (_a$1 = adapterRaw.default) !== null && _a$1 !== void 0 ? _a$1 : adapterRaw;
+var _a;
+const adapter = (_a = adapterRaw.default) !== null && _a !== void 0 ? _a : adapterRaw;
 const logger$2 = new Logger();
-const browserName = adapter$1.browserDetails.browser;
+const browserName = adapter.browserDetails.browser;
 let unloading = false;
 const RESTARTICE_ERROR_RETRY_THRESHOLD_IN_MS = 3500;
 const RESTARTICE_ERROR_MAX_RETRY_COUNT = 5;
@@ -5450,7 +5514,7 @@ class VegaRtcManager {
             }, stopCameraDelay);
         }
         else if (localStream.getVideoTracks().length === 0) {
-            const constraints = this._webrtcProvider.getMediaConstraints().video;
+            const constraints = getConstraints(this._webrtcProvider.getMediaConstraints()).video;
             navigator.mediaDevices
                 .getUserMedia({ video: constraints })
                 .then((stream) => {
@@ -6975,73 +7039,6 @@ 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 audioDevices = devices.filter((d) => d.kind === "audioinput");
-    const videoDevices = devices.filter((d) => d.kind === "videoinput");
-    const useDefaultAudio = !audioId || !audioDevices.some((d) => d.deviceId === audioId);
-    const useDefaultVideo = !videoId || !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 || !audioDevices.length) {
-        delete constraints.audio;
-    }
-    if (videoId === false || !videoDevices.length) {
-        delete constraints.video;
-    }
-    return constraints;
-}
-
 const logger = new Logger();
 const isMobile = /mobi/i.test(navigator.userAgent);
 class NoDevicesError extends Error {
@@ -7075,23 +7072,29 @@ function buildDeviceList({ busyDeviceIds, devices, kind }) {
             label: `${busyDeviceIds.includes(d.deviceId) ? "(busy) " : ""}${d.label || d.deviceId.slice(0, 5)}`,
             busy: busyDeviceIds.includes(d.deviceId),
         }));
-    return deviceList && deviceList.length !== 0
-        ? deviceList
-        : [{ [idFieldsByKind[kind]]: "", label: "Default" }];
+    return deviceList && deviceList.length !== 0 ? deviceList : [{ [idFieldsByKind[kind]]: "", label: "Default" }];
 }
 function getUserMedia(constraints) {
-    if (!constraints.audio && !constraints.video) {
-        return Promise.reject(new NoDevicesError("No provided devices"));
-    }
-    return navigator.mediaDevices.getUserMedia(constraints).catch((error) => {
-        const message = `${error}, ${JSON.stringify(constraints, null, 2)}`;
-        logger.error(`getUserMedia ${message}`);
-        throw error;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!constraints.audio && !constraints.video) {
+            throw new NoDevicesError("No provided devices");
+        }
+        try {
+            const stream = yield navigator.mediaDevices.getUserMedia(constraints);
+            return stream;
+        }
+        catch (error) {
+            const message = `${error}, ${JSON.stringify(constraints, null, 2)}`;
+            logger.error(`getUserMedia ${message}`);
+            throw error;
+        }
     });
 }
 function getSettingsFromTrack(kind, track, devices, lastUsedId) {
     var _a, _b, _c;
-    let settings = { deviceId: null };
+    let settings = {
+        deviceId: undefined,
+    };
     if (!track) {
         if (lastUsedId && devices) {
             settings.deviceId = (_a = devices.find((d) => d.deviceId === lastUsedId && d.kind === kind)) === null || _a === void 0 ? void 0 : _a.deviceId;
@@ -7115,11 +7118,10 @@ function getSettingsFromTrack(kind, track, devices, lastUsedId) {
     if (settings.deviceId)
         return settings;
     settings.deviceId = (_c = track.getConstraints()) === null || _c === void 0 ? void 0 : _c.deviceId;
-    settings.broken = 1;
     return settings;
 }
 function getDeviceData({ audioTrack, videoTrack, devices, stoppedVideoTrack, lastAudioId, lastVideoId, }) {
-    const usable = (d) => ((d === null || d === void 0 ? void 0 : d.readyState) === "live" ? d : null);
+    const usable = (d) => ((d === null || d === void 0 ? void 0 : d.readyState) === "live" ? d : undefined);
     videoTrack = usable(videoTrack) || stoppedVideoTrack;
     audioTrack = usable(audioTrack);
     const video = getSettingsFromTrack("videoinput", videoTrack, devices, lastVideoId);
@@ -7152,7 +7154,7 @@ function getStream(constraintOpt_1) {
         let newConstraints;
         let retryConstraintOpt;
         let stream = null;
-        const only = (constraintOpt.audioId === false && "video") || (constraintOpt.videoId === false && "audio");
+        const only = (!constraintOpt.audioId && "video") || (!constraintOpt.videoId && "audio");
         const stopTracks = isMobile || only !== "video";
         const constraints = getConstraints(constraintOpt);
         const addDetails = (err, orgErr) => {
@@ -7163,7 +7165,7 @@ function getStream(constraintOpt_1) {
                 return err;
             }
             else {
-                return new Error("Unknown error");
+                return new Error("GetStream: gUM rejected without error");
             }
         };
         const getSingleStream = (e) => __awaiter(this, void 0, void 0, function* () {
@@ -7197,12 +7199,18 @@ function getStream(constraintOpt_1) {
             }
             if ((e === null || e === void 0 ? void 0 : e.name) === "OverconstrainedError") {
                 const laxConstraints = {
-                    deviceId: { videoId: null, audioId: null },
+                    deviceId: { videoId: true, audioId: true },
                     width: { lax: true },
                     height: { lax: true },
-                    "": { audioId: null, videoId: null, lax: true },
+                    "": { audioId: true, videoId: true, lax: true },
                 };
                 retryConstraintOpt = laxConstraints[e.constraint || ""];
+                if (!constraintOpt.audioId || only === "video") {
+                    delete retryConstraintOpt.audioId;
+                }
+                if (!constraintOpt.videoId || only === "audio") {
+                    delete retryConstraintOpt.videoId;
+                }
             }
             else if ((e === null || e === void 0 ? void 0 : e.name) === "NotFoundError") {
                 yield getSingleStream(e);
@@ -7226,7 +7234,7 @@ function getStream(constraintOpt_1) {
                     const problemWith = { audio: "audioId", video: "videoId" }[((_a = /(video|audio)/.exec(errMsg)) === null || _a === void 0 ? void 0 : _a[0]) || only || ""];
                     if (!stream && problemWith) {
                         try {
-                            stream = yield getUserMedia(getConstraints(Object.assign(Object.assign({}, constraintOpt), { [problemWith]: null })));
+                            stream = yield getUserMedia(getConstraints(Object.assign(Object.assign({}, constraintOpt), { [problemWith]: true })));
                         }
                         catch (e2) {
                             logger.warn(`Re-tried ${problemWith} with no constraints, but failed: ${"" + e2}`);
@@ -7286,8 +7294,9 @@ const defaultDisplayMediaConstraints = {
         height: { max: window.screen.height },
     },
 };
-function getDisplayMedia(constraints = defaultDisplayMediaConstraints, contentHint = "detail") {
-    return navigator.mediaDevices.getDisplayMedia(constraints).then((stream) => {
+function getDisplayMedia() {
+    return __awaiter(this, arguments, void 0, function* (constraints = defaultDisplayMediaConstraints, contentHint = "detail") {
+        const stream = yield navigator.mediaDevices.getDisplayMedia(constraints);
         stream.getVideoTracks().forEach((t) => {
             if ("contentHint" in t) {
                 t.contentHint = contentHint;
@@ -7345,14 +7354,10 @@ function getUpdatedDevices({ oldDevices, newDevices, currentAudioId, currentVide
         }
         if (currentDeviceId) {
             if (changes.removed[currentDeviceId]) {
-                changedDevices[kind] = { deviceId: null };
-                if (kind === "audiooutput") {
-                    const fallbackSpeakerDevice = newDevices.find((d) => d.kind === "audiooutput");
-                    changedDevices[kind] = { deviceId: fallbackSpeakerDevice === null || fallbackSpeakerDevice === void 0 ? void 0 : fallbackSpeakerDevice.deviceId };
-                }
+                removedDevices[kind] = changes.removed[currentDeviceId];
             }
             if (changes.changed[currentDeviceId]) {
-                changedDevices[kind] = { deviceId: currentDeviceId };
+                changedDevices[kind] = changes.changed[currentDeviceId];
             }
         }
         if (Object.keys(changes.added).length > 0) {
@@ -7360,10 +7365,6 @@ function getUpdatedDevices({ oldDevices, newDevices, currentAudioId, currentVide
             const add = changes.added[deviceAdded];
             addedDevices[kind] = { deviceId: add.deviceId, label: add.label, kind: add.kind };
         }
-        if (Object.keys(changes.removed).length > 0) {
-            const [deviceRemoved] = Object.keys(changes.removed).slice(0, 1);
-            removedDevices[kind] = changes.removed[deviceRemoved];
-        }
     });
     return { addedDevices, changedDevices, removedDevices };
 }

package/package.json

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