@whereby.com/media 1.25.0 → 1.26.0

package/dist/legacy-esm.js

@@ -4202,215 +4202,6 @@ class P2pRtcManager {
     }
 }
 
-class SfuV2Parser {
-    static parse(raw) {
-        let object;
-        try {
-            object = JSON.parse(raw);
-        }
-        catch (error) {
-            return;
-        }
-        if (typeof object !== "object" || Array.isArray(object)) {
-            return;
-        }
-        if (object.request) {
-            return SfuV2Parser._handleRequest(object);
-        }
-        else if (object.response) {
-            return SfuV2Parser._handleResponse(object);
-        }
-        else if (object.message) {
-            return SfuV2Parser._handleMessage(object);
-        }
-        else {
-            return;
-        }
-    }
-    static _handleRequest(rawMessage) {
-        const message = {};
-        message.request = true;
-        if (typeof rawMessage.method !== "string") {
-            return;
-        }
-        if (typeof rawMessage.id !== "number") {
-            return;
-        }
-        message.id = rawMessage.id;
-        message.method = rawMessage.method;
-        message.data = rawMessage.data || {};
-        return message;
-    }
-    static _handleResponse(rawMessage) {
-        const message = {};
-        message.response = true;
-        if (typeof rawMessage.id !== "number") {
-            return;
-        }
-        message.id = rawMessage.id;
-        if (rawMessage.ok) {
-            message.ok = true;
-            message.data = rawMessage.data || {};
-        }
-        else {
-            message.ok = false;
-            message.errorCode = rawMessage.errorCode;
-            message.errorReason = rawMessage.errorReason;
-        }
-        return message;
-    }
-    static _handleMessage(rawMessage) {
-        const message = {};
-        message.message = true;
-        if (typeof rawMessage.method !== "string") {
-            return;
-        }
-        message.method = rawMessage.method;
-        message.data = rawMessage.data || {};
-        return message;
-    }
-    static createRequest(method, data) {
-        return {
-            request: true,
-            id: Math.round(Math.random() * 10000000),
-            method,
-            data: data || {},
-        };
-    }
-    static createSuccessResponse(request, data) {
-        return {
-            response: true,
-            id: request.id,
-            ok: true,
-            data: data || {},
-        };
-    }
-    static createErrorResponse(request, errorCode, errorReason) {
-        return {
-            response: true,
-            id: request.id,
-            errorCode,
-            errorReason,
-        };
-    }
-    static createMessage(method, data) {
-        return {
-            message: true,
-            method,
-            data: data || {},
-        };
-    }
-}
-
-const logger$6 = new Logger();
-class VegaConnection extends EventEmitter$1 {
-    constructor(wsUrl, protocol = "whereby-sfu#v4") {
-        super();
-        this.socket = null;
-        this.wsUrl = wsUrl;
-        this.protocol = protocol;
-        this.sents = new Map();
-        this._setupSocket();
-    }
-    _setupSocket() {
-        this.socket = new WebSocket(this.wsUrl, this.protocol);
-        this.socket.onopen = this._onOpen.bind(this);
-        this.socket.onmessage = this._onMessage.bind(this);
-        this.socket.onclose = this._onClose.bind(this);
-        this.socket.onerror = this._onError.bind(this);
-    }
-    _tearDown() {
-        if (this.socket === null)
-            return;
-        this.socket.onopen = null;
-        this.socket.onmessage = null;
-        this.socket.onclose = null;
-        this.socket.onerror = null;
-        this.socket = null;
-        this.sents.forEach((sent) => sent.close());
-        this.emit("close");
-    }
-    close() {
-        var _a;
-        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
-    }
-    _onOpen() {
-        logger$6.info("Connected");
-        this.emit("open");
-    }
-    _onMessage(event) {
-        const socketMessage = SfuV2Parser.parse(event.data);
-        logger$6.info("Received message", socketMessage);
-        if (socketMessage === null || socketMessage === void 0 ? void 0 : socketMessage.response) {
-            this._handleResponse(socketMessage);
-        }
-        else if (socketMessage === null || socketMessage === void 0 ? void 0 : socketMessage.message) {
-            this.emit("message", socketMessage);
-        }
-    }
-    _onClose() {
-        logger$6.info("Disconnected");
-        this._tearDown();
-    }
-    _onError(error) {
-        logger$6.info("Error", error);
-    }
-    _handleResponse(socketMessage) {
-        const sent = this.sents.get(socketMessage.id);
-        if (socketMessage.ok) {
-            sent.resolve(socketMessage.data);
-        }
-        else {
-            const error = new Error(socketMessage.errorReason);
-            sent.reject(error);
-        }
-    }
-    send(message) {
-        try {
-            if (this.socket) {
-                this.socket.send(JSON.stringify(message));
-            }
-        }
-        catch (error) { }
-    }
-    message(method, data = {}) {
-        const message = SfuV2Parser.createMessage(method, data);
-        this.send(message);
-    }
-    request(method, data = {}, timeout = 1500 * (15 + 0.1 * this.sents.size)) {
-        const request = SfuV2Parser.createRequest(method, data);
-        this.send(request);
-        return new Promise((pResolve, pReject) => {
-            const sent = {
-                id: request.id,
-                method: request.method,
-                resolve: (data2) => {
-                    if (!this.sents.delete(request.id))
-                        return;
-                    clearTimeout(sent.timer);
-                    pResolve(data2);
-                },
-                reject: (error) => {
-                    if (!this.sents.delete(request.id))
-                        return;
-                    clearTimeout(sent.timer);
-                    pReject(error);
-                },
-                timer: setTimeout(() => {
-                    if (!this.sents.delete(request.id))
-                        return;
-                    pReject(new Error("request timeout"));
-                }, timeout),
-                close: () => {
-                    clearTimeout(sent.timer);
-                    pReject(new Error("transport closed"));
-                },
-            };
-            this.sents.set(request.id, sent);
-        });
-    }
-}
-
 class KalmanFilter {
     constructor({ R = 0.01, Q = 2, A = 1.1, B = 1, C = 1.2 } = { R: 0.01, Q: 2, A: 1.1, B: 1, C: 1.2 }) {
         this.R = R;
@@ -4519,7 +4310,7 @@ const defaultParams = {
     scoreFormula: "300 * bands[1].avg / Math.max(bands[1].avg + bands[0].avg, 0.01)",
     outFormula: "score",
 };
-const logger$5 = new Logger();
+const logger$6 = new Logger();
 function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
     const audioCtx = new AudioContext();
     let analyser = null;
@@ -4541,7 +4332,7 @@ function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
                 lastTrackWasOurs = true;
             }
             catch (ex) {
-                logger$5.warn("unable to fetch new track for colocation speaker analysis, using current", ex);
+                logger$6.warn("unable to fetch new track for colocation speaker analysis, using current", ex);
             }
         }
         lastTrack = track;
