@whereby.com/media 8.0.0 → 8.0.2

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;
@@ -2734,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) => {
@@ -2934,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");
         }
@@ -2958,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) {
@@ -3100,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) => {
@@ -3210,7 +3317,7 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession({
+        session = this._createSession({
             clientId,
             initialBandwidth,
             isOfferer: true,
@@ -3374,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);
@@ -3509,7 +3494,7 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession({
+        session = this._createSession({
             clientId,
             initialBandwidth,
             isOfferer: false,
@@ -6741,11 +6726,11 @@ class BandwidthTester extends EventEmitter {
         const wsUrl = `wss://${host}`;
         this._vegaConnection = new VegaConnection(wsUrl, "whereby-sfu#bw-test-v1");
         this._vegaConnection.on("open", () => this._start());
-        this._vegaConnection.on("close", () => this.close());
+        this._vegaConnection.on("close", () => this.close(true));
         this._vegaConnection.on("message", (message) => this._onMessage(message));
         this._startTimeout();
     }
-    close() {
+    close(vegaConnectionClosed) {
         logger$1.info("close()");
         this.closed = true;
         if (!!this._timeout || Date.now() - this._startTime < 750) {
@@ -6753,6 +6738,12 @@ class BandwidthTester extends EventEmitter {
                 error: true,
             });
         }
+        else if (vegaConnectionClosed && this._resultTimeout) {
+            this.emit("result", {
+                error: true,
+            });
+            clearTimeout(this._resultTimeout);
+        }
         this._clearTimeouts();
         clearInterval(this._drawInterval);
         this._drawInterval = null;
@@ -7095,9 +7086,7 @@ 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) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whereby.com/media",
   "description": "Media library for Whereby",
-  "version": "8.0.0",
+  "version": "8.0.2",
   "license": "MIT",
   "homepage": "https://github.com/whereby/sdk",
   "repository": {
@@ -61,10 +61,10 @@
     "prettier": "^3.5.3",
     "process": "^0.11.10",
     "typescript": "^5.8.3",
+    "@whereby.com/eslint-config": "0.1.0",
     "@whereby.com/jest-config": "0.1.0",
     "@whereby.com/prettier-config": "0.1.0",
     "@whereby.com/rollup-config": "0.1.1",
-    "@whereby.com/eslint-config": "0.1.0",
     "@whereby.com/tsconfig": "0.1.0"
   },
   "engines": {