react-native-mosquito-transport 0.0.39 → 0.0.41

package/TODO

@@ -22,4 +22,5 @@
 - serverTimeOffset
 - avoid sending cookies ✅
 - add timeout in fetchHttp
+- transform undefined to void instead of null
 <!-- - error: "refreshToken retry limit exceeded" <--- no need -->

package/package.json

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

package/src/index.d.ts

@@ -230,6 +230,7 @@ interface RNMTCollection {
     });
     count: (config?: CountConfig) => Promise<number>;
     get: (config?: GetConfig) => Promise<DocumentResult[]>;
+    // TODO: change GetConfig for this listen
     listen: (callback: (snapshot?: DocumentResult[]) => void, onError?: (error?: DocumentError) => void, config?: GetConfig) => void;
     findOne: (findOne?: DocumentFind) => ({
         get: (config?: GetConfig) => Promise<DocumentResult>;
@@ -380,6 +381,12 @@ interface GetConfig {
      * To learn and see more examples on this, Please visit https://brainbehindx.com/mosquito-transport/docs/reading_data/retrieval
      */
     disableMinimizer?: boolean;
+    onWaiting: (intruder: WaitingIntruder) => void | Promise<void>;
+}
+
+interface WaitingIntruder {
+    resolve?: undefined | ((data: any) => void);
+    reject?: undefined | ((err: any) => void);
 }
 
 interface GetConfigExtraction {

package/src/products/database/index.js

@@ -455,15 +455,17 @@ const transformBSON = (d, castBSON) => {
     return basicClone(d);
 };
 
-const findObject = async (builder, config) => {
+const findObject = async (builder, initConfig) => {
     builder = basicClone(builder);
-    config = basicClone(config);
     const { projectUrl, serverE2E_PublicKey, dbUrl, dbName, maxRetries = 1, path, disableCache = false, uglify, extraHeaders, command, castBSON } = builder;
-    const pureConfig = stripRequestConfig(config);
+
+    const pureConfig = stripRequestConfig(initConfig);
     validateFindObject(command);
-    validateFindConfig(config);
+    validateFindConfig(initConfig);
     validateCollectionName(path);
 
+    let { onWaiting, ...config } = basicClone(initConfig) || {};
+
     const { find, findOne, sort, direction, limit, random } = command;
     const { retrieval = RETRIEVAL.DEFAULT, episode = 0, disableAuth, disableMinimizer } = config || {};
     const enableMinimizer = !disableMinimizer;
@@ -475,6 +477,7 @@ const findObject = async (builder, config) => {
 
     await awaitStore();
 
+    let intruder = {};
     let retries = 0, hasFinalize;
 
     const readValue = () => new Promise(async (resolve, reject) => {
@@ -482,11 +485,12 @@ const findObject = async (builder, config) => {
             instantProcess = retryProcess === 1;
 
         const finalize = (a, b) => {
-            const res = (instantProcess && a) ? transformBSON(a[0] || undefined, castBSON) : a;
+            const res = (instantProcess && a) ? intruder ? transformBSON(a[0] || undefined, castBSON) : a[0] : a;
+            const doClone = v => intruder ? basicClone(v) : v;
 
             if (a) {
-                resolve(instantProcess ? basicClone(res) : a);
-            } else reject(instantProcess ? basicClone(b) : b);
+                resolve(instantProcess ? doClone(res) : a);
+            } else reject(instantProcess ? doClone(b) : b);
             if (hasFinalize || !instantProcess) return;
             hasFinalize = true;
 
@@ -497,7 +501,7 @@ const findObject = async (builder, config) => {
                     delete Scoped.PendingDbReadCollective[processAccessId];
 
                 resolutionList.forEach(e => {
-                    e(a ? { result: res } : undefined, b);
+                    e(a ? { result: doClone(res) } : undefined, doClone(b));
                 });
             }
         };
@@ -507,8 +511,8 @@ const findObject = async (builder, config) => {
                 if (enableMinimizer) {
                     if (Scoped.PendingDbReadCollective[processAccessId]) {
                         Scoped.PendingDbReadCollective[processAccessId].push((a, b) => {
-                            if (a) resolve(basicClone(a.result));
-                            else reject(basicClone(b));
+                            if (a) resolve(a.result);
+                            else reject(b);
                         });
                         return;
                     }
@@ -585,6 +589,8 @@ const findObject = async (builder, config) => {
             } else {
                 const onlineListener = listenReachableServer(connected => {
                     if (connected) {
+                        intruder.resolve = undefined;
+                        intruder.reject = undefined;
                         onlineListener();
                         readValue().then(
                             e => { finalize(e); },
@@ -592,6 +598,22 @@ const findObject = async (builder, config) => {
                         );
                     }
                 }, projectUrl);
+
+                const cleanseIntruder = () => {
+                    onlineListener?.();
+                    intruder = undefined;
+                }
+
+                intruder.resolve = (data) => {
+                    cleanseIntruder();
+                    finalize([data]);
+                };
+                intruder.reject = (err) => {
+                    cleanseIntruder();
+                    finalize(undefined, err);
+                };
+                onWaiting?.(intruder);
+                onWaiting = undefined;
             }
         }
     });

package/src/products/database/validator.js

@@ -31,7 +31,7 @@ const FindConfig = {
         ).length,
     returnOnly: ReturnAndExcludeFootprint,
     excludeFields: ReturnAndExcludeFootprint,
-
+    onWaiting: t => t === undefined || typeof t === 'function',
     episode: t => [undefined, 0, 1].includes(t),
     retrieval: t => t === undefined || Object.values(RETRIEVAL).includes(t),
     disableAuth: t => t === undefined || typeof t === 'boolean',

package/src/products/http_callable/index.js

@@ -70,13 +70,15 @@ export const mfetch = async (input = '', init, config) => {
             !Validator.JSON(body)
         ) throw `"body" must be any of string, buffer, object`;
     }
+    await awaitStore();
 
     const reqId = await niceHash(
         serialize([
             rawHeader,
             body,
             !!disableAuth,
-            input
+            input,
+            disableAuth ? '' : (Scoped.AuthJWTToken[projectUrl] || '')
         ]).toString('base64')
     );
     const processReqId = `${reqId}_${disableCache}_${retrieval}`;
@@ -104,7 +106,6 @@ export const mfetch = async (input = '', init, config) => {
             }
         };
 
-        await awaitStore();
         const resolveCache = (reqData) => {
             finalize(reqData, undefined, { fromCache: true });
         };