@@ -4628,7 +4419,7 @@ function createMicAnalyser({ micTrack, params, onScoreUpdated, }) {
     };
 }
 
-const logger$4 = new Logger();
+const logger$5 = new Logger();
 const MEDIA_QUALITY = Object.freeze({
     ok: "ok",
     warning: "warning",
@@ -4698,7 +4489,7 @@ class VegaMediaQualityMonitor extends EventEmitter {
     }
     addProducer(clientId, producerId) {
         if (!clientId || !producerId || !(typeof clientId === "string" && typeof producerId === "string")) {
-            logger$4.warn("Missing clientId or producerId");
+            logger$5.warn("Missing clientId or producerId");
             return;
         }
         if (!this._producers[clientId]) {
@@ -4714,7 +4505,7 @@ class VegaMediaQualityMonitor extends EventEmitter {
     }
     addConsumer(clientId, consumerId) {
         if (!clientId || !consumerId) {
-            logger$4.warn("Missing clientId or consumerId");
+            logger$5.warn("Missing clientId or consumerId");
             return;
         }
         if (!this._producers[clientId]) {
@@ -4732,14 +4523,14 @@ class VegaMediaQualityMonitor extends EventEmitter {
         if (!Array.isArray(score) ||
             score.length === 0 ||
             score.some((s) => !s || !s.hasOwnProperty("score") || typeof s.score !== "number" || isNaN(s.score))) {
-            logger$4.warn("Unexpected producer score format");
+            logger$5.warn("Unexpected producer score format");
             return;
         }
         this._producers[clientId][producerId] = { kind, score: this._calcAvgProducerScore(score.map((s) => s.score)) };
     }
     addConsumerScore(clientId, consumerId, kind, score) {
         if (!score || !score.hasOwnProperty("producerScores") || !Array.isArray(score.producerScores)) {
-            logger$4.warn("Unexpected consumer score format");
+            logger$5.warn("Unexpected consumer score format");
             return;
         }
         this._producers[clientId][consumerId] = { kind, score: this._calcAvgProducerScore(score.producerScores) };
@@ -4776,7 +4567,7 @@ class VegaMediaQualityMonitor extends EventEmitter {
             }
         }
         catch (error) {
-            logger$4.error(error);
+            logger$5.error(error);
             return 0;
         }
     }
@@ -4817,6 +4608,215 @@ function getNumberOfTemporalLayers(consumer) {
     return /T3/.test(((_c = (_b = (_a = consumer._rtpParameters) === null || _a === void 0 ? void 0 : _a.encodings) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.scalabilityMode) || "") ? 3 : 2;
 }
 
+class SfuV2Parser {
+    static parse(raw) {
+        let object;
+        try {
+            object = JSON.parse(raw);
+        }
+        catch (error) {
+            return;
+        }
+        if (typeof object !== "object" || Array.isArray(object)) {
+            return;
+        }
+        if (object.request) {
+            return SfuV2Parser._handleRequest(object);
+        }
+        else if (object.response) {
+            return SfuV2Parser._handleResponse(object);
+        }
+        else if (object.message) {
+            return SfuV2Parser._handleMessage(object);
+        }
+        else {
+            return;
+        }
+    }
+    static _handleRequest(rawMessage) {
+        const message = {};
+        message.request = true;
+        if (typeof rawMessage.method !== "string") {
+            return;
+        }
+        if (typeof rawMessage.id !== "number") {
+            return;
+        }
+        message.id = rawMessage.id;
+        message.method = rawMessage.method;
+        message.data = rawMessage.data || {};
+        return message;
+    }
+    static _handleResponse(rawMessage) {
+        const message = {};
+        message.response = true;
+        if (typeof rawMessage.id !== "number") {
+            return;
+        }
+        message.id = rawMessage.id;
+        if (rawMessage.ok) {
+            message.ok = true;
+            message.data = rawMessage.data || {};
+        }
+        else {
+            message.ok = false;
+            message.errorCode = rawMessage.errorCode;
+            message.errorReason = rawMessage.errorReason;
+        }
+        return message;
+    }
+    static _handleMessage(rawMessage) {
+        const message = {};
+        message.message = true;
+        if (typeof rawMessage.method !== "string") {
+            return;
+        }
+        message.method = rawMessage.method;
+        message.data = rawMessage.data || {};
+        return message;
+    }
+    static createRequest(method, data) {
+        return {
+            request: true,
+            id: Math.round(Math.random() * 10000000),
+            method,
+            data: data || {},
+        };
+    }
+    static createSuccessResponse(request, data) {
+        return {
+            response: true,
+            id: request.id,
+            ok: true,
+            data: data || {},
+        };
+    }
+    static createErrorResponse(request, errorCode, errorReason) {
+        return {
+            response: true,
+            id: request.id,
+            errorCode,
+            errorReason,
+        };
+    }
+    static createMessage(method, data) {
+        return {
+            message: true,
+            method,
+            data: data || {},
+        };
+    }
+}
+
+const logger$4 = new Logger();
+class VegaConnection extends EventEmitter$1 {
+    constructor(wsUrl, protocol = "whereby-sfu#v4") {
+        super();
+        this.socket = null;
+        this.wsUrl = wsUrl;
+        this.protocol = protocol;
+        this.sents = new Map();
+        this._setupSocket();
+    }
+    _setupSocket() {
+        this.socket = new WebSocket(this.wsUrl, this.protocol);
+        this.socket.onopen = this._onOpen.bind(this);
+        this.socket.onmessage = this._onMessage.bind(this);
+        this.socket.onclose = this._onClose.bind(this);
+        this.socket.onerror = this._onError.bind(this);
+    }
+    _tearDown() {
+        if (this.socket === null)
+            return;
+        this.socket.onopen = null;
+        this.socket.onmessage = null;
+        this.socket.onclose = null;
+        this.socket.onerror = null;
+        this.socket = null;
+        this.sents.forEach((sent) => sent.close());
+        this.emit("close");
+    }
+    close() {
+        var _a;
+        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
+    }
+    _onOpen() {
+        logger$4.info("Connected");
+        this.emit("open");
+    }
+    _onMessage(event) {
+        const socketMessage = SfuV2Parser.parse(event.data);
+        logger$4.info("Received message", socketMessage);
+        if (socketMessage === null || socketMessage === void 0 ? void 0 : socketMessage.response) {
+            this._handleResponse(socketMessage);
+        }
+        else if (socketMessage === null || socketMessage === void 0 ? void 0 : socketMessage.message) {
+            this.emit("message", socketMessage);
+        }
+    }
+    _onClose() {
+        logger$4.info("Disconnected");
+        this._tearDown();
+    }
+    _onError(error) {
+        logger$4.info("Error", error);
+    }
+    _handleResponse(socketMessage) {
+        const sent = this.sents.get(socketMessage.id);
+        if (socketMessage.ok) {
+            sent.resolve(socketMessage.data);
+        }
+        else {
+            const error = new Error(socketMessage.errorReason);
+            sent.reject(error);
+        }
+    }
+    send(message) {
+        try {
+            if (this.socket) {
+                this.socket.send(JSON.stringify(message));
+            }
+        }
+        catch (error) { }
+    }
+    message(method, data = {}) {
+        const message = SfuV2Parser.createMessage(method, data);
+        this.send(message);
+    }
+    request(method, data = {}, timeout = 1500 * (15 + 0.1 * this.sents.size)) {
+        const request = SfuV2Parser.createRequest(method, data);
+        this.send(request);
+        return new Promise((pResolve, pReject) => {
+            const sent = {
+                id: request.id,
+                method: request.method,
+                resolve: (data2) => {
+                    if (!this.sents.delete(request.id))
+                        return;
+                    clearTimeout(sent.timer);
+                    pResolve(data2);
+                },
+                reject: (error) => {
+                    if (!this.sents.delete(request.id))
+                        return;
+                    clearTimeout(sent.timer);
+                    pReject(error);
+                },
+                timer: setTimeout(() => {
+                    if (!this.sents.delete(request.id))
+                        return;
+                    pReject(new Error("request timeout"));
+                }, timeout),
+                close: () => {
+                    clearTimeout(sent.timer);
+                    pReject(new Error("transport closed"));
+                },
+            };
+            this.sents.set(request.id, sent);
+        });
+    }
+}
+
 const timeNextServer = 500;
 const minTimeNextServerSameDC = 2000;
 const timeToWaitForEarlyServerClose = 100;
@@ -4872,6 +4872,21 @@ function createVegaConnectionManager(config) {
         let connectionsToResolve = targetHostList.length;
         let hasNotifiedDisconnect = false;
         let wasConnected = false;
+        const beforeNetworkPossiblyDownTime = lastNetworkPossiblyDownTime;
+        const handleFailedOrAbortedConnection = () => {
+            var _a;
+            connectionsToResolve--;
+            if (connectionsToResolve === 0 && !hasNotifiedDisconnect) {
+                connectionAttemptInProgress = false;
+                if (hasPendingConnectionAttempt) {
+                    setTimeout(connect, 0);
+                }
+                else {
+                    (_a = config.onFailed) === null || _a === void 0 ? void 0 : _a.call(config);
+                }
+            }
+        };
+        const timers = [];
         targetHostList.forEach(({ host, dc }, index) => {
             if (index > 0) {
                 timeBeforeConnect += timeNextServer;
@@ -4879,10 +4894,19 @@ function createVegaConnectionManager(config) {
                 timeBeforeConnect = Math.max(timeBeforeConnect, minTimeBeforeConnect);
             }
             prevTimeBeforeConnectByDC[dc] = timeBeforeConnect;
-            setTimeout(() => {
+            timers.push(setTimeout(() => {
                 var _a;
+                timers.shift();
                 if (wasConnected)
                     return;
+                if (beforeNetworkPossiblyDownTime !== lastNetworkPossiblyDownTime) {
+                    handleFailedOrAbortedConnection();
+                    timers.forEach((timeoutId) => {
+                        clearTimeout(timeoutId);
+                        handleFailedOrAbortedConnection();
+                    });
+                    return;
+                }
                 const vegaConnection = new VegaConnection(((_a = config.getUrlForHost) === null || _a === void 0 ? void 0 : _a.call(config, host)) || host);
                 let wasClosed = false;
                 vegaConnection.on("open", () => {
@@ -4946,7 +4970,7 @@ function createVegaConnectionManager(config) {
                     }, timeToWaitForEarlyServerClose);
                 });
                 vegaConnection.on("close", () => {
-                    var _a, _b;
+                    var _a;
                     wasClosed = true;
                     if (vegaConnection === nominatedConnection) {
                         nominatedConnection = undefined;
@@ -4954,18 +4978,9 @@ function createVegaConnectionManager(config) {
                         hasNotifiedDisconnect = true;
                         (_a = config.onDisconnected) === null || _a === void 0 ? void 0 : _a.call(config);
                     }
-                    connectionsToResolve--;
-                    if (connectionsToResolve === 0 && !hasNotifiedDisconnect) {
-                        connectionAttemptInProgress = false;
-                        if (hasPendingConnectionAttempt) {
-                            setTimeout(connect, 0);
-                        }
-                        else {
-                            (_b = config.onFailed) === null || _b === void 0 ? void 0 : _b.call(config);
-                        }
-                    }
+                    handleFailedOrAbortedConnection();
                 });
-            }, timeBeforeConnect);
+            }, timeBeforeConnect));
         });
     };
     updateHostList(config.initialHostList);
@@ -5051,7 +5066,6 @@ class VegaRtcManager {
         this._socketListenerDeregisterFunctions = [];
         this._reconnect = true;
         this._reconnectTimeOut = null;
-        this._hasVegaConnection = false;
         this._isConnectingOrConnected = false;
         this._qualityMonitor = new VegaMediaQualityMonitor();
         this._qualityMonitor.on(PROTOCOL_EVENTS.MEDIA_QUALITY_CHANGED, (payload) => {
@@ -5121,7 +5135,7 @@ class VegaRtcManager {
             }
             if (this._screenVideoTrack)
                 this._emitScreenshareStarted();
-            if (this._features.sfuReconnectV2On && !this._hasVegaConnection && this._reconnect) {
+            if (this._features.sfuReconnectV2On && this._reconnect) {
                 this._connect();
             }
         }), this._serverSocket.on("connect", () => this._onNetworkIsDetectedUpBySignal()), this._serverSocket.onEngineEvent("packet", () => this._onNetworkIsDetectedUpBySignal()), this._serverSocket.on("disconnect", () => this._onNetworkIsDetectedPossiblyDownBySignal()));
@@ -5134,34 +5148,6 @@ class VegaRtcManager {
         });
     }
     _connect() {
-        if (this._features.sfuConnectionManagerOn)
-            return this._connect_v2();
-        if (this._features.sfuReconnectV2On) {
-            if (this._hasVegaConnection)
-                return;
-            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))
-            .reduce((prev, current) => (Object.assign(Object.assign({}, prev), { [current]: this._features[current] })), {})));
-        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));
-    }
-    _connect_v2() {
         if (this._features.sfuReconnectV2On) {
             if (this._isConnectingOrConnected)
                 return;
@@ -5214,7 +5200,6 @@ class VegaRtcManager {
     _onClose() {
         var _a, _b;
         logger$3.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;

package/package.json

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