@whereby.com/media 1.12.2 → 1.13.0

package/dist/index.cjs

@@ -1421,6 +1421,10 @@ class VegaConnection extends EventEmitter.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");
@@ -5119,6 +5123,9 @@ class VegaRtcManager {
         }), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
+            if (this._features.sfuReconnectV2On && !this._vegaConnection.isConnected() && this._reconnect) {
+                this._connect();
+            }
         }));
         this._connect();
     }
@@ -5129,6 +5136,17 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        if (this._features.sfuReconnectV2On) {
+            if (!this._serverSocket.isConnected()) {
+                const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
+                if (!reconnectThresholdInMs)
+                    return;
+                if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
+                    return;
+            }
+            if (this._reconnectTimeOut)
+                clearTimeout(this._reconnectTimeOut);
+        }
         const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
         const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
             .filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
@@ -6473,6 +6491,7 @@ const logger = new Logger();
 class ReconnectManager extends EventEmitter {
     constructor(socket) {
         super();
+        this.reconnectThresholdInMs = 0;
         this._socket = socket;
         this._clients = {};
         this._signalDisconnectTime = undefined;
@@ -6498,6 +6517,7 @@ class ReconnectManager extends EventEmitter {
     _onRoomJoined(payload) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8;
             if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
                 this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
                 return;
@@ -6751,6 +6771,7 @@ class ServerSocket {
             }
         });
         this._socket.on("disconnect", () => {
+            this.disconnectTimestamp = Date.now();
             if (this.noopKeepaliveInterval) {
                 clearInterval(this.noopKeepaliveInterval);
                 this.noopKeepaliveInterval = null;
@@ -6834,6 +6855,10 @@ class ServerSocket {
         var _a;
         return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
     }
+    getReconnectThreshold() {
+        var _a;
+        return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
+    }
 }
 
 const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;

package/dist/index.d.cts

@@ -159,6 +159,7 @@ declare class ReconnectManager extends EventEmitter {
         evaluationFailed: number;
         roomJoined: number;
     };
+    reconnectThresholdInMs: number;
     constructor(socket: any);
     _onRoomJoined(payload: any): Promise<void>;
     _onClientLeft(payload: any): void;
@@ -187,6 +188,7 @@ declare class ServerSocket {
     _reconnectManager?: ReconnectManager | null;
     noopKeepaliveInterval: any;
     _wasConnectedUsingWebsocket?: boolean;
+    disconnectTimestamp: number | undefined;
     constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
     setRtcManager(rtcManager?: RtcManager): void;
     connect(): void;
@@ -208,6 +210,7 @@ declare class ServerSocket {
         evaluationFailed: number;
         roomJoined: number;
     } | undefined;
+    getReconnectThreshold(): number | undefined;
 }
 
 declare const maybeTurnOnly: (transportConfig: any, features: {
@@ -1008,6 +1011,7 @@ declare class VegaConnection extends EventEmitter$1 {
     _setupSocket(): void;
     _tearDown(): void;
     close(): void;
+    isConnected(): boolean;
     _onOpen(): void;
     _onMessage(event: MessageEvent): void;
     _onClose(): void;
@@ -1083,7 +1087,7 @@ declare class VegaRtcManager implements RtcManager {
     _room: any;
     _roomSessionId: any;
     _emitter: any;
-    _serverSocket: any;
+    _serverSocket: ServerSocket;
     _webrtcProvider: any;
     _features: any;
     _eventClaim?: any;

package/dist/index.d.mts

@@ -159,6 +159,7 @@ declare class ReconnectManager extends EventEmitter {
         evaluationFailed: number;
         roomJoined: number;
     };
+    reconnectThresholdInMs: number;
     constructor(socket: any);
     _onRoomJoined(payload: any): Promise<void>;
     _onClientLeft(payload: any): void;
@@ -187,6 +188,7 @@ declare class ServerSocket {
     _reconnectManager?: ReconnectManager | null;
     noopKeepaliveInterval: any;
     _wasConnectedUsingWebsocket?: boolean;
+    disconnectTimestamp: number | undefined;
     constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
     setRtcManager(rtcManager?: RtcManager): void;
     connect(): void;
@@ -208,6 +210,7 @@ declare class ServerSocket {
         evaluationFailed: number;
         roomJoined: number;
     } | undefined;
+    getReconnectThreshold(): number | undefined;
 }
 
 declare const maybeTurnOnly: (transportConfig: any, features: {
@@ -1008,6 +1011,7 @@ declare class VegaConnection extends EventEmitter$1 {
     _setupSocket(): void;
     _tearDown(): void;
     close(): void;
+    isConnected(): boolean;
     _onOpen(): void;
     _onMessage(event: MessageEvent): void;
     _onClose(): void;
@@ -1083,7 +1087,7 @@ declare class VegaRtcManager implements RtcManager {
     _room: any;
     _roomSessionId: any;
     _emitter: any;
-    _serverSocket: any;
+    _serverSocket: ServerSocket;
     _webrtcProvider: any;
     _features: any;
     _eventClaim?: any;

package/dist/index.d.ts

@@ -159,6 +159,7 @@ declare class ReconnectManager extends EventEmitter {
         evaluationFailed: number;
         roomJoined: number;
     };
+    reconnectThresholdInMs: number;
     constructor(socket: any);
     _onRoomJoined(payload: any): Promise<void>;
     _onClientLeft(payload: any): void;
@@ -187,6 +188,7 @@ declare class ServerSocket {
     _reconnectManager?: ReconnectManager | null;
     noopKeepaliveInterval: any;
     _wasConnectedUsingWebsocket?: boolean;
+    disconnectTimestamp: number | undefined;
     constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
     setRtcManager(rtcManager?: RtcManager): void;
     connect(): void;
@@ -208,6 +210,7 @@ declare class ServerSocket {
         evaluationFailed: number;
         roomJoined: number;
     } | undefined;
+    getReconnectThreshold(): number | undefined;
 }
 
 declare const maybeTurnOnly: (transportConfig: any, features: {
@@ -1008,6 +1011,7 @@ declare class VegaConnection extends EventEmitter$1 {
     _setupSocket(): void;
     _tearDown(): void;
     close(): void;
+    isConnected(): boolean;
     _onOpen(): void;
     _onMessage(event: MessageEvent): void;
     _onClose(): void;
@@ -1083,7 +1087,7 @@ declare class VegaRtcManager implements RtcManager {
     _room: any;
     _roomSessionId: any;
     _emitter: any;
-    _serverSocket: any;
+    _serverSocket: ServerSocket;
     _webrtcProvider: any;
     _features: any;
     _eventClaim?: any;

package/dist/index.mjs

@@ -1400,6 +1400,10 @@ 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");
@@ -5098,6 +5102,9 @@ class VegaRtcManager {
         }), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
+            if (this._features.sfuReconnectV2On && !this._vegaConnection.isConnected() && this._reconnect) {
+                this._connect();
+            }
         }));
         this._connect();
     }
@@ -5108,6 +5115,17 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        if (this._features.sfuReconnectV2On) {
+            if (!this._serverSocket.isConnected()) {
+                const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
+                if (!reconnectThresholdInMs)
+                    return;
+                if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
+                    return;
+            }
+            if (this._reconnectTimeOut)
+                clearTimeout(this._reconnectTimeOut);
+        }
         const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
         const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
             .filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
@@ -6452,6 +6470,7 @@ const logger = new Logger();
 class ReconnectManager extends EventEmitter$1 {
     constructor(socket) {
         super();
+        this.reconnectThresholdInMs = 0;
         this._socket = socket;
         this._clients = {};
         this._signalDisconnectTime = undefined;
@@ -6477,6 +6496,7 @@ class ReconnectManager extends EventEmitter$1 {
     _onRoomJoined(payload) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8;
             if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
                 this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
                 return;
@@ -6730,6 +6750,7 @@ class ServerSocket {
             }
         });
         this._socket.on("disconnect", () => {
+            this.disconnectTimestamp = Date.now();
             if (this.noopKeepaliveInterval) {
                 clearInterval(this.noopKeepaliveInterval);
                 this.noopKeepaliveInterval = null;
@@ -6813,6 +6834,10 @@ class ServerSocket {
         var _a;
         return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
     }
+    getReconnectThreshold() {
+        var _a;
+        return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
+    }
 }
 
 const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;

package/dist/legacy-esm.js

@@ -1400,6 +1400,10 @@ 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");
@@ -5098,6 +5102,9 @@ class VegaRtcManager {
         }), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
+            if (this._features.sfuReconnectV2On && !this._vegaConnection.isConnected() && this._reconnect) {
+                this._connect();
+            }
         }));
         this._connect();
     }
@@ -5108,6 +5115,17 @@ class VegaRtcManager {
         });
     }
     _connect() {
+        if (this._features.sfuReconnectV2On) {
+            if (!this._serverSocket.isConnected()) {
+                const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
+                if (!reconnectThresholdInMs)
+                    return;
+                if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
+                    return;
+            }
+            if (this._reconnectTimeOut)
+                clearTimeout(this._reconnectTimeOut);
+        }
         const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
         const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
             .filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
@@ -6452,6 +6470,7 @@ const logger = new Logger();
 class ReconnectManager extends EventEmitter$1 {
     constructor(socket) {
         super();
+        this.reconnectThresholdInMs = 0;
         this._socket = socket;
         this._clients = {};
         this._signalDisconnectTime = undefined;
@@ -6477,6 +6496,7 @@ class ReconnectManager extends EventEmitter$1 {
     _onRoomJoined(payload) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8;
             if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
                 this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
                 return;
@@ -6730,6 +6750,7 @@ class ServerSocket {
             }
         });
         this._socket.on("disconnect", () => {
+            this.disconnectTimestamp = Date.now();
             if (this.noopKeepaliveInterval) {
                 clearInterval(this.noopKeepaliveInterval);
                 this.noopKeepaliveInterval = null;
@@ -6813,6 +6834,10 @@ class ServerSocket {
         var _a;
         return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
     }
+    getReconnectThreshold() {
+        var _a;
+        return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
+    }
 }
 
 const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;

package/package.json

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