@whereby.com/media 2.5.2 → 2.5.4

package/dist/index.mjs

@@ -619,6 +619,7 @@ function rtcStatsConnection(wsURL, logger = console) {
     let featureFlags;
     const connection = {
         connected: false,
+        attemptedConnectedAtLeastOnce: false,
         trace: (...args) => {
             args.push(Date.now());
             if (args[0] === "customEvent" && args[2].type === "roomSessionId") {
@@ -691,6 +692,7 @@ function rtcStatsConnection(wsURL, logger = console) {
             connectionAttempt += 1;
             ws === null || ws === void 0 ? void 0 : ws.close();
             connection.connected = true;
+            connection.attemptedConnectedAtLeastOnce = true;
             ws = new WebSocket(wsURL + window.location.pathname, RTCSTATS_PROTOCOL_VERSION);
             ws.onerror = (e) => {
                 connection.connected = false;
@@ -1547,6 +1549,7 @@ class ServerSocket {
         this._wasConnectedUsingWebsocket = false;
         this._reconnectManager = null;
         this._socket = io(hostName, Object.assign({ path: DEFAULT_SOCKET_PATH, randomizationFactor: 0.5, reconnectionDelay: 250, reconnectionDelayMax: 5000, timeout: 5000, transports: ["websocket"], withCredentials: true }, optionsOverrides));
+        this.joinRoomFinished = false;
         this._socket.io.on("reconnect", () => {
             this._socket.sendBuffer = [];
         });
@@ -1564,6 +1567,12 @@ class ServerSocket {
         });
         if (glitchFree)
             this._reconnectManager = new ReconnectManager(this._socket);
+        this._socket.on("room_joined", (payload) => {
+            const { error } = payload;
+            if (!error) {
+                this.joinRoomFinished = true;
+            }
+        });
         this._socket.on("connect", () => {
             const transport = this.getTransport();
             if (transport === "websocket") {
@@ -1580,6 +1589,7 @@ class ServerSocket {
             }
         });
         this._socket.on("disconnect", () => {
+            this.joinRoomFinished = false;
             this.disconnectTimestamp = Date.now();
             if (this.noopKeepaliveInterval) {
                 clearInterval(this.noopKeepaliveInterval);
@@ -1601,26 +1611,12 @@ class ServerSocket {
     disconnect() {
         this._socket.disconnect();
     }
-    disconnectOnConnect() {
-        this._socket.once("connect", () => {
-            this._socket.disconnect();
-        });
-    }
     emit(eventName, ...args) {
         this._socket.emit.apply(this._socket, arguments);
     }
-    emitIfConnected(eventName, data) {
-        if (!this.isConnected()) {
-            return;
-        }
-        this.emit(eventName, data);
-    }
     getTransport() {
-        return (this._socket &&
-            this._socket.io &&
-            this._socket.io.engine &&
-            this._socket.io.engine.transport &&
-            this._socket.io.engine.transport.name);
+        var _a, _b, _c, _d;
+        return (_d = (_c = (_b = (_a = this._socket) === null || _a === void 0 ? void 0 : _a.io) === null || _b === void 0 ? void 0 : _b.engine) === null || _c === void 0 ? void 0 : _c.transport) === null || _d === void 0 ? void 0 : _d.name;
     }
     getManager() {
         return this._socket.io;
@@ -2582,6 +2578,8 @@ class P2pRtcManager {
         this._webrtcProvider = webrtcProvider;
         this._features = features || {};
         this._isAudioOnlyMode = false;
+        this._closed = false;
+        this.skipEmittingServerMessageCount = 0;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._pendingActionsForConnectedPeerConnections = [];
         this._audioTrackOnEnded = () => {
@@ -2663,6 +2661,10 @@ class P2pRtcManager {
         }
         return this._replaceTrackToPeerConnections(oldTrack, newTrack);
     }
+    close() {
+        this._closed = true;
+        this.disconnectAll();
+    }
     disconnectAll() {
         Object.keys(this.peerConnections).forEach((peerConnectionId) => {
             this.disconnect(peerConnectionId);
@@ -2788,11 +2790,16 @@ class P2pRtcManager {
     sendStatsCustomEvent(eventName, data) {
         rtcStats.sendEvent(eventName, data);
     }
+    rtcStatsConnect() {
+        if (!rtcStats.server.connected) {
+            rtcStats.server.connect();
+        }
+    }
     rtcStatsDisconnect() {
         rtcStats.server.close();
     }
     rtcStatsReconnect() {
-        if (!rtcStats.server.connected) {
+        if (!rtcStats.server.connected && rtcStats.server.attemptedConnectedAtLeastOnce) {
             rtcStats.server.connect();
         }
     }
@@ -2848,8 +2855,18 @@ class P2pRtcManager {
             logger$6.error("Error during setting jitter buffer target:", error);
         }
     }
-    _emitServerEvent(eventName, data, callback) {
-        this._serverSocket.emit(eventName, data, callback);
+    _emitServerEvent(eventName, data) {
+        if (this._closed) {
+            logger$6.warn("RtcManager closed. Will not send event", eventName, data);
+            return;
+        }
+        if (this._features.awaitJoinRoomFinished && !this._serverSocket.joinRoomFinished) {
+            rtcStats.sendEvent("skip_emitting_server_message", { eventName });
+            this.skipEmittingServerMessageCount++;
+        }
+        else {
+            this._serverSocket.emit(eventName, data);
+        }
     }
     _emit(eventName, data) {
         this._emitter.emit(eventName, data);
@@ -3172,6 +3189,10 @@ class P2pRtcManager {
         this._videoTrackBeingMonitored = track;
     }
     _connect(clientId) {
+        try {
+            this.rtcStatsReconnect();
+        }
+        catch (_) { }
         let session = this._getSession(clientId);
         let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
@@ -5485,6 +5506,9 @@ class VegaRtcManager {
             });
         }
     }
+    close() {
+        this.disconnectAll();
+    }
     disconnectAll() {
         var _a, _b, _c, _d;
         this._reconnect = false;
@@ -5520,11 +5544,16 @@ class VegaRtcManager {
     sendStatsCustomEvent(eventName, data) {
         rtcStats.sendEvent(eventName, data);
     }
+    rtcStatsConnect() {
+        if (!rtcStats.server.connected) {
+            rtcStats.server.connect();
+        }
+    }
     rtcStatsDisconnect() {
         rtcStats.server.close();
     }
     rtcStatsReconnect() {
-        if (!rtcStats.server.connected) {
+        if (!rtcStats.server.connected && rtcStats.server.attemptedConnectedAtLeastOnce) {
             rtcStats.server.connect();
         }
     }
@@ -5850,7 +5879,7 @@ class RtcManagerDispatcher {
             else {
                 rtcManager = new P2pRtcManager(config);
             }
-            rtcManager.rtcStatsReconnect();
+            rtcManager.rtcStatsConnect();
             rtcManager.setupSocketListeners();
             emitter.emit(EVENTS.RTC_MANAGER_CREATED, { rtcManager });
             this.currentManager = rtcManager;

package/dist/legacy-esm.js

@@ -619,6 +619,7 @@ function rtcStatsConnection(wsURL, logger = console) {
     let featureFlags;
     const connection = {
         connected: false,
+        attemptedConnectedAtLeastOnce: false,
         trace: (...args) => {
             args.push(Date.now());
             if (args[0] === "customEvent" && args[2].type === "roomSessionId") {
@@ -691,6 +692,7 @@ function rtcStatsConnection(wsURL, logger = console) {
             connectionAttempt += 1;
             ws === null || ws === void 0 ? void 0 : ws.close();
             connection.connected = true;
+            connection.attemptedConnectedAtLeastOnce = true;
             ws = new WebSocket(wsURL + window.location.pathname, RTCSTATS_PROTOCOL_VERSION);
             ws.onerror = (e) => {
                 connection.connected = false;
@@ -1547,6 +1549,7 @@ class ServerSocket {
         this._wasConnectedUsingWebsocket = false;
         this._reconnectManager = null;
         this._socket = io(hostName, Object.assign({ path: DEFAULT_SOCKET_PATH, randomizationFactor: 0.5, reconnectionDelay: 250, reconnectionDelayMax: 5000, timeout: 5000, transports: ["websocket"], withCredentials: true }, optionsOverrides));
+        this.joinRoomFinished = false;
         this._socket.io.on("reconnect", () => {
             this._socket.sendBuffer = [];
         });
@@ -1564,6 +1567,12 @@ class ServerSocket {
         });
         if (glitchFree)
             this._reconnectManager = new ReconnectManager(this._socket);
+        this._socket.on("room_joined", (payload) => {
+            const { error } = payload;
+            if (!error) {
+                this.joinRoomFinished = true;
+            }
+        });
         this._socket.on("connect", () => {
             const transport = this.getTransport();
             if (transport === "websocket") {
@@ -1580,6 +1589,7 @@ class ServerSocket {
             }
         });
         this._socket.on("disconnect", () => {
+            this.joinRoomFinished = false;
             this.disconnectTimestamp = Date.now();
             if (this.noopKeepaliveInterval) {
                 clearInterval(this.noopKeepaliveInterval);
@@ -1601,26 +1611,12 @@ class ServerSocket {
     disconnect() {
         this._socket.disconnect();
     }
-    disconnectOnConnect() {
-        this._socket.once("connect", () => {
-            this._socket.disconnect();
-        });
-    }
     emit(eventName, ...args) {
         this._socket.emit.apply(this._socket, arguments);
     }
-    emitIfConnected(eventName, data) {
-        if (!this.isConnected()) {
-            return;
-        }
-        this.emit(eventName, data);
-    }
     getTransport() {
-        return (this._socket &&
-            this._socket.io &&
-            this._socket.io.engine &&
-            this._socket.io.engine.transport &&
-            this._socket.io.engine.transport.name);
+        var _a, _b, _c, _d;
+        return (_d = (_c = (_b = (_a = this._socket) === null || _a === void 0 ? void 0 : _a.io) === null || _b === void 0 ? void 0 : _b.engine) === null || _c === void 0 ? void 0 : _c.transport) === null || _d === void 0 ? void 0 : _d.name;
     }
     getManager() {
         return this._socket.io;
@@ -2582,6 +2578,8 @@ class P2pRtcManager {
         this._webrtcProvider = webrtcProvider;
         this._features = features || {};
         this._isAudioOnlyMode = false;
+        this._closed = false;
+        this.skipEmittingServerMessageCount = 0;
         this.offerOptions = { offerToReceiveAudio: true, offerToReceiveVideo: true };
         this._pendingActionsForConnectedPeerConnections = [];
         this._audioTrackOnEnded = () => {
@@ -2663,6 +2661,10 @@ class P2pRtcManager {
         }
         return this._replaceTrackToPeerConnections(oldTrack, newTrack);
     }
+    close() {
+        this._closed = true;
+        this.disconnectAll();
+    }
     disconnectAll() {
         Object.keys(this.peerConnections).forEach((peerConnectionId) => {
             this.disconnect(peerConnectionId);
@@ -2788,11 +2790,16 @@ class P2pRtcManager {
     sendStatsCustomEvent(eventName, data) {
         rtcStats.sendEvent(eventName, data);
     }
+    rtcStatsConnect() {
+        if (!rtcStats.server.connected) {
+            rtcStats.server.connect();
+        }
+    }
     rtcStatsDisconnect() {
         rtcStats.server.close();
     }
     rtcStatsReconnect() {
-        if (!rtcStats.server.connected) {
+        if (!rtcStats.server.connected && rtcStats.server.attemptedConnectedAtLeastOnce) {
             rtcStats.server.connect();
         }
     }
@@ -2848,8 +2855,18 @@ class P2pRtcManager {
             logger$6.error("Error during setting jitter buffer target:", error);
         }
     }
-    _emitServerEvent(eventName, data, callback) {
-        this._serverSocket.emit(eventName, data, callback);
+    _emitServerEvent(eventName, data) {
+        if (this._closed) {
+            logger$6.warn("RtcManager closed. Will not send event", eventName, data);
+            return;
+        }
+        if (this._features.awaitJoinRoomFinished && !this._serverSocket.joinRoomFinished) {
+            rtcStats.sendEvent("skip_emitting_server_message", { eventName });
+            this.skipEmittingServerMessageCount++;
+        }
+        else {
+            this._serverSocket.emit(eventName, data);
+        }
     }
     _emit(eventName, data) {
         this._emitter.emit(eventName, data);
@@ -3172,6 +3189,10 @@ class P2pRtcManager {
         this._videoTrackBeingMonitored = track;
     }
     _connect(clientId) {
+        try {
+            this.rtcStatsReconnect();
+        }
+        catch (_) { }
         let session = this._getSession(clientId);
         let initialBandwidth = (session && session.bandwidth) || 0;
         if (session) {
@@ -5485,6 +5506,9 @@ class VegaRtcManager {
             });
         }
     }
+    close() {
+        this.disconnectAll();
+    }
     disconnectAll() {
         var _a, _b, _c, _d;
         this._reconnect = false;
@@ -5520,11 +5544,16 @@ class VegaRtcManager {
     sendStatsCustomEvent(eventName, data) {
         rtcStats.sendEvent(eventName, data);
     }
+    rtcStatsConnect() {
+        if (!rtcStats.server.connected) {
+            rtcStats.server.connect();
+        }
+    }
     rtcStatsDisconnect() {
         rtcStats.server.close();
     }
     rtcStatsReconnect() {
-        if (!rtcStats.server.connected) {
+        if (!rtcStats.server.connected && rtcStats.server.attemptedConnectedAtLeastOnce) {
             rtcStats.server.connect();
         }
     }
@@ -5850,7 +5879,7 @@ class RtcManagerDispatcher {
             else {
                 rtcManager = new P2pRtcManager(config);
             }
-            rtcManager.rtcStatsReconnect();
+            rtcManager.rtcStatsConnect();
             rtcManager.setupSocketListeners();
             emitter.emit(EVENTS.RTC_MANAGER_CREATED, { rtcManager });
             this.currentManager = rtcManager;

package/package.json

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