@whereby.com/media 1.11.1 → 1.12.1

package/dist/index.mjs

@@ -3527,6 +3527,7 @@ 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, {});
@@ -3608,9 +3609,6 @@ class P2pRtcManager {
         }
         return this._replaceTrackToPeerConnections(oldTrack, newTrack);
     }
-    accept({ clientId, shouldAddLocalVideo }) {
-        return this.acceptNewStream({ streamId: clientId, clientId, shouldAddLocalVideo });
-    }
     disconnectAll() {
         Object.keys(this.peerConnections).forEach((peerConnectionId) => {
             this.disconnect(peerConnectionId);
@@ -3645,6 +3643,11 @@ 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);
@@ -3842,7 +3845,7 @@ class P2pRtcManager {
     _transformOutgoingSdp(original) {
         return { type: original.type, sdpU: original.sdp };
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, }) {
+    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, enforceTurnProtocol, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
         }
@@ -3878,13 +3881,13 @@ class P2pRtcManager {
                 return entry;
             });
         }
-        if (this._features.useOnlyTURN) {
+        if (enforceTurnProtocol || this._features.useOnlyTURN) {
             peerConnectionConfig.iceTransportPolicy = "relay";
             const filter = {
                 onlyudp: /^turn:.*transport=udp$/,
                 onlytcp: /^turn:.*transport=tcp$/,
                 onlytls: /^turns:.*transport=tcp$/,
-            }[this._features.useOnlyTURN];
+            }[enforceTurnProtocol || this._features.useOnlyTURN];
             if (filter) {
                 peerConnectionConfig.iceServers = peerConnectionConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
             }
@@ -4136,17 +4139,26 @@ class P2pRtcManager {
     }
     _connect(clientId) {
         this.rtcStatsReconnect();
-        const shouldAddLocalVideo = true;
         let session = this._getSession(clientId);
-        let bandwidth = (session && session.bandwidth) || 0;
+        let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
             logger$4.warn("Replacing peer session", clientId);
             this._cleanup(clientId);
         }
         else {
-            bandwidth = this._changeBandwidthForAllClients(true);
+            initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession(clientId, bandwidth, shouldAddLocalVideo, 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);
     }
@@ -4317,13 +4329,14 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession(clientId, initialBandwidth, shouldAddLocalVideo, isOfferer) {
+    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, enforceTurnProtocol, }) {
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
             initialBandwidth,
             shouldAddLocalVideo,
             isOfferer,
+            enforceTurnProtocol,
         });
         const pc = session.pc;
         if (this._features.increaseIncomingMediaBufferOn) {
@@ -4437,20 +4450,26 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
+    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, enforceTurnProtocol, }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
         }
-        let bandwidth = (session && session.bandwidth) || 0;
+        let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
             logger$4.warn("Replacing peer session", clientId);
             this._cleanup(clientId);
         }
         else {
-            bandwidth = this._changeBandwidthForAllClients(true);
+            initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession(clientId, bandwidth, shouldAddLocalVideo);
+        session = this._createP2pSession({
+            clientId,
+            initialBandwidth,
+            shouldAddLocalVideo: !!shouldAddLocalVideo,
+            enforceTurnProtocol,
+            isOfferer: false,
+        });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
             receiverId: clientId,
         });

package/dist/legacy-esm.js

@@ -3527,6 +3527,7 @@ 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, {});
@@ -3608,9 +3609,6 @@ class P2pRtcManager {
         }
         return this._replaceTrackToPeerConnections(oldTrack, newTrack);
     }
