@whereby.com/media 1.14.1 → 1.15.0

package/dist/index.mjs

@@ -1400,10 +1400,6 @@ class VegaConnection extends EventEmitter {
         var _a;
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
     }
-    isConnected() {
-        var _a, _b;
-        return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN || ((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.CONNECTING;
-    }
     _onOpen() {
         logger$9.info("Connected");
         this.emit("open");
@@ -3523,7 +3519,6 @@ class P2pRtcManager {
         this._isAudioOnlyMode = false;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._pendingActionsForConnectedPeerConnections = [];
-        this._nodeJsClients = [];
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading: unloading$1 });
             this._emit(rtcManagerEvents.MICROPHONE_STOPPED_WORKING, {});
@@ -3639,11 +3634,6 @@ class P2pRtcManager {
     setupSocketListeners() {
         this._socketListenerDeregisterFunctions = [
             () => this._clearMediaServersRefresh(),
-            this._serverSocket.on(PROTOCOL_RESPONSES.NEW_CLIENT, (data) => {
-                if (data.client.isDialIn && !this._nodeJsClients.includes(data.client.id)) {
-                    this._nodeJsClients.push(data.client.id);
-                }
-            }),
             this._serverSocket.on(PROTOCOL_RESPONSES.MEDIASERVER_CONFIG, (data) => {
                 if (data.error) {
                     logger$4.warn("FETCH_MEDIASERVER_CONFIG failed:", data.error);
@@ -3841,7 +3831,7 @@ class P2pRtcManager {
     _transformOutgoingSdp(original) {
         return { type: original.type, sdpU: original.sdp };
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, enforceTurnProtocol, }) {
+    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
         }
@@ -3877,13 +3867,13 @@ class P2pRtcManager {
                 return entry;
             });
         }
-        if (enforceTurnProtocol || this._features.useOnlyTURN) {
+        if (this._features.useOnlyTURN) {
             peerConnectionConfig.iceTransportPolicy = "relay";
             const filter = {
                 onlyudp: /^turn:.*transport=udp$/,
                 onlytcp: /^turn:.*transport=tcp$/,
                 onlytls: /^turns:.*transport=tcp$/,
-            }[enforceTurnProtocol || this._features.useOnlyTURN];
+            }[this._features.useOnlyTURN];
             if (filter) {
                 peerConnectionConfig.iceServers = peerConnectionConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
             }
@@ -4143,16 +4133,11 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        let enforceTurnProtocol;
-        if (this._nodeJsClients.includes(clientId)) {
-            enforceTurnProtocol = this._features.isNodeSdk ? "onlyudp" : "onlytls";
-        }
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
             shouldAddLocalVideo: true,
             isOfferer: true,
-            enforceTurnProtocol,
         });
         this._negotiatePeerConnection(clientId, session);
         return Promise.resolve(session);
@@ -4324,14 +4309,13 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, enforceTurnProtocol, }) {
+    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, }) {
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
             initialBandwidth,
             shouldAddLocalVideo,
             isOfferer,
-            enforceTurnProtocol,
         });
         const pc = session.pc;
         if (this._features.increaseIncomingMediaBufferOn) {
@@ -4445,7 +4429,7 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, enforceTurnProtocol, }) {
+    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
@@ -4462,7 +4446,6 @@ class P2pRtcManager {
             clientId,
             initialBandwidth,
             shouldAddLocalVideo: !!shouldAddLocalVideo,
-            enforceTurnProtocol,
             isOfferer: false,
         });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
@@ -5059,6 +5042,7 @@ class VegaRtcManager {
         this._socketListenerDeregisterFunctions = [];
         this._reconnect = true;
         this._reconnectTimeOut = null;
+        this._hasVegaConnection = false;
         this._qualityMonitor = new VegaMediaQualityMonitor();
         this._qualityMonitor.on(PROTOCOL_EVENTS.MEDIA_QUALITY_CHANGED, (payload) => {
             this._emitToPWA(PROTOCOL_EVENTS.MEDIA_QUALITY_CHANGED, payload);
@@ -5093,7 +5077,7 @@ class VegaRtcManager {
         }), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
-            if (this._features.sfuReconnectV2On && !this._vegaConnection.isConnected() && this._reconnect) {
+            if (this._features.sfuReconnectV2On && !this._hasVegaConnection && this._reconnect) {
                 this._connect();
             }
         }));
