react-native-mosquito-transport 0.0.34 → 0.0.35

package/src/products/database/index.js

@@ -2,13 +2,13 @@ import { io } from "socket.io-client";
 import EngineApi from "../../helpers/engine_api";
 import { DatabaseRecordsListener } from "../../helpers/listeners";
 import { deserializeE2E, listenReachableServer, niceTry, serializeE2E } from "../../helpers/peripherals";
-import { awaitStore, buildFetchInterface, buildFetchResult, getReachableServer } from "../../helpers/utils";
+import { awaitStore, buildFetchInterface, buildFetchResult, getReachableServer, updateCacheStore } from "../../helpers/utils";
 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, listenToken } from "../auth/accessor";
 import { DELIVERY, RETRIEVAL } from "../../helpers/values";
-import { ObjectId } from "bson/lib/bson.rn.cjs";
+import { ObjectId } from "../../vendor/bson";
 import { guardObject, Validator } from "guard-object";
 import { simplifyCaughtError } from "simplify-error";
 import cloneDeep from "lodash/cloneDeep";
@@ -622,13 +622,14 @@ const commitData = async (builder, value, type, config) => {
     const writeId = `${Date.now() + ++Scoped.PendingIte}`;
     const isBatchWrite = type === 'batchWrite';
     const shouldCache = (delivery !== DELIVERY.DEFAULT || !disableCache) &&
-        ![DELIVERY.NO_CACHE_AWAIT, DELIVERY.NO_CACHE_NO_AWAIT].includes();
+        ![DELIVERY.NO_CACHE_AWAIT, DELIVERY.NO_CACHE_NO_AWAIT].includes(delivery);
 
     await awaitStore();
     if (shouldCache) {
-        await addPendingWrites(builder, writeId, { value, type, find, config });
+        await addPendingWrites(builder, writeId, { value, type, config: stripUndefined({ disableAuth, stepping }) });
         Scoped.OutgoingWrites[writeId] = true;
-        await Scoped.dispatchingWritesPromise;
+        if (Scoped.dispatchingWritesPromise[projectUrl])
+            await Scoped.dispatchingWritesPromise[projectUrl];
     }
 
     let retries = 0, hasFinalize;
@@ -649,10 +650,11 @@ const commitData = async (builder, value, type, config) => {
             } else reject(b);
             if (hasFinalize || !instantProcess) return;
             hasFinalize = true;
+            if (Scoped.OutgoingWrites[writeId])
+                delete Scoped.OutgoingWrites[writeId];
+
             if (shouldCache) {
                 if (removeCache) removePendingWrite(builder, writeId, revertCache);
-                if (Scoped.OutgoingWrites[writeId])
-                    delete Scoped.OutgoingWrites[writeId];
             }
         };
 