-    accept({ clientId, shouldAddLocalVideo }) {
-        return this.acceptNewStream({ streamId: clientId, clientId, shouldAddLocalVideo });
-    }
     disconnectAll() {
         Object.keys(this.peerConnections).forEach((peerConnectionId) => {
             this.disconnect(peerConnectionId);
@@ -3645,6 +3643,11 @@ 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);
@@ -3842,7 +3845,7 @@ class P2pRtcManager {
     _transformOutgoingSdp(original) {
         return { type: original.type, sdpU: original.sdp };
     }
-    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, }) {
+    _createSession({ clientId, initialBandwidth, isOfferer, peerConnectionId, shouldAddLocalVideo, enforceTurnProtocol, }) {
         if (!peerConnectionId) {
             throw new Error("peerConnectionId is missing");
         }
@@ -3878,13 +3881,13 @@ class P2pRtcManager {
                 return entry;
             });
         }
-        if (this._features.useOnlyTURN) {
+        if (enforceTurnProtocol || this._features.useOnlyTURN) {
             peerConnectionConfig.iceTransportPolicy = "relay";
             const filter = {
                 onlyudp: /^turn:.*transport=udp$/,
                 onlytcp: /^turn:.*transport=tcp$/,
                 onlytls: /^turns:.*transport=tcp$/,
-            }[this._features.useOnlyTURN];
+            }[enforceTurnProtocol || this._features.useOnlyTURN];
             if (filter) {
                 peerConnectionConfig.iceServers = peerConnectionConfig.iceServers.filter((entry) => entry.url && entry.url.match(filter));
             }
@@ -4136,17 +4139,26 @@ class P2pRtcManager {
     }
     _connect(clientId) {
         this.rtcStatsReconnect();
-        const shouldAddLocalVideo = true;
         let session = this._getSession(clientId);
-        let bandwidth = (session && session.bandwidth) || 0;
+        let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
             logger$4.warn("Replacing peer session", clientId);
             this._cleanup(clientId);
         }
         else {
-            bandwidth = this._changeBandwidthForAllClients(true);
+            initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession(clientId, bandwidth, shouldAddLocalVideo, 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);
     }
@@ -4317,13 +4329,14 @@ class P2pRtcManager {
         });
         return bandwidth;
     }
-    _createP2pSession(clientId, initialBandwidth, shouldAddLocalVideo, isOfferer) {
+    _createP2pSession({ clientId, initialBandwidth, shouldAddLocalVideo = false, isOfferer = false, enforceTurnProtocol, }) {
         const session = this._createSession({
             peerConnectionId: clientId,
             clientId,
             initialBandwidth,
             shouldAddLocalVideo,
             isOfferer,
+            enforceTurnProtocol,
         });
         const pc = session.pc;
         if (this._features.increaseIncomingMediaBufferOn) {
@@ -4437,20 +4450,26 @@ class P2pRtcManager {
         };
         return session;
     }
-    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, }) {
+    acceptNewStream({ streamId, clientId, shouldAddLocalVideo, enforceTurnProtocol, }) {
         let session = this._getSession(clientId);
         if (session && streamId !== clientId) {
             return session;
         }
-        let bandwidth = (session && session.bandwidth) || 0;
+        let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
             logger$4.warn("Replacing peer session", clientId);
             this._cleanup(clientId);
         }
         else {
-            bandwidth = this._changeBandwidthForAllClients(true);
+            initialBandwidth = this._changeBandwidthForAllClients(true);
         }
-        session = this._createP2pSession(clientId, bandwidth, shouldAddLocalVideo);
+        session = this._createP2pSession({
+            clientId,
+            initialBandwidth,
+            shouldAddLocalVideo: !!shouldAddLocalVideo,
+            enforceTurnProtocol,
+            isOfferer: false,
+        });
         this._emitServerEvent(RELAY_MESSAGES.READY_TO_RECEIVE_OFFER, {
             receiverId: clientId,
         });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@whereby.com/media",
     "description": "Media library for Whereby",
-    "version": "1.11.1",
+    "version": "1.12.1",
     "license": "MIT",
     "homepage": "https://github.com/whereby/sdk",
     "repository": {
@@ -12,6 +12,7 @@
         "url": "https://github.com/whereby/sdk/issues"
     },
     "scripts": {
+        "clean": "rimraf dist node_modules .turbo",
         "build": "rimraf dist && rollup -c rollup.config.js",
         "test": "npm run test:lint && npm run test:unit",
         "test:unit": "jest",