@@ -5107,6 +5091,8 @@ class VegaRtcManager {
     }
     _connect() {
         if (this._features.sfuReconnectV2On) {
+            if (this._hasVegaConnection)
+                return;
             if (!this._serverSocket.isConnected()) {
                 const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
                 if (!reconnectThresholdInMs)
@@ -5124,6 +5110,7 @@ class VegaRtcManager {
         const queryString = searchParams.toString();
         const wsUrl = `wss://${host}?${queryString}`;
         this._vegaConnection = new VegaConnection(wsUrl);
+        this._hasVegaConnection = true;
         this._vegaConnection.on("open", () => this._join());
         this._vegaConnection.on("close", () => this._onClose());
         this._vegaConnection.on("message", (message) => this._onMessage(message));
@@ -5131,6 +5118,7 @@ class VegaRtcManager {
     _onClose() {
         var _a, _b;
         logger$1.info("_onClose()");
+        this._hasVegaConnection = false;
         (_a = this._sendTransport) === null || _a === void 0 ? void 0 : _a.close();
         (_b = this._receiveTransport) === null || _b === void 0 ? void 0 : _b.close();
         this._sendTransport = null;
@@ -5827,7 +5815,7 @@ class VegaRtcManager {
                 if (!videoTrack.effectTrack) {
                     this._monitorVideoTrack(videoTrack);
                 }
-                const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "video");
+                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
                 if (beforeEffectTrack) {
                     this._monitorVideoTrack(beforeEffectTrack);
                 }
@@ -5838,7 +5826,7 @@ class VegaRtcManager {
                 if (!audioTrack.effectTrack) {
                     this._monitorAudioTrack(audioTrack);
                 }
-                const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "audio");
+                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
                 if (beforeEffectTrack) {
                     this._monitorAudioTrack(beforeEffectTrack);
                 }
@@ -5909,7 +5897,9 @@ class VegaRtcManager {
         }
         if (!enable) {
             clearTimeout(this._stopCameraTimeout);
-            const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
+            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) {

package/dist/legacy-esm.js

@@ -1400,10 +1400,6 @@ class VegaConnection extends EventEmitter {
         var _a;
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
     }
-    isConnected() {
-        var _a, _b;
-        return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN || ((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.CONNECTING;
-    }
     _onOpen() {
         logger$9.info("Connected");
         this.emit("open");
@@ -3523,7 +3519,6 @@ class P2pRtcManager {
         this._isAudioOnlyMode = false;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._pendingActionsForConnectedPeerConnections = [];
-        this._nodeJsClients = [];
         this._audioTrackOnEnded = () => {
             rtcStats.sendEvent("audio_ended", { unloading: unloading$1 });
             this._emit(rtcManagerEvents.MICROPHONE_STOPPED_WORKING, {});
@@ -3639,11 +3634,6 @@ class P2pRtcManager {
     setupSocketListeners() {
         this._socketListenerDeregisterFunctions = [
             () => this._clearMediaServersRefresh(),
-            this._serverSocket.on(PROTOCOL_RESPONSES.NEW_CLIENT, (data) => {
-                if (data.client.isDialIn && !this._nodeJsClients.includes(data.client.id)) {
-                    this._nodeJsClients.push(data.client.id);
-                }
-            }),
             this._serverSocket.on(PROTOCOL_RESPONSES.MEDIASERVER_CONFIG, (data) => {
                 if (data.error) {
                     logger$4.warn("FETCH_MEDIASERVER_CONFIG failed:", data.error);
@@ -3841,7 +3831,7 @@ class P2pRtcManager {
     _transformOutgoingSdp(original) {
         return { type: original.type, sdpU: original.sdp };
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, enforceTurnProtocol, }) {
+    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
         }
@@ -3877,13 +3867,13 @@ class P2pRtcManager {
                 return entry;
             });
         }
-        if (enforceTurnProtocol || this._features.useOnlyTURN) {
+        if (this._features.useOnlyTURN) {
             peerConnectionConfig.iceTransportPolicy = "relay";
             const filter = {
                 onlyudp: /^turn:.*transport=udp$/,
                 onlytcp: /^turn:.*transport=tcp$/,
                 onlytls: /^turns:.*transport=tcp$/,
-            }[enforceTurnProtocol || this._features.useOnlyTURN];
+            }[this._features.useOnlyTURN];
             if (filter) {
                 peerConnectionConfig.iceServers = peerConnectionConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
             }
@@ -4143,16 +4133,11 @@ class P2pRtcManager {
         else {
             initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        let enforceTurnProtocol;
-        if (this._nodeJsClients.includes(clientId)) {
-            enforceTurnProtocol = this._features.isNodeSdk ? "onlyudp" : "onlytls";
-        }
         session = this._createP2pSession({
             clientId,
             initialBandwidth,
             shouldAddLocalVideo: true,
             isOfferer: true,
-            enforceTurnProtocol,
         });
         this._negotiatePeerConnection(clientId, session);
         return Promise.resolve(session);
@@ -4324,14 +4309,13 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, enforceTurnProtocol, }) {
+    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, }) {
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
             initialBandwidth,
             shouldAddLocalVideo,
             isOfferer,
-            enforceTurnProtocol,
         });
         const pc = session.pc;
         if (this._features.increaseIncomingMediaBufferOn) {
@@ -4445,7 +4429,7 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, enforceTurnProtocol, }) {
+    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
@@ -4462,7 +4446,6 @@ class P2pRtcManager {
             clientId,
             initialBandwidth,
             shouldAddLocalVideo: !!shouldAddLocalVideo,
-            enforceTurnProtocol,
             isOfferer: false,
         });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
@@ -5059,6 +5042,7 @@ class VegaRtcManager {
         this._socketListenerDeregisterFunctions = [];
         this._reconnect = true;
         this._reconnectTimeOut = null;
+        this._hasVegaConnection = false;
         this._qualityMonitor = new VegaMediaQualityMonitor();
         this._qualityMonitor.on(PROTOCOL_EVENTS.MEDIA_QUALITY_CHANGED, (payload) => {
             this._emitToPWA(PROTOCOL_EVENTS.MEDIA_QUALITY_CHANGED, payload);
@@ -5093,7 +5077,7 @@ class VegaRtcManager {
         }), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
-            if (this._features.sfuReconnectV2On && !this._vegaConnection.isConnected() && this._reconnect) {
+            if (this._features.sfuReconnectV2On && !this._hasVegaConnection && this._reconnect) {
                 this._connect();
             }
         }));
@@ -5107,6 +5091,8 @@ class VegaRtcManager {
     }
     _connect() {
         if (this._features.sfuReconnectV2On) {
+            if (this._hasVegaConnection)
+                return;
             if (!this._serverSocket.isConnected()) {
                 const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
                 if (!reconnectThresholdInMs)
@@ -5124,6 +5110,7 @@ class VegaRtcManager {
         const queryString = searchParams.toString();
         const wsUrl = `wss://${host}?${queryString}`;
         this._vegaConnection = new VegaConnection(wsUrl);
+        this._hasVegaConnection = true;
         this._vegaConnection.on("open", () => this._join());
         this._vegaConnection.on("close", () => this._onClose());
         this._vegaConnection.on("message", (message) => this._onMessage(message));
@@ -5131,6 +5118,7 @@ class VegaRtcManager {
     _onClose() {
         var _a, _b;
         logger$1.info("_onClose()");
+        this._hasVegaConnection = false;
         (_a = this._sendTransport) === null || _a === void 0 ? void 0 : _a.close();
         (_b = this._receiveTransport) === null || _b === void 0 ? void 0 : _b.close();
         this._sendTransport = null;
@@ -5827,7 +5815,7 @@ class VegaRtcManager {
                 if (!videoTrack.effectTrack) {
                     this._monitorVideoTrack(videoTrack);
                 }
-                const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "video");
+                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "video");
                 if (beforeEffectTrack) {
                     this._monitorVideoTrack(beforeEffectTrack);
                 }
@@ -5838,7 +5826,7 @@ class VegaRtcManager {
                 if (!audioTrack.effectTrack) {
                     this._monitorAudioTrack(audioTrack);
                 }
-                const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "audio");
+                const beforeEffectTrack = beforeEffectTracks.find((t) => t.kind === "audio");
                 if (beforeEffectTrack) {
                     this._monitorAudioTrack(beforeEffectTrack);
                 }
@@ -5909,7 +5897,9 @@ class VegaRtcManager {
         }
         if (!enable) {
             clearTimeout(this._stopCameraTimeout);
-            const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
+            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) {

package/package.json

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