@whereby.com/media 7.0.1 → 8.0.1

package/dist/legacy-esm.js

@@ -2196,8 +2196,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, incrementAnalyticMetric, }) {
-        this.peerConnectionId = peerConnectionId;
+    constructor({ clientId, bandwidth, peerConnectionConfig, deprioritizeH264Encoding, incrementAnalyticMetric, }) {
         this.relayCandidateSeen = false;
         this.serverReflexiveCandidateSeen = false;
         this.publicHostCandidateSeen = false;
@@ -2513,11 +2512,78 @@ 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({ 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;
+}
+
+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", () => {
@@ -2667,8 +2733,8 @@ class P2pRtcManager {
     }
     disconnectAll() {
         logger$6.info("disconnectAll()");
-        Object.keys(this.peerConnections).forEach((peerConnectionId) => {
-            this.disconnect(peerConnectionId);
+        Object.keys(this.peerConnections).forEach((clientId) => {
+            this.disconnect(clientId);
         });
         this.peerConnections = {};
         this._socketListenerDeregisterFunctions.forEach((func) => {
@@ -2867,16 +2933,14 @@ class P2pRtcManager {
     _emit(eventName, data) {
         this._emitter.emit(eventName, data);
     }
-    _getSession(peerConnectionId) {
-        if (!(peerConnectionId in this.peerConnections)) {
+    _getSession(clientId) {
+        if (!(clientId in this.peerConnections)) {
             return null;
         }
-        return this.peerConnections[peerConnectionId];
+        return this.peerConnections[clientId];
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId }) {
-        if (!peerConnectionId) {
-            throw new Error("peerConnectionId is missing");
-        }
+    _createSession({ clientId, initialBandwidth, isOfferer }) {
+        var _a, _b;
         if (!clientId) {
             throw new Error("clientId is missing");
         }
@@ -2891,17 +2955,121 @@ class P2pRtcManager {
             browserVersion >= 14 &&
             this._features.deprioritizeH264OnSafari;
         const session = new Session({
-            peerConnectionId,
             clientId,
             peerConnectionConfig,
             bandwidth: initialBandwidth,
             deprioritizeH264Encoding,
             incrementAnalyticMetric: (metric) => this.analytics[metric]++,
         });
-        this.peerConnections[peerConnectionId] = session;
+        this.peerConnections[clientId] = session;
         setTimeout(() => this._emit(rtcManagerEvents.NEW_PC), 0);
         this.analytics.numNewPc++;
         const { pc } = session;
+        pc.onicegatheringstatechange = (event) => {
+            const connection = event.target;
+            switch (connection.iceGatheringState) {
+                case "gathering":
+                    if (this._icePublicIPGatheringTimeoutID)
+                        clearTimeout(this._icePublicIPGatheringTimeoutID);
+                    this._icePublicIPGatheringTimeoutID = setTimeout(() => {
+                        if (!session.publicHostCandidateSeen &&
+                            !session.relayCandidateSeen &&
+                            !session.serverReflexiveCandidateSeen) {
+                            if (pc.iceConnectionState !== "connected" && pc.iceConnectionState !== "completed")
+                                this.analytics.numIceNoPublicIpGatheredIn3sec++;
+                        }
+                    }, ICE_PUBLIC_IP_GATHERING_TIMEOUT);
+                    break;
+                case "complete":
+                    if (this._icePublicIPGatheringTimeoutID)
+                        clearTimeout(this._icePublicIPGatheringTimeoutID);
+                    this._icePublicIPGatheringTimeoutID = null;
+                    break;
+            }
+        };
+        pc.onicecandidate = (event) => {
+            if (event.candidate) {
+                if (event.candidate.type === "relayed") {
+                    this.analytics.P2PRelayedIceCandidate++;
+                }
+                switch (event.candidate.type) {
+                    case "host":
+                        const address = event.candidate.address;
+                        if (!address) {
+                            break;
+                        }
+                        try {
+                            if (ipRegex.v4({ exact: true }).test(address)) {
+                                const ipv4 = checkIp(address);
+                                if (ipv4.isPublicIp)
+                                    session.publicHostCandidateSeen = true;
+                            }
+                            else if (ipRegex.v6({ exact: true }).test(address.replace(/^\[(.*)\]/, "$1"))) {
+                                const ipv6 = new Address6(address.replace(/^\[(.*)\]/, "$1"));
+                                session.ipv6HostCandidateSeen = true;
+                                if (ipv6.getScope() === "Global") {
+                                    session.publicHostCandidateSeen = true;
+                                }
+                                if (ipv6.isTeredo()) {
+                                    session.ipv6HostCandidateTeredoSeen = true;
+                                }
+                                if (ipv6.is6to4()) {
+                                    session.ipv6HostCandidate6to4Seen = true;
+                                }
+                            }
+                            else {
+                                const uuidv4 = address.replace(/.local/, "");
+                                if (uuidv4 && validate(uuidv4, 4)) {
+                                    session.mdnsHostCandidateSeen = true;
+                                }
+                            }
+                        }
+                        catch (error) {
+                            logger$6.info("Error during parsing candidates! Error: ", { error });
+                        }
+                        break;
+                    case "srflx":
+                        session.serverReflexiveCandidateSeen = true;
+                        break;
+                    case "relayed":
+                    case "relay":
+                        session.relayCandidateSeen = true;
+                        break;
+                }
+                this._emitServerEvent(RELAY_MESSAGES.ICE_CANDIDATE, {
+                    receiverId: clientId,
+                    message: event.candidate,
+                });
+            }
+            else {
+                this._emitServerEvent(RELAY_MESSAGES.ICE_END_OF_CANDIDATES, {
+                    receiverId: clientId,
+                });
+                if (!session.publicHostCandidateSeen &&
+                    !session.relayCandidateSeen &&
+                    !session.serverReflexiveCandidateSeen &&
+                    pc.iceConnectionState !== "connected" &&
+                    pc.iceConnectionState !== "completed") {
+                    this.analytics.numIceNoPublicIpGathered++;
+                }
+                if (session.ipv6HostCandidateSeen) {
+                    this.analytics.numIceIpv6Seen++;
+                    if (session.ipv6HostCandidate6to4Seen)
+                        this.analytics.numIceIpv6SixToFour++;
+                    if (session.ipv6HostCandidateTeredoSeen)
+                        this.analytics.numIceIpv6TeredoSeen++;
+                }
+                if (session.mdnsHostCandidateSeen)
+                    this.analytics.numIceMdnsSeen++;
+            }
+        };
+        pc.onnegotiationneeded = () => {
+            if (pc.iceConnectionState === "new" || !session.connectionStatus) {
+                return;
+            }
+            logger$6.info(`onnegotiationneeded client ${clientId}`);
+            this._negotiatePeerConnection({ clientId, session });
+        };
         pc.ontrack = (event) => {
             const stream = event.streams[0];
             if (!stream) {
@@ -3033,16 +3201,22 @@ class P2pRtcManager {
                 });
             }
         }
+        if (this._features.increaseIncomingMediaBufferOn) {
+            this._setJitterBufferTarget(pc);
+        }
+        if (((_b = (_a = this._localCameraStream) === null || _a === void 0 ? void 0 : _a.getVideoTracks()) === null || _b === void 0 ? void 0 : _b.length) && this._stoppedVideoTrack) {
+            pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
+        }
         return session;
     }
-    _cleanup(peerConnectionId) {
-        const session = this._getSession(peerConnectionId);
+    _cleanup(clientId) {
+        const session = this._getSession(clientId);
         if (!session) {
-            logger$6.warn("No RTCPeerConnection in RTCManager.disconnect()", peerConnectionId);
+            logger$6.warn("No RTCPeerConnection in RTCManager.disconnect()", clientId);
             return;
         }
         session.close();
-        delete this.peerConnections[peerConnectionId];
+        delete this.peerConnections[clientId];
     }
     _forEachPeerConnection(func) {
         Object.values(this.peerConnections).forEach((peerConnection) => {
@@ -3143,7 +3317,7 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession({
+        session = this._createSession({
             clientId,
             initialBandwidth,
             isOfferer: true,
@@ -3307,128 +3481,6 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession({ clientId, initialBandwidth, isOfferer = false, }) {
-        var _a, _b;
-        const session = this._createSession({
-            peerConnectionId: clientId,
-            clientId,
-            initialBandwidth,
-            isOfferer,
-        });
-        const pc = session.pc;
-        if (this._features.increaseIncomingMediaBufferOn) {
-            this._setJitterBufferTarget(pc);
-        }
-        if (((_b = (_a = this._localCameraStream) === null || _a === void 0 ? void 0 : _a.getVideoTracks()) === null || _b === void 0 ? void 0 : _b.length) && this._stoppedVideoTrack) {
-            pc.addTrack(this._stoppedVideoTrack, this._localCameraStream);
-        }
-        pc.onicegatheringstatechange = (event) => {
-            const connection = event.target;
-            switch (connection.iceGatheringState) {
-                case "gathering":
-                    if (this._icePublicIPGatheringTimeoutID)
-                        clearTimeout(this._icePublicIPGatheringTimeoutID);
-                    this._icePublicIPGatheringTimeoutID = setTimeout(() => {
-                        if (!session.publicHostCandidateSeen &&
-                            !session.relayCandidateSeen &&
-                            !session.serverReflexiveCandidateSeen) {
-                            if (pc.iceConnectionState !== "connected" && pc.iceConnectionState !== "completed")
-                                this.analytics.numIceNoPublicIpGatheredIn3sec++;
-                        }
-                    }, ICE_PUBLIC_IP_GATHERING_TIMEOUT);
-                    break;
-                case "complete":
-                    if (this._icePublicIPGatheringTimeoutID)
-                        clearTimeout(this._icePublicIPGatheringTimeoutID);
-                    this._icePublicIPGatheringTimeoutID = null;
-                    break;
-            }
-        };
-        pc.onicecandidate = (event) => {
-            if (event.candidate) {
-                if (event.candidate.type === "relayed") {
-                    this.analytics.P2PRelayedIceCandidate++;
-                }
-                switch (event.candidate.type) {
-                    case "host":
-                        const address = event.candidate.address;
-                        if (!address) {
-                            break;
-                        }
-                        try {
-                            if (ipRegex.v4({ exact: true }).test(address)) {
-                                const ipv4 = checkIp(address);
-                                if (ipv4.isPublicIp)
-                                    session.publicHostCandidateSeen = true;
-                            }
-                            else if (ipRegex.v6({ exact: true }).test(address.replace(/^\[(.*)\]/, "$1"))) {
-                                const ipv6 = new Address6(address.replace(/^\[(.*)\]/, "$1"));
-                                session.ipv6HostCandidateSeen = true;
-                                if (ipv6.getScope() === "Global") {
-                                    session.publicHostCandidateSeen = true;
-                                }
-                                if (ipv6.isTeredo()) {
-                                    session.ipv6HostCandidateTeredoSeen = true;
-                                }
-                                if (ipv6.is6to4()) {
-                                    session.ipv6HostCandidate6to4Seen = true;
-                                }
-                            }
-                            else {
-                                const uuidv4 = address.replace(/.local/, "");
-                                if (uuidv4 && validate(uuidv4, 4)) {
-                                    session.mdnsHostCandidateSeen = true;
-                                }
-                            }
-                        }
-                        catch (error) {
-                            logger$6.info("Error during parsing candidates! Error: ", { error });
-                        }
-                        break;
-                    case "srflx":
-                        session.serverReflexiveCandidateSeen = true;
-                        break;
-                    case "relayed":
-                    case "relay":
-                        session.relayCandidateSeen = true;
-                        break;
-                }
-                this._emitServerEvent(RELAY_MESSAGES.ICE_CANDIDATE, {
-                    receiverId: clientId,
-                    message: event.candidate,
-                });
-            }
-            else {
-                this._emitServerEvent(RELAY_MESSAGES.ICE_END_OF_CANDIDATES, {
-                    receiverId: clientId,
-                });
-                if (!session.publicHostCandidateSeen &&
-                    !session.relayCandidateSeen &&
-                    !session.serverReflexiveCandidateSeen &&
-                    pc.iceConnectionState !== "connected" &&
-                    pc.iceConnectionState !== "completed") {
-                    this.analytics.numIceNoPublicIpGathered++;
-                }
-                if (session.ipv6HostCandidateSeen) {
-                    this.analytics.numIceIpv6Seen++;
-                    if (session.ipv6HostCandidate6to4Seen)
-                        this.analytics.numIceIpv6SixToFour++;
-                    if (session.ipv6HostCandidateTeredoSeen)
-                        this.analytics.numIceIpv6TeredoSeen++;
-                }
-                if (session.mdnsHostCandidateSeen)
-                    this.analytics.numIceMdnsSeen++;
-            }
-        };
-        pc.onnegotiationneeded = () => {
-            if (pc.iceConnectionState === "new" || !session.connectionStatus) {
-                return;
-            }
-            logger$6.info(`onnegotiationneeded client ${clientId}`);
-            this._negotiatePeerConnection({ clientId, session });
-        };
-        return session;
-    }
     acceptNewStream({ streamId, clientId }) {
         logger$6.info("acceptNewStream() [streamId: %s}, clientId: %s]", streamId, clientId);
         let session = this._getSession(clientId);
@@ -3442,7 +3494,7 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession({
+        session = this._createSession({
             clientId,
             initialBandwidth,
             isOfferer: false,
@@ -3511,7 +3563,7 @@ class P2pRtcManager {
         }
         else {
             if (localStream.getVideoTracks().length === 0) {
-                const constraints = this._webrtcProvider.getMediaConstraints().video;
+                const constraints = getConstraints(this._webrtcProvider.getMediaOptions()).video;
                 if (!constraints) {
                     return;
                 }
@@ -4380,10 +4432,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;
@@ -5470,7 +5522,7 @@ class VegaRtcManager {
             }, stopCameraDelay);
         }
         else if (localStream.getVideoTracks().length === 0) {
-            const constraints = this._webrtcProvider.getMediaConstraints().video;
+            const constraints = getConstraints(this._webrtcProvider.getMediaOptions()).video;
             navigator.mediaDevices
                 .getUserMedia({ video: constraints })
                 .then((stream) => {
@@ -6995,73 +7047,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 {
@@ -7135,7 +7120,6 @@ 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, }) {

package/package.json

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