@@ -717,9 +719,9 @@ const commitData = async (builder, value, type, config) => {
 };
 
 export const trySendPendingWrite = (projectUrl) => {
-    if (Scoped.dispatchingWritesPromise) return;
+    if (Scoped.dispatchingWritesPromise[projectUrl]) return;
 
-    Scoped.dispatchingWritesPromise = new Promise(async resolve => {
+    Scoped.dispatchingWritesPromise[projectUrl] = new Promise(async resolve => {
         const sortedWrite = Object.entries(CacheStore.PendingWrites[projectUrl] || {})
             .filter(([k]) => !Scoped.OutgoingWrites[k])
             .sort((a, b) => a[1].addedOn - b[1].addedOn);
@@ -727,7 +729,13 @@ export const trySendPendingWrite = (projectUrl) => {
 
         for (const [writeId, { snapshot, builder, attempts = 1 }] of sortedWrite) {
             try {
-                await commitData(builder, snapshot.value, snapshot.type, { ...snapshot.config, delivery: DELIVERY.NO_CACHE_NO_AWAIT });
+                await commitData(
+                    { ...Scoped.InitializedProject[projectUrl], ...builder, find: deserializeBSON(builder.find, true)._ },
+                    deserializeBSON(snapshot.value, true)._,
+                    snapshot.type,
+                    { ...snapshot.config, delivery: DELIVERY.NO_CACHE_NO_AWAIT }
+                );
+
                 delete CacheStore.PendingWrites[projectUrl][writeId];
                 ++resolveCounts;
             } catch (_) {
@@ -741,7 +749,10 @@ export const trySendPendingWrite = (projectUrl) => {
             }
         }
         resolve();
-        Scoped.dispatchingWritesPromise = undefined;
+        if (projectUrl in Scoped.dispatchingWritesPromise)
+            delete Scoped.dispatchingWritesPromise[projectUrl];
+        updateCacheStore(['PendingWrites']);
+
         if (
             (sortedWrite.length - resolveCounts) &&
             await getReachableServer(projectUrl)

package/src/products/database/types.js

@@ -1,8 +1,9 @@
+import { guardObject, GuardSignal, niceGuard } from "guard-object";
 
 export const TIMESTAMP = { $timestamp: "now" };
 export const TIMESTAMP_OFFSET = (v) => ({ $timestamp_offset: v });
 
-export const IS_TIMESTAMP = (t) => t && (typeof t.$timestamp === 'number' || t.$timestamp === 'now') && Object.keys(t).length === 1;
+export const IS_TIMESTAMP = (t) => niceGuard({ $timestamp: t => t === 'now' || typeof t.$timestamp === 'number' }, t);
 
 export const DOCUMENT_EXTRACTION = (path) => ({ $dynamicValue: path });
 
@@ -11,13 +12,17 @@ export const GEO_JSON = (lat, lng) => ({
     coordinates: [lng, lat],
 });
 
-export const FIND_GEO_JSON = (location, offSetMeters, centerMeters) => ({
-    $nearSphere: {
-        $geometry: {
-            type: "Point",
-            coordinates: location.reverse()
-        },
-        $minDistance: centerMeters || 0,
-        $maxDistance: offSetMeters
-    }
-});
+export const FIND_GEO_JSON = (location, offSetMeters, centerMeters) => {
+    guardObject(GuardSignal.COORDINATE.LAT_LNG_INT).validate(location);
+
+    return {
+        $nearSphere: {
+            $geometry: {
+                type: "Point",
+                coordinates: location.slice(0).reverse()
+            },
+            $minDistance: centerMeters || 0,
+            $maxDistance: offSetMeters
+        }
+    };
+};

package/src/products/database/validator.js

@@ -1,9 +1,9 @@
 import { guardArray, GuardError, guardObject, GuardSignal, niceGuard, Validator } from "guard-object";
 import { sameInstance } from "../../helpers/peripherals";
 import { RETRIEVAL } from "../../helpers/values";
-import getLodash from 'lodash/get';
-import { Binary, BSONRegExp, BSONSymbol, Code, DBRef, Decimal128, Double, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID } from 'bson/lib/bson.rn.cjs';
+import { Binary, BSONRegExp, BSONSymbol, Code, DBRef, Decimal128, Double, Int32, Long, MaxKey, MinKey, ObjectId, Timestamp, UUID } from '../../vendor/bson';
 import { bboxPolygon, booleanIntersects, booleanWithin, circle, distance, polygon } from "@turf/turf";
+import { grab } from "poke-object";
 
 const DirectionList = [1, -1, 'asc', 'desc', 'ascending', 'descending'];
 const FilterFootPrint = t => {
@@ -65,7 +65,7 @@ export const assignExtractionFind = (data, find) => {
     if (!find) return find;
 
     if (niceGuard({ $dynamicValue: GuardSignal.NON_EMPTY_STRING }, find)) {
-        return getLodash(data, find.$dynamicValue) || null;
+        return grab(data, find.$dynamicValue) || null;
     } else if (Validator.OBJECT(find)) {
         return Object.fromEntries(
             Object.entries(find).map(([k, v]) =>
@@ -356,7 +356,7 @@ const FilterUtils = {
         let { $field, $search, $caseSensitive } = q;
 
         $field = (Array.isArray($field) ? $field : [$field]).map(v => {
-            const f = getLodash({ ...parent }, v);
+            const f = grab({ ...parent }, v);
             return typeof f === 'string' ? f : '';
         }).join(' ');
 
@@ -512,7 +512,7 @@ const evaluateFilter = (data, filter = {}, parentData, level = 0) => {
 
         let thisData;
         try {
-            thisData = data && getLodash(data, key);
+            thisData = data && grab(data, key);
         } catch (_) { }
 
         if (key === '$text' && !level) {

package/src/products/http_callable/counter.js

@@ -1,11 +1,10 @@
 import { CacheStore } from "../../helpers/variables";
-import getLodash from 'lodash/get';
-import setLodash from 'lodash/set';
+import { grab, poke } from "poke-object";
 
 export const incrementFetcherSize = (projectUrl, size = 0) => incrementFetcherSizeCore(CacheStore.DatabaseStats, projectUrl, size);
 
 export const incrementFetcherSizeCore = (baseObj, projectUrl, size = 0) => {
     baseObj._fetcher_size += size;
-    const b4 = getLodash(baseObj.fetchers, [projectUrl], 0);
-    setLodash(baseObj.fetchers, [projectUrl], b4 + size);
+    const b4 = grab(baseObj.fetchers, [projectUrl], 0);
+    poke(baseObj.fetchers, [projectUrl], b4 + size);
 }