react-native-mosquito-transport 0.0.54 → 0.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/helpers/utils.js

@@ -155,14 +155,27 @@ export const awaitStore = () => new Promise(resolve => {
     });
 });
 
-export const checkAreYouOk = (projectUrl) => {
-    if (!Scoped.AreYouOkPromise[projectUrl]) {
+export const checkAreYouOk = (projectUrl, refresh) => {
+    if (!Scoped.AreYouOkPromise[projectUrl] || refresh) {
+        Scoped.IS_CONNECTED[projectUrl] = undefined;
+        ServerReachableListener.dispatchPersist(projectUrl, undefined);
+
+        const thatState = AppState.currentState;
+
         const promise = fetch(engine_api._areYouOk(projectUrl), { credentials: 'omit' })
             .then(async r => (await r.json()).status === 'yes')
             .catch(() => false)
             .then(async connected => {
-                Scoped.IS_CONNECTED[projectUrl] = connected;
-                ServerReachableListener.dispatchPersist(projectUrl, connected);
+                const thatPromise = Scoped.AreYouOkPromise[projectUrl];
+                if (thatPromise !== promise) {
+                    if (thatPromise) return thatPromise;
+                    return Scoped.IS_CONNECTED[projectUrl];
+                }
+
+                if (thatState === AppState.currentState) {
+                    Scoped.IS_CONNECTED[projectUrl] = connected;
+                    ServerReachableListener.dispatchPersist(projectUrl, connected);
+                }
 
                 delete Scoped.AreYouOkPromise[projectUrl];
                 return connected;
@@ -177,30 +190,38 @@ export const checkAreYouOk = (projectUrl) => {
 export const listenReachableServer = (callback, projectUrl) => {
     let lastValue;
     return ServerReachableListener.listenToPersist(projectUrl, t => {
-        if (typeof t === 'boolean' && t !== lastValue) callback?.(t);
-        lastValue = t;
+        if (typeof t === 'boolean' && t !== lastValue) {
+            callback?.(t);
+            lastValue = t;
+        }
     });
 };
 
-export const awaitReachableServer = (projectUrl) =>
-    new Promise(async resolve => {
-        if (AppState.currentState !== 'active') {
-            if (await checkAreYouOk(projectUrl)) {
+export const awaitReachableServer = (projectUrl, pauseForRetry) =>
+    new Promise(resolve => {
+        const check = async () => {
+            if (AppState.currentState !== 'active') {
+                if (await checkAreYouOk(projectUrl)) {
+                    resolve();
+                    return;
+                }
+            }
+
+            if (Scoped.IS_CONNECTED[projectUrl]) {
                 resolve();
                 return;
             }
-        }
 
-        if (Scoped.IS_CONNECTED[projectUrl]) {
-            resolve();
-            return;
+            const l = listenReachableServer(t => {
+                if (!t) return;
+                resolve();
+                l();
+            }, projectUrl);
         }
 
-        const l = listenReachableServer(t => {
-            if (!t) return;
-            resolve();
-            l();
-        }, projectUrl);
+        if (pauseForRetry) {
+            setTimeout(check, Number.isInteger(pauseForRetry) ? pauseForRetry : 500);
+        } else check();
     });
 
 export const getReachableServer = (projectUrl) =>

package/src/index.d.ts

@@ -297,6 +297,14 @@ export interface FetchHttpConfig {
     disableAuth?: boolean;
     enableMinimizer?: boolean;
     rawApproach?: boolean;
+    /**
+     * Wait for the server to come online if the response does not include a header with status 200.
+     * 
+     * This ensures that the fetchHttp method only resolves when a response with status 200 is received; otherwise, it rejects if the server is online but continues returning a non-200 status
+     * 
+     * @default false
+     */
+    enforce200?: boolean;
 }
 
 type Delievery = 'default' | 'cache-no-await' | 'no-cache-no-await' | 'no-cache-await';

package/src/index.js

@@ -89,10 +89,10 @@ class RNMT {
                 });
             };
 
-            const manualCheckConnection = () => {
+            const manualCheckConnection = (refresh) => {
                 const ref = ++connectionIte;
 
-                checkAreYouOk(projectUrl).then(ok => {
+                checkAreYouOk(projectUrl, refresh).then(ok => {
                     if (ref !== connectionIte) return;
                     if (ok) {
                         onConnect();
@@ -111,11 +111,11 @@ class RNMT {
 
             socket.on('connect', onConnect);
             socket.on('disconnect', () => {
-                manualCheckConnection();
+                manualCheckConnection(true);
             });
 
             AppState.addEventListener('change', s => {
-                manualCheckConnection();
+                if (s === 'active') manualCheckConnection();
             });
 
             const updateMountedToken = () => {
@@ -342,9 +342,7 @@ class RNMT {
                 }
 
                 if (AppState.currentState === 'active') {
-                    setTimeout(() => {
-                        awaitReachableServer(projectUrl).then(reloadIntance);
-                    }, timeout);
+                    awaitReachableServer(projectUrl, timeout).then(reloadIntance);
                 } else {
                     foregroundListener = AppState.addEventListener('change', s => {
                         if (s === 'active') {
@@ -375,7 +373,7 @@ class RNMT {
                 clearSocket();
                 if (r === 'io client disconnect' || r === 'io server disconnect') {
                     resultant.destroy();
-                } else reconnect(0);
+                } else reconnect(true);
             });
 
             clientPrivateKey = privateKey;

package/src/products/auth/accessor.js

@@ -168,7 +168,7 @@ export const getEmulatedLinks = (projectUrl) =>
         .filter(([_, v]) => v === projectUrl)
         .map(v => v[0]);
 
-const refreshToken = (builder, remainRetries = 1, isForceRefresh) =>
+const refreshToken = (builder, remainRetries = 3) =>
     new Promise(async (resolve, reject) => {
         const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
@@ -206,7 +206,7 @@ const refreshToken = (builder, remainRetries = 1, isForceRefresh) =>
                 Scoped.AuthJWTToken[v] = f.result.token;
 
                 triggerAuthToken(v, isInit);
-                if (isForceRefresh) Scoped.InitiatedForcedToken[v] = true;
+                if (isInit) Scoped.InitiatedForcedToken[v] = true;
             });
             updateCacheStore(['AuthStore']);
             initTokenRefresher({ config: builder });
@@ -221,8 +221,8 @@ const refreshToken = (builder, remainRetries = 1, isForceRefresh) =>
                 );
                 console.error(`refreshToken retry limit exceeded err:`, e);
             } else {
-                awaitReachableServer(projectUrl).then(() => {
-                    refreshToken(builder, remainRetries - 1, isForceRefresh).then(resolve, reject);
+                awaitReachableServer(projectUrl, true).then(() => {
+                    refreshToken(builder, remainRetries - 1).then(resolve, reject);
                 });
             }
         }

package/src/products/database/index.js

@@ -262,9 +262,7 @@ const listenDocument = (callback, onError, builder, config) => {
             }
 
             if (AppState.currentState === 'active') {
-                setTimeout(() => {
-                    awaitReachableServer(projectUrl).then(reloadIntance);
-                }, timeout);
+                awaitReachableServer(projectUrl, timeout).then(reloadIntance);
             } else {
                 foregroundListener = AppState.addEventListener('change', s => {
                     if (s === 'active') {
@@ -289,7 +287,7 @@ const listenDocument = (callback, onError, builder, config) => {
             clearSocket();
             if (r === 'io client disconnect' || r === 'io server disconnect') {
                 canceller();
-            } else reconnect(0);
+            } else reconnect(true);
         });
     };
 
@@ -420,9 +418,7 @@ const initOnDisconnectionTask = ({ builder, connectData, disconnectData }) => {
             }
 
             if (AppState.currentState === 'active') {
-                setTimeout(() => {
-                    awaitReachableServer(projectUrl).then(reloadIntance);
-                }, timeout);
+                awaitReachableServer(projectUrl, timeout).then(reloadIntance);
             } else {
                 foregroundListener = AppState.addEventListener('change', s => {
                     if (s === 'active') {
@@ -447,7 +443,7 @@ const initOnDisconnectionTask = ({ builder, connectData, disconnectData }) => {
             clearSocket();
             if (r === 'io client disconnect' || r === 'io server disconnect') {
                 canceller();
-            } else reconnect(0);
+            } else reconnect(true);
         });
     };
 
@@ -558,7 +554,7 @@ const countCollection = async (builder, config) => {
             } else if (retries > maxRetries) {
                 finalize(undefined, { error: 'retry_limit_exceeded', message: `retry exceed limit(${maxRetries})` });
             } else {
-                awaitReachableServer(projectUrl).then(() => {
+                awaitReachableServer(projectUrl, true).then(() => {
                     readValue().then(
                         e => { finalize(e); },
                         e => { finalize(undefined, e); }
@@ -732,7 +728,7 @@ const findObject = async (builder, initConfig) => {
             } else if (retries > maxRetries) {
                 finalize(undefined, { error: 'retry_limit_exceeded', message: `retry exceed limit(${maxRetries})` });
             } else {
-                awaitReachableServer(projectUrl).then(() => {
+                awaitReachableServer(projectUrl, true).then(() => {
                     if (intruder) {
                         intruder.resolve = undefined;
                         intruder.reject = undefined;
@@ -878,7 +874,7 @@ const commitData = async (builder, value, type, config) => {
                 );
             } else {
                 if (delivery === DELIVERY.NO_CACHE_AWAIT) {
-                    awaitReachableServer(projectUrl).then(() => {
+                    awaitReachableServer(projectUrl, true).then(() => {
                         sendValue().then(
                             e => { finalize(e.a, undefined, e.c); },
                             e => { finalize(undefined, e.b, e.c); }

package/src/products/http_callable/index.js

@@ -42,10 +42,11 @@ export const mfetch = async (input = '', init, config) => {
             enableMinimizer: t => t === undefined || Validator.BOOLEAN(t),
             rawApproach: t => t === undefined || Validator.BOOLEAN(t),
             disableAuth: t => t === undefined || Validator.BOOLEAN(t),
-            retrieval: t => t === undefined || Object.values(RETRIEVAL).includes(t)
+            retrieval: t => t === undefined || Object.values(RETRIEVAL).includes(t),
+            enforce200: t => t === undefined || Validator.BOOLEAN(t)
         }).validate(method);
 
-    const { retrieval = RETRIEVAL.DEFAULT, enableMinimizer, rawApproach } = method || {};
+    const { retrieval = RETRIEVAL.DEFAULT, enableMinimizer, rawApproach, enforce200 } = method || {};
     const isLink = Validator.LINK(input);
     const isBaseUrl = isLink || rawApproach;
     const disableAuth = method?.disableAuth === undefined ? isBaseUrl : method?.disableAuth;
@@ -163,6 +164,8 @@ export const mfetch = async (input = '', init, config) => {
             const { ok, type, status, statusText, redirected, url, headers, size } = f;
             const simple = headers.get('simple_error');
 
+            if (enforce200 && status !== 200)
+                throw `expected response status to be 200 but got ${status}`;
             if (!isLink && simple) throw { simpleError: JSON.parse(simple) };
 
             const buffer = uglified ?
@@ -215,7 +218,7 @@ export const mfetch = async (input = '', init, config) => {
             } else if (retries > maxRetries) {
                 finalize(undefined, simplifyCaughtError(e).simpleError);
             } else {
-                awaitReachableServer(projectUrl).then(() => {
+                awaitReachableServer(projectUrl, true).then(() => {
                     callFetch().then(
                         e => finalize(e),
                         e => finalize(undefined, e)