@stream-io/video-client 1.7.2 → 1.7.4

package/dist/index.cjs.js

@@ -2896,6 +2896,13 @@ function convertErrorToJson(err) {
     }
     return jsonObj;
 }
+/**
+ * Informs if a promise is yet to be resolved or rejected
+ */
+async function isPromisePending(promise) {
+    const emptyObj = {};
+    return Promise.race([promise, emptyObj]).then((value) => (value === emptyObj ? true : false), () => false);
+}
 /**
  * isOnline safely return the navigator.online value for browser env
  * if navigator is not in global object, it always return true
@@ -2949,7 +2956,7 @@ const logLevels = Object.freeze({
     warn: 3,
     error: 4,
 });
-let logger$1;
+let logger;
 let level = 'info';
 const logToConsole = (logLevel, message, ...args) => {
     let logMethod;
@@ -2983,7 +2990,7 @@ const logToConsole = (logLevel, message, ...args) => {
     logMethod(message, ...args);
 };
 const setLogger = (l, lvl) => {
-    logger$1 = l;
+    logger = l;
     if (lvl) {
         setLogLevel(lvl);
     }
@@ -2993,7 +3000,7 @@ const setLogLevel = (l) => {
 };
 const getLogLevel = () => level;
 const getLogger = (withTags) => {
-    const loggerMethod = logger$1 || logToConsole;
+    const loggerMethod = logger || logToConsole;
     const tags = (withTags || []).filter(Boolean).join(':');
     const result = (logLevel, message, ...args) => {
         if (logLevels[logLevel] >= logLevels[level]) {
@@ -3034,7 +3041,7 @@ const retryable = async (rpc, signal) => {
     return result;
 };
 
-const version = "1.7.2";
+const version = "1.7.4";
 const [major, minor, patch] = version.split('.');
 let sdkInfo = {
     type: SdkType.PLAIN_JAVASCRIPT,
@@ -11384,6 +11391,15 @@ class StableWSConnection {
                 this._log(`_connect() - tokenProvider failed before, so going to retry`);
                 await this.client.tokenManager.loadToken();
             }
+            let mustSetupConnectionIdPromise = true;
+            if (this.client.connectionIdPromise) {
+                if (await isPromisePending(this.client.connectionIdPromise)) {
+                    mustSetupConnectionIdPromise = false;
+                }
+            }
+            if (mustSetupConnectionIdPromise) {
+                this.client._setupConnectionIdPromise();
+            }
             this._setupConnectionPromise();
             const wsURL = this._buildUrl();
             this._log(`_connect() - Connecting to ${wsURL}`, {
@@ -11409,6 +11425,7 @@ class StableWSConnection {
             }
         }
         catch (err) {
+            await this.client._setupConnectionIdPromise();
             this.isConnecting = false;
             // @ts-ignore
             this._log(`_connect() - Error - `, err);
@@ -11910,27 +11927,31 @@ class WSConnectionFallback {
     }
 }
 
-const logger = getLogger(['location']);
-const HINT_URL = `https://hint.stream-io-video.com/`;
-const getLocationHint = async (hintUrl = HINT_URL, timeout = 2000) => {
-    const abortController = new AbortController();
-    const timeoutId = setTimeout(() => abortController.abort(), timeout);
-    try {
-        const response = await fetch(hintUrl, {
-            method: 'HEAD',
-            signal: abortController.signal,
-        });
-        const awsPop = response.headers.get('x-amz-cf-pop') || 'ERR';
-        logger('debug', `Location header: ${awsPop}`);
-        return awsPop.substring(0, 3); // AMS1-P2 -> AMS
-    }
-    catch (e) {
-        logger('warn', `Failed to get location hint from ${hintUrl}`, e);
-        return 'ERR';
-    }
-    finally {
-        clearTimeout(timeoutId);
-    }
+const getLocationHint = async (hintUrl = `https://hint.stream-io-video.com/`, timeout = 2000, maxAttempts = 3) => {
+    const logger = getLogger(['location-hint']);
+    let attempt = 0;
+    let locationHint = 'ERR';
+    do {
+        const abortController = new AbortController();
+        const timeoutId = setTimeout(() => abortController.abort(), timeout);
+        try {
+            const response = await fetch(hintUrl, {
+                method: 'HEAD',
+                signal: abortController.signal,
+            });
+            const awsPop = response.headers.get('x-amz-cf-pop') || 'ERR';
+            logger('debug', `Location header: ${awsPop}`);
+            locationHint = awsPop.substring(0, 3); // AMS1-P2 -> AMS
+        }
+        catch (e) {
+            logger('warn', `Failed to get location hint from ${hintUrl}`, e);
+            locationHint = 'ERR';
+        }
+        finally {
+            clearTimeout(timeoutId);
+        }
+    } while (locationHint === 'ERR' && ++attempt < maxAttempts);
+    return locationHint;
 };
 
 class StreamClient {
@@ -12066,10 +12087,7 @@ class StreamClient {
                 this.logger('info', 'client:openConnection() - openConnection called twice, healthy connection already exists');
                 return Promise.resolve();
             }
-            this.connectionIdPromise = new Promise((resolve, reject) => {
-                this.resolveConnectionId = resolve;
-                this.rejectConnectionId = reject;
-            });
+            this._setupConnectionIdPromise();
             this.clientID = `${this.userID}--${randomId()}`;
             this.wsPromise = this.connect();
             return this.wsPromise;
@@ -12109,10 +12127,7 @@ class StreamClient {
          */
         this.connectAnonymousUser = async (user, tokenOrProvider) => {
             addConnectionEventListeners(this.updateNetworkConnectionStatus);
-            this.connectionIdPromise = new Promise((resolve, reject) => {
-                this.resolveConnectionId = resolve;
-                this.rejectConnectionId = reject;
-            });
+            this._setupConnectionIdPromise();
             this.anonymous = true;
             await this._setToken(user, tokenOrProvider, this.anonymous);
             this._setUser(user);
@@ -12151,6 +12166,16 @@ class StreamClient {
             this.logger('debug', `Removing listener for ${eventName} event`);
             this.listeners[eventName] = this.listeners[eventName]?.filter((value) => value !== callback);
         };
+        /**
+         * sets up the this.connectionIdPromise
+         */
+        this._setupConnectionIdPromise = async () => {
+            /** a promise that is resolved once connection id is set */
+            this.connectionIdPromise = new Promise((resolve, reject) => {
+                this.resolveConnectionId = resolve;
+                this.rejectConnectionId = reject;
+            });
+        };
         this._logApiRequest = (type, url, data, config) => {
             this.logger('trace', `client: ${type} - Request - ${url}`, {
                 payload: data,
@@ -12173,8 +12198,18 @@ class StreamClient {
                 await Promise.all([
                     this.tokenManager.tokenReady(),
                     this.guestUserCreatePromise,
-                    this.connectionIdPromise,
                 ]);
+                // we need to wait for presence of connection id before making requests
+                try {
+                    await this.connectionIdPromise;
+                }
+                catch (e) {
+                    // in case connection id was rejected
+                    // reconnection maybe in progress
+                    // we can wait for healthy connection to resolve, which rejects when 15s timeout is reached
+                    await this.wsConnection?._waitForHealthy();
+                    await this.connectionIdPromise;
+                }
             }
             const requestConfig = this._enrichAxiosOptions(options);
             try {
@@ -12357,7 +12392,7 @@ class StreamClient {
             });
         };
         this.getUserAgent = () => {
-            const version = "1.7.2";
+            const version = "1.7.4";
             return (this.userAgent ||
                 `stream-video-javascript-client-${this.node ? 'node' : 'browser'}-${version}`);
         };
@@ -12440,7 +12475,7 @@ class StreamClient {
         this.browser = inputOptions.browser || typeof window !== 'undefined';
         this.node = !this.browser;
         if (this.browser) {
-            this.locationHint = getLocationHint(options?.locationHintUrl, options?.locationHintTimeout);
+            this.locationHint = getLocationHint(options?.locationHintUrl, options?.locationHintTimeout, options?.locationHintMaxAttempts);
         }
         this.options = {
             timeout: 5000,