@whereby.com/media 2.8.3 → 2.8.4

package/dist/index.cjs

@@ -1650,8 +1650,7 @@ class ServerSocket {
         if (this._serverSideDisconnectDurationLimitOn)
             this._keepAliveManager = new KeepAliveManager(this);
         this._socket.on("room_joined", (payload) => {
-            const { error } = payload;
-            if (!error) {
+            if (!("error" in payload)) {
                 this.joinRoomFinished = true;
             }
         });
@@ -2619,8 +2618,8 @@ if (browserName$1 === "chrome") {
     });
 }
 class P2pRtcManager {
-    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, }) {
-        const { name, session, iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds } = room;
+    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features }) {
+        const { name, session, iceServers, turnServers, mediaserverConfigTtlSeconds } = room;
         this._selfId = selfId;
         this._roomName = name;
         this._roomSessionId = session && session.id;
@@ -2650,7 +2649,6 @@ class P2pRtcManager {
             this.analytics.camTrackEndedCount++;
         };
         this._updateAndScheduleMediaServersRefresh({
-            sfuServer,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -2691,7 +2689,7 @@ class P2pRtcManager {
         return Object.keys(this.peerConnections).length;
     }
     isInitializedWith({ selfId, roomName, isSfu }) {
-        return this._selfId === selfId && this._roomName === roomName && isSfu === !!this._sfuServer;
+        return this._selfId === selfId && this._roomName === roomName && !isSfu;
     }
     supportsScreenShareAudio() {
         return true;
@@ -2831,8 +2829,7 @@ class P2pRtcManager {
                 });
             }),
             this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
-                const { error } = payload;
-                if (error || !this._wasScreenSharing) {
+                if ("error" in payload || !this._wasScreenSharing) {
                     return;
                 }
                 const screenShareStreamId = Object.keys(this.localStreams).find((id) => id !== CAMERA_STREAM_ID);
@@ -2907,9 +2904,6 @@ class P2pRtcManager {
         if (previousStatus === newStatus) {
             return;
         }
-        if (session.peerConnectionId === this._selfId) {
-            return;
-        }
         if (previousStatus === TYPES.CONNECTION_DISCONNECTED &&
             newStatus === TYPES.CONNECTING) {
             return;
@@ -3249,10 +3243,9 @@ class P2pRtcManager {
         delete this.localStreams[streamId];
         this._deleteEnabledLocalStreamId(streamId);
     }
-    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds }) {
+    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, mediaserverConfigTtlSeconds, }) {
         this._iceServers = iceServers;
         this._turnServers = turnServers;
-        this._sfuServer = sfuServer;
         this._mediaserverConfigTtlSeconds = mediaserverConfigTtlSeconds;
         this._clearMediaServersRefresh();
         if (!mediaserverConfigTtlSeconds) {
@@ -4521,8 +4514,8 @@ const OUTBOUND_SCREEN_OUTBOUND_STREAM_ID = uuid.v4();
 if (browserName === "chrome")
     window.document.addEventListener("beforeunload", () => (unloading = true));
 class VegaRtcManager {
-    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, eventClaim, }) {
-        const { session, iceServers, turnServers, sfuServer, sfuServers, mediaserverConfigTtlSeconds } = room;
+    constructor({ selfId, room, emitter, serverSocket, webrtcProvider, features, eventClaim }) {
+        const { session, iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds } = room;
         this._selfId = selfId;
         this._room = room;
         this._roomSessionId = session === null || session === void 0 ? void 0 : session.id;
@@ -4576,7 +4569,6 @@ class VegaRtcManager {
         };
         this._updateAndScheduleMediaServersRefresh({
             sfuServer,
-            sfuServers,
             iceServers: (iceServers === null || iceServers === void 0 ? void 0 : iceServers.iceServers) || [],
             turnServers: turnServers || [],
             mediaserverConfigTtlSeconds,
@@ -4603,13 +4595,14 @@ class VegaRtcManager {
             camTrackEndedCount: 0,
         };
     }
-    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, sfuServers, mediaserverConfigTtlSeconds, }) {
-        var _a, _b, _c;
+    _updateAndScheduleMediaServersRefresh({ iceServers, turnServers, sfuServer, mediaserverConfigTtlSeconds, }) {
+        var _a, _b, _c, _d;
         this._iceServers = iceServers;
         this._turnServers = turnServers;
-        this._sfuServer = sfuServer;
-        this._sfuServers = sfuServers;
-        if (!sfuServers && (sfuServer === null || sfuServer === void 0 ? void 0 : sfuServer.fallbackServers)) {
+        if (sfuServer) {
+            this._sfuServer = sfuServer;
+        }
+        if (sfuServer === null || sfuServer === void 0 ? void 0 : sfuServer.fallbackServers) {
             this._sfuServers = sfuServer.fallbackServers.map((entry) => ({
                 host: entry.host || entry.fqdn,
                 dc: entry.dc,
@@ -4619,14 +4612,14 @@ class VegaRtcManager {
         (_a = this._vegaConnectionManager) === null || _a === void 0 ? void 0 : _a.updateHostList(this._features.sfuServersOverride ||
             this._sfuServers ||
             this._features.sfuServerOverrideHost ||
-            sfuServer.url);
+            ((_b = this._sfuServer) === null || _b === void 0 ? void 0 : _b.url));
         const iceServersList = {
             iceServers: this._features.turnServersOn ? this._turnServers : this._iceServers,
         };
         iceServersList.iceServers = turnServerOverride(iceServersList.iceServers, this._features.turnServerOverrideHost);
         if (browserName !== "firefox") {
-            (_b = this._sendTransport) === null || _b === void 0 ? void 0 : _b.updateIceServers(iceServersList);
-            (_c = this._receiveTransport) === null || _c === void 0 ? void 0 : _c.updateIceServers(iceServersList);
+            (_c = this._sendTransport) === null || _c === void 0 ? void 0 : _c.updateIceServers(iceServersList);
+            (_d = this._receiveTransport) === null || _d === void 0 ? void 0 : _d.updateIceServers(iceServersList);
         }
         this._clearMediaServersRefresh();
         if (!mediaserverConfigTtlSeconds) {
@@ -4680,6 +4673,7 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        var _a;
         if (this._isConnectingOrConnected)
             return;
         if (!this._serverSocket.isConnected()) {
@@ -4695,7 +4689,7 @@ class VegaRtcManager {
             const hostList = this._features.sfuServersOverride ||
                 this._sfuServers ||
                 this._features.sfuServerOverrideHost ||
-                this._sfuServer.url;
+                ((_a = this._sfuServer) === null || _a === void 0 ? void 0 : _a.url);
             this._vegaConnectionManager = createVegaConnectionManager({
                 initialHostList: hostList,
                 getUrlForHost: (host) => {
@@ -6005,9 +5999,10 @@ class RtcManagerDispatcher {
     constructor({ emitter, serverSocket, webrtcProvider, features, }) {
         this.emitter = emitter;
         this.currentManager = null;
-        serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, ({ room, selfId, error, eventClaim }) => {
-            if (error)
+        serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, (payload) => {
+            if ("error" in payload)
                 return;
+            const { room, selfId, eventClaim } = payload;
             const config = {
                 selfId,
                 room,