mosquito-transport-js 0.6.2 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/helpers/utils.js

@@ -179,18 +179,13 @@ export const awaitStore = () => new Promise(resolve => {
 
 export const checkAreYouOk = (projectUrl) => {
     if (!Scoped.AreYouOkPromise[projectUrl]) {
-        const signal = new AbortController();
-        const timer = setTimeout(() => {
-            signal.abort();
-        }, 9000);
-        const promise = fetch(engine_api._areYouOk(projectUrl), { credentials: 'omit', signal })
+        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);
 
-                clearTimeout(timer);
                 delete Scoped.AreYouOkPromise[projectUrl];
                 return connected;
             });

package/src/index.js

@@ -73,7 +73,6 @@ export class MosquitoTransport {
             });
 
             let connectionIte = 0;
-            let chainedPromise;
             const setConnected = c => {
                 isConnected = c;
                 Scoped.IS_CONNECTED[projectUrl] = isConnected;
@@ -90,11 +89,9 @@ export class MosquitoTransport {
             };
 
             const manualCheckConnection = () => {
-                if (chainedPromise) return;
                 const ref = ++connectionIte;
 
                 checkAreYouOk(projectUrl).then(ok => {
-                    chainedPromise = undefined;
                     if (ref !== connectionIte) return;
                     if (ok) {
                         onConnect();

package/src/products/auth/accessor.js

@@ -2,7 +2,7 @@ import { doSignOut, revokeAuthIntance } from "./index.js";
 import EngineApi from "../../helpers/engine_api";
 import { AuthTokenListener, TokenRefreshListener } from "../../helpers/listeners";
 import { decodeBinary, deserializeE2E } from "../../helpers/peripherals";
-import { awaitReachableServer, awaitStore, buildFetchInterface, buildFetchResult, updateCacheStore } from "../../helpers/utils";
+import { awaitReachableServer, awaitStore, buildFetchInterface, buildFetchResult, getReachableServer, updateCacheStore } from "../../helpers/utils";
 import { CacheStore, Scoped } from "../../helpers/variables";
 import { simplifyError } from "simplify-error";
 import { Validator } from "guard-object";
@@ -75,6 +75,19 @@ export const awaitRefreshToken = (projectUrl) =>
         }
     });
 
+export const ensureActiveToken = async (projectUrl) => {
+    if (await getReachableServer(projectUrl)) {
+        await awaitRefreshToken(projectUrl);
+    } else {
+        const emulatedURL = CacheStore.EmulatedAuth[projectUrl];
+        const { token } = CacheStore.AuthStore[emulatedURL || projectUrl] || {};
+
+        if (token && await hasTokenExpire(emulatedURL || projectUrl)) {
+            throw 'unable to refreshed expired token because of unreachable internet connection';
+        }
+    }
+}
+
 export const listenTokenReady = (callback, projectUrl) => TokenRefreshListener.listenToPersist(projectUrl, callback);
 
 export const initTokenRefresher = async ({ config, forceRefresh, justCheck }) => {

package/src/products/auth/index.js

@@ -54,11 +54,13 @@ export default class MTAuth {
             const processID = ++lastInitRef;
             await awaitRefreshToken(projectUrl);
 
+            if (processID !== lastInitRef || hasCancelled) return;
+
             if (!Scoped.AuthJWTToken[projectUrl]) {
                 onError?.(simplifyError('user_login_required', 'You must be signed-in to use this method').simpleError);
                 return;
             }
-            if (processID !== lastInitRef || hasCancelled) return;
+
             const mtoken = Scoped.AuthJWTToken[projectUrl],
                 [reqBuilder, [privateKey]] = uglify ? await serializeE2E({ mtoken }, undefined, serverE2E_PublicKey) : [null, []];
 
@@ -251,6 +253,7 @@ const clearCacheForSignout = (builder, disposeEmulated) => {
     purgeCache(projectUrl, true);
     if (disposeEmulated) getEmulatedLinks(projectUrl).forEach(e => purgeCache(e));
 
+    clearInterval(Scoped.TokenRefreshTimer[projectUrl]);
     setTimeout(() => {
         initTokenRefresher({ config: builder });
     }, 600);

package/src/products/database/index.js

@@ -6,7 +6,7 @@ import { awaitReachableServer, awaitStore, buildFetchInterface, buildFetchResult
 import { CacheStore, Scoped } from "../../helpers/variables";
 import { addPendingWrites, generateRecordID, getCountQuery, getRecord, insertCountQuery, insertRecord, listenQueryEntry, removePendingWrite, validateWriteValue } from "./accessor";
 import { validateCollectionName, validateFilter, validateFindConfig, validateFindObject, validateListenFindConfig } from "./validator";
-import { awaitRefreshToken, listenTokenReady } from "../auth/accessor";
+import { awaitRefreshToken, ensureActiveToken, listenTokenReady } from "../auth/accessor";
 import { DELIVERY, RETRIEVAL } from "../../helpers/values";
 import { ObjectId } from "bson";
 import { guardObject, Validator } from "guard-object";
@@ -525,8 +525,7 @@ const countCollection = async (builder, config) => {
         };
 
         try {
-            if (!disableAuth && await getReachableServer(projectUrl))
-                await awaitRefreshToken(projectUrl);
+            if (!disableAuth) await ensureActiveToken(projectUrl);
 
             const [reqBuilder, [privateKey]] = await buildFetchInterface({
                 body: {
@@ -675,8 +674,7 @@ const findObject = async (builder, initConfig) => {
                 }
             }
 
-            if (!disableAuth && await getReachableServer(projectUrl))
-                await awaitRefreshToken(projectUrl);
+            if (!disableAuth) await ensureActiveToken(projectUrl);
 
             const [reqBuilder, [privateKey]] = await buildFetchInterface({
                 body: {
@@ -838,8 +836,7 @@ const commitData = async (builder, value, type, config) => {
         };
 
         try {
-            if (!disableAuth && await getReachableServer(projectUrl))
-                await awaitRefreshToken(projectUrl);
+            if (!disableAuth) await ensureActiveToken(projectUrl);
 
             const [reqBuilder, [privateKey]] = await buildFetchInterface({
                 body: {

package/src/products/http_callable/index.js

@@ -1,9 +1,9 @@
 import { Buffer } from "buffer";
 import { deserializeE2E, niceHash, normalizeRoute, serializeE2E } from "../../helpers/peripherals";
-import { awaitReachableServer, awaitStore, getReachableServer } from "../../helpers/utils";
+import { awaitReachableServer, awaitStore } from "../../helpers/utils";
 import { RETRIEVAL } from "../../helpers/values";
 import { Scoped } from "../../helpers/variables";
-import { awaitRefreshToken, parseToken } from "../auth/accessor";
+import { ensureActiveToken, parseToken } from "../auth/accessor";
 import { simplifyCaughtError } from "simplify-error";
 import { guardObject, Validator } from "guard-object";
 import { serialize } from "entity-serializer";
@@ -138,8 +138,7 @@ export const mfetch = async (input = '', init, config) => {
                 }
             }
 
-            if (!disableAuth && await getReachableServer(projectUrl))
-                await awaitRefreshToken(projectUrl);
+            if (!disableAuth) await ensureActiveToken(projectUrl);
 
             const mtoken = disableAuth ? undefined : Scoped.AuthJWTToken[projectUrl];
             const initType = rawHeader['content-type'];