react-native-mosquito-transport 0.0.14 → 0.0.16

package/TODO

@@ -0,0 +1,4 @@
+- fix local cache query on sqlite and fs
+- fix and add all mongodb query and update operator
+- reauthenticate
+- change `Object` in d.ts to [key: string]: any

package/ios/Mosquitodb.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+</Workspace>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/deflexable/mosquito-transport)",
   "main": "src/index.js",
   "scripts": {
@@ -31,12 +31,17 @@
     "@types/lodash": "^4.14.194",
     "buffer": "^6.0.3",
     "crypto-js": "^4.2.0",
+    "fast-json-stable-stringify": "^2.1.0",
+    "guard-object": "^1.0.6",
     "json-buffer": "^3.0.1",
-    "lodash": "^4.17.21",
+    "lodash.get": "^4.4.2",
+    "lodash.isequal": "^4.5.0",
+    "lodash.set": "^4.3.2",
+    "lodash.unset": "^4.5.2",
     "react-native-get-random-values": "^1.9.0",
     "set-large-timeout": "^1.0.1",
     "socket.io-client": "^4.6.2",
-    "subscription-listener": "^1.0.9",
+    "subscription-listener": "^1.1.2",
     "tweetnacl": "^1.0.3"
   },
   "engines": {

package/src/helpers/EngineApi.js

@@ -14,7 +14,6 @@ const apis = {
     _twitterSignin: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._twitterSignin(baseApi)) : '_twitterSignin'}`,
     _githubSignin: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._githubSignin(baseApi)) : '_githubSignin'}`,
     _signOut: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._signOut(baseApi)) : '_signOut'}`,
-    _invalidateToken: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._invalidateToken(baseApi)) : '_invalidateToken'}`,
     _refreshAuthToken: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._refreshAuthToken(baseApi)) : '_refreshAuthToken'}`,
     _downloadFile: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._downloadFile(baseApi)) : '_downloadFile'}`,
     _uploadFile: (baseApi, ugly) => `${baseApi}/${ugly ? encodeBinary(apis._uploadFile(baseApi)) : '_uploadFile'}`,

package/src/helpers/utils.js

@@ -5,7 +5,7 @@ import { CacheStore, Scoped } from "./variables";
 import { decryptString, encryptString, niceTry, serializeE2E } from "./peripherals";
 
 export const updateCacheStore = () => {
-    const { cachePassword = DEFAULT_CACHE_PASSWORD, cacheProtocol = CACHE_PROTOCOL.ASYNC_STORAGE } = Scoped.ReleaseCacheData;
+    const { cachePassword = DEFAULT_CACHE_PASSWORD, cacheProtocol = CACHE_PROTOCOL.ASYNC_STORAGE, io } = Scoped.ReleaseCacheData;
 
     clearTimeout(Scoped.cacheStorageReducer);
     Scoped.cacheStorageReducer = setTimeout(() => {
@@ -15,7 +15,9 @@ export const updateCacheStore = () => {
             cachePassword
         );
 
-        if (cacheProtocol === CACHE_PROTOCOL.ASYNC_STORAGE) {
+        if (io) {
+            io.output(txt);
+        } else if (cacheProtocol === CACHE_PROTOCOL.ASYNC_STORAGE) {
             AsyncStorage.setItem(CACHE_STORAGE_PATH, txt);
         } else {
             const fs = require('react-native-fs');
@@ -25,11 +27,13 @@ export const updateCacheStore = () => {
 }
 
 export const releaseCacheStore = async (builder) => {
-    const { cachePassword = DEFAULT_CACHE_PASSWORD, cacheProtocol = CACHE_PROTOCOL.ASYNC_STORAGE } = builder;
+    const { cachePassword = DEFAULT_CACHE_PASSWORD, cacheProtocol = CACHE_PROTOCOL.ASYNC_STORAGE, io } = builder;
 
     let txt;
 
-    if (cacheProtocol === CACHE_PROTOCOL.ASYNC_STORAGE) {
+    if (io) {
+        txt = await io.input();
+    } else if (cacheProtocol === CACHE_PROTOCOL.ASYNC_STORAGE) {
         txt = await niceTry(() => AsyncStorage.getItem(CACHE_STORAGE_PATH));
     } else {
         const fs = require('react-native-fs');
@@ -37,7 +41,7 @@ export const releaseCacheStore = async (builder) => {
     }
 
     const j = JSON.parse(decryptString(txt || '', cachePassword, cachePassword) || '{}');
-    
+
     Object.entries(j).forEach(([k, v]) => {
         CacheStore[k] = v;
     });

package/src/helpers/values.js

@@ -13,7 +13,8 @@ export const CACHE_STORAGE_PATH = encodeBinary('MOSQUITO_TRANSPORT_FREEZER'),
 
 export const CACHE_PROTOCOL = {
     ASYNC_STORAGE: 'async-storage',
-    REACT_NATIVE_FS: 'reat-native-fs'
+    REACT_NATIVE_FS: 'reat-native-fs',
+    SQLITE: 'sqlite' // TODO:
 };
 
 export const RETRIEVAL = {
@@ -43,8 +44,8 @@ export const WRITE_OPS = {
     $MAX: '$max',
     $MIN: '$min',
     $MUL: '$mul',
-    $RENAME: '$rename'
-    // $SET_ON_INSERT: '$setOnInsert'
+    $RENAME: '$rename',
+    $SET_ON_INSERT: '$setOnInsert'
 };
 export const WRITE_OPS_LIST = Object.values(WRITE_OPS);
 
@@ -69,4 +70,13 @@ export const READ_OPS_LIST = Object.values(READ_OPS);
 
 export const Regexs = {
     LINK: () => /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
-}
+};
+
+export const AUTH_PROVIDER_ID = {
+    GOOGLE: 'google.com',
+    FACEBOOK: 'facebook.com',
+    PASSWORD: 'password',
+    TWITTER: 'x.com',
+    GITHUB: 'github.com',
+    APPLE: 'apple.com'
+};

package/src/index.d.ts

@@ -25,9 +25,63 @@ interface mtimestamp { $timestamp: 'now' }
 export const TIMESTAMP: mtimestamp;
 export function DOCUMENT_EXTRACTION(path: string): { $dynamicValue: number };
 
+type longitude = number;
+type latitude = number;
+
+export function GEO_JSON(latitude: latitude, longitude: longitude): {
+    type: "Point",
+    coordinates: [longitude, latitude],
+};
+
+export function FIND_GEO_JSON(coordinates: [latitude, longitude], offSetMeters: number, centerMeters?: number): {
+    $near: {
+        $geometry: {
+            type: "Point",
+            coordinates: [longitude, latitude]
+        },
+        $minDistance: number | 0,
+        $maxDistance: number
+    }
+};
+
+export const AUTH_PROVIDER_ID: auth_provider_id;
+
+interface auth_provider_id {
+    GOOGLE: 'google.com';
+    FACEBOOK: 'facebook.com';
+    PASSWORD: 'password';
+    TWITTER: 'x.com';
+    GITHUB: 'github.com';
+    APPLE: 'apple.com';
+}
+
+type auth_provider_id_values = auth_provider_id['GOOGLE'] |
+    auth_provider_id['FACEBOOK'] |
+    auth_provider_id['PASSWORD'] |
+    auth_provider_id['GITHUB'] |
+    auth_provider_id['TWITTER'] |
+    auth_provider_id['APPLE'];
+
+interface ReleaseCacheOption_IO {
+    /**
+     * This password will be used to encrypt data stored locally
+     */
+    cachePassword?: string;
+    io: {
+        /**
+         * feeds mosquito-transport data
+         */
+        input: () => string;
+        /**
+         * emits mosquito-transport internal data
+         */
+        output: (data: string) => void;
+    }
+}
+
 interface ReleaseCacheOption {
     /**
-     * This password will be used to securely store your data locally
+     * This password will be used to encrypt data stored locally
      */
     cachePassword?: string;
     /**
@@ -62,7 +116,7 @@ interface BatchWriteConfig extends WriteConfig {
 
 export default class RNMT {
     constructor(config: RNMTConfig);
-    static releaseCache(option?: ReleaseCacheOption): void;
+    static releaseCache(option?: ReleaseCacheOption | ReleaseCacheOption_IO): void;
     getDatabase(dbName?: string, dbUrl?: string): GetDatabase;
     collection(path: string): RNMTCollection;
     auth(): RNMTAuth;
@@ -274,6 +328,7 @@ interface DocumentFind {
     $or?: any[];
     $text?: {
         $search: string;
+        $field: string;
         $language?: string;
         $caseSensitive?: boolean;
         $diacriticSensitive?: boolean;
@@ -303,8 +358,11 @@ interface RNMTAuth {
     listenVerifiedStatus: (callback?: (verified?: boolean) => void, onError?: (error?: ErrorResponse) => void) => () => void;
     listenAuthToken: (callback: (token: string) => void) => () => void;
     getAuthToken: () => Promise<string>;
-    listenAuth: (callback: (auth: AuthData) => void) => () => void;
-    getAuth: () => Promise<AuthData>;
+    getRefreshToken: () => Promise<string>;
+    getRefreshTokenData: () => Promise<RefreshTokenData>;
+    parseToken: () => string;
+    listenAuth: (callback: (auth: TokenEventData) => void) => () => void;
+    getAuth: () => Promise<TokenEventData>;
     signOut: () => Promise<void>;
     forceRefreshToken: () => Promise<string>;
 }
@@ -322,17 +380,38 @@ interface SignupResult extends SigninResult {
 interface AuthData {
     email?: string;
     metadata: Object;
-    signupMethod: 'google' | 'apple' | 'custom' | 'github' | 'twitter' | 'facebook' | string;
-    currentAuthMethod: 'google' | 'apple' | 'custom' | 'github' | 'twitter' | 'facebook' | string;
+    signupMethod: auth_provider_id_values;
+    currentAuthMethod: auth_provider_id_values;
     joinedOn: number;
-    encryptionKey: string;
     uid: string;
     claims: Object;
     emailVerified: boolean;
+    tokenID: string;
+    disabled: boolean;
+    entityOf: string;
     profile: {
         photo: string;
         name: string;
-    }
+    },
+    exp: number;
+    aud: string;
+    iss: string;
+    sub: string;
+}
+
+interface RefreshTokenData {
+    uid: string;
+    tokenID: string;
+    isRefreshToken: true;
+}
+
+interface TokenEventData extends AuthData {
+    tokenManager: TokenManager | null;
+}
+
+interface TokenManager {
+    refreshToken: string;
+    accessToken: string;
 }
 
 interface RNMTStorage {

package/src/index.js

@@ -6,12 +6,12 @@ import { MTAuth } from "./products/auth";
 import { MTCollection, batchWrite } from "./products/database";
 import { MTStorage } from "./products/storage";
 import { ServerReachableListener, TokenRefreshListener } from "./helpers/listeners";
-import { initTokenRefresher, listenTokenReady, triggerAuthToken } from "./products/auth/accessor";
+import { initTokenRefresher, listenToken, listenTokenReady, parseToken, triggerAuthToken } from "./products/auth/accessor";
 import { TIMESTAMP, DOCUMENT_EXTRACTION, FIND_GEO_JSON, GEO_JSON } from "./products/database/types";
 import { mfetch } from "./products/http_callable";
 import { io } from "socket.io-client";
 import { validateCollectionPath } from "./products/database/validator";
-import { CACHE_PROTOCOL, Regexs } from "./helpers/values";
+import { AUTH_PROVIDER_ID, CACHE_PROTOCOL, Regexs } from "./helpers/values";
 import { trySendPendingWrite } from "./products/database/accessor";
 import EngineApi from './helpers/EngineApi';
 import { parse, stringify } from 'json-buffer';
@@ -35,7 +35,9 @@ class RNMT {
         };
         const { projectUrl } = this.config;
 
+        this.config.secureUrl = projectUrl.startsWith('https');
         this.config.baseUrl = projectUrl.split('://')[1];
+        this.config.wsPrefix = this.config.secureUrl ? 'wss' : 'ws';
 
         if (!Scoped.ReleaseCacheData)
             throw `releaseCache must be called before creating any ${this.constructor.name} instance`;
@@ -46,16 +48,41 @@ class RNMT {
             triggerAuthToken(projectUrl);
             initTokenRefresher({ ...this.config }, true);
 
-            const socket = io(`ws://${projectUrl.split('://')[1]}`, {
-                auth: { _m_internal: true }
-            });
+            const disconnectionGlich = {};
+            let socket, lastUid, lastSocketProcess = 0, hasInited;
 
-            socket.on('connect', () => {
-                ServerReachableListener.dispatch(projectUrl, true);
-            });
-            socket.on('disconnect', () => {
-                ServerReachableListener.dispatch(projectUrl, false);
-            });
+            listenToken((token, thisInited) => {
+                const user = token && parseToken(token);
+
+                const thisUid = (user?.uid || null);
+                if (lastUid === thisUid && (hasInited || !thisInited)) return;
+                if (!hasInited) hasInited = thisInited;
+                lastUid = thisUid;
+
+                if (lastSocketProcess) disconnectionGlich[lastSocketProcess] = true;
+                socket.close();
+
+                const thisProcess = ++lastSocketProcess;
+                socket = io(`${this.config.wsPrefix}://${projectUrl.split('://')[1]}`, {
+                    auth: {
+                        _m_internal: true,
+                        _from_base: true,
+                        atoken: token
+                    }
+                });
+
+                socket.on('_signal_signout', () => {
+                    this.auth().signOut();
+                });
+
+                socket.on('connect', () => {
+                    ServerReachableListener.dispatch(projectUrl, true);
+                });
+                socket.on('disconnect', () => {
+                    if (!disconnectionGlich[thisProcess])
+                        ServerReachableListener.dispatch(projectUrl, false);
+                });
+            }, projectUrl);
 
             listenReachableServer(c => {
                 Scoped.IS_CONNECTED[projectUrl] = c;
@@ -69,7 +96,7 @@ class RNMT {
     }
 
     static releaseCache(prop) {
-        if (Scoped.ReleaseCacheData) throw `calling ${this.name} multiple times is prohibited`;
+        if (Scoped.ReleaseCacheData) throw `calling ${this.name}() multiple times is prohibited`;
         validateReleaseCacheProp({ ...prop });
         Scoped.ReleaseCacheData = { ...prop };
         releaseCacheStore({ ...prop });
@@ -95,7 +122,7 @@ class RNMT {
 
     getSocket = (configOpts) => {
         const { disableAuth, authHandshake } = configOpts || {},
-            { projectUrl, uglify, accessKey, serverE2E_PublicKey } = this.config;
+            { projectUrl, uglify, accessKey, serverE2E_PublicKey, wsPrefix } = this.config;
 
         const restrictedRoute = [
             _listenCollection,
@@ -194,7 +221,7 @@ class RNMT {
             const mtoken = disableAuth ? undefined : Scoped.AuthJWTToken[projectUrl];
             const [reqBuilder, [privateKey]] = uglify ? serializeE2E({ accessKey, a_extras: authHandshake }, mtoken, serverE2E_PublicKey) : [null, []];
 
-            socket = io(`ws://${projectUrl.split('://')[1]}`, {
+            socket = io(`${wsPrefix}://${projectUrl.split('://')[1]}`, {
                 auth: uglify ? {
                     ugly: true,
                     e2e: reqBuilder
@@ -299,8 +326,17 @@ const validateReleaseCacheProp = (prop) => {
                 throw `Invalid value supplied to cachePassword, value must be a string and greater than 0 characters`;
         } else if (k === 'cacheProtocol') {
             if (!cacheList.includes(`${v}`)) throw `unknown value supplied to ${k}, expected any of ${cacheList}`;
+        } else if (k === 'io') {
+            Object.entries(v).forEach(([k, v]) => {
+                if (k === 'input' || k === 'output') {
+                    if (typeof v !== 'function')
+                        throw `Invalid value supplied to "io.${k}", expected a function but got "${v}"`;
+                } else throw `Unexpected property named "io.${k}"`;
+            });
         } else throw `Unexpected property named ${k}`;
     });
+
+    if (!prop?.io && !prop?.cacheProtocol) throw 'You need to provide either "io" or "cacheProtocol"';
 }
 
 const validator = {
@@ -363,7 +399,8 @@ export {
     TIMESTAMP,
     DOCUMENT_EXTRACTION,
     FIND_GEO_JSON,
-    GEO_JSON
+    GEO_JSON,
+    AUTH_PROVIDER_ID
 };
 
 export default RNMT;

package/src/products/auth/accessor.js

@@ -2,8 +2,8 @@ import setLargeTimeout from "set-large-timeout";
 import { doSignOut } from ".";
 import EngineApi from "../../helpers/EngineApi";
 import { AuthTokenListener, TokenRefreshListener } from "../../helpers/listeners";
-import { decodeBinary, deserializeE2E, listenReachableServer, simplifyCaughtError } from "../../helpers/peripherals";
-import { awaitReachableServer, awaitStore, buildFetchInterface, simplifyError, updateCacheStore } from "../../helpers/utils";
+import { decodeBinary, deserializeE2E, listenReachableServer } from "../../helpers/peripherals";
+import { awaitStore, buildFetchInterface, simplifyError, updateCacheStore } from "../../helpers/utils";
 import { CacheStore, Scoped } from "../../helpers/variables";
 
 export const listenToken = (callback, projectUrl) =>
@@ -103,7 +103,6 @@ const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7
             if (isForceRefresh) Scoped.InitiatedForcedToken[projectUrl] = true;
             updateCacheStore();
             initTokenRefresher(builder);
-            invalidateToken(builder, token);
         } else reject(lostProcess.simpleError);
     } catch (e) {
         if (e.simpleError) {
@@ -129,23 +128,4 @@ const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7
             }, projectUrl);
         }
     }
-});
-
-export const invalidateToken = async (builder, token) => {
-    try {
-        const { projectUrl, accessKey, uglify, serverE2E_PublicKey } = builder;
-        await awaitReachableServer(projectUrl);
-
-        const [reqBuilder] = buildFetchInterface({
-            body: { token },
-            accessKey,
-            uglify,
-            serverE2E_PublicKey
-        });
-
-        const r = await (await fetch(EngineApi._invalidateToken(projectUrl, uglify), reqBuilder)).json();
-        if (r.simpleError) throw r;
-    } catch (e) {
-        throw simplifyCaughtError(e).simpleError;
-    }
-}
+});

package/src/products/auth/index.js

@@ -42,7 +42,7 @@ export class MTAuth {
     }
 
     listenVerifiedStatus(callback, onError) {
-        const { projectUrl, serverE2E_PublicKey, uglify, baseUrl } = this.builder;
+        const { projectUrl, serverE2E_PublicKey, uglify, baseUrl, wsPrefix } = this.builder;
 
         let socket, wasDisconnected, lastToken = Scoped.AuthJWTToken[projectUrl] || null, lastInitRef = 0;
 
@@ -58,7 +58,7 @@ export class MTAuth {
             const mtoken = Scoped.AuthJWTToken[projectUrl],
                 [reqBuilder, [privateKey]] = uglify ? serializeE2E({ mtoken }, undefined, serverE2E_PublicKey) : [null, []];
 
-            socket = io(`ws://${baseUrl}`, {
+            socket = io(`${wsPrefix}://${baseUrl}`, {
                 auth: uglify ? {
                     e2e: reqBuilder,
                     _m_internal: true
@@ -104,6 +104,13 @@ export class MTAuth {
 
     listenAuthToken = (callback) => listenToken(callback, this.builder.projectUrl);
 
+    getRefreshToken = async () => {
+        await awaitStore();
+        return CacheStore.AuthStore[this.builder.projectUrl]?.refreshToken;
+    }
+    
+    parseToken = (token) => parseToken(token);
+
     getAuthToken = () => new Promise(resolve => {
         const l = listenToken(t => {
             l();
@@ -111,6 +118,9 @@ export class MTAuth {
         }, this.builder.projectUrl);
     });
 
+    /**
+     * @type {import('../../index').RNMTAuth['listenAuth']}
+     */
     listenAuth = (callback) => {
         let lastTrig;
 

package/src/products/database/accessor.js

@@ -2,10 +2,10 @@ import { IS_RAW_OBJECT, objToUniqueString, queryEntries, shuffleArray, sortArray
 import { awaitStore, updateCacheStore } from "../../helpers/utils";
 import { CacheStore } from "../../helpers/variables";
 import { confirmFilterDoc } from "./validator";
-import getLodash from 'lodash/get';
-import setLodash from 'lodash/set';
-import unsetLodash from 'lodash/unset';
-import isEqual from 'lodash/isEqual';
+import getLodash from 'lodash.get';
+import setLodash from 'lodash.set';
+import unsetLodash from 'lodash.unset';
+import isEqual from 'lodash.isequal';
 import { DEFAULT_DB_NAME, DEFAULT_DB_URL, DELIVERY, RETRIEVAL, WRITE_OPS, WRITE_OPS_LIST } from "../../helpers/values";
 import { DatabaseRecordsListener } from "../../helpers/listeners";
 

package/src/products/database/index.js

@@ -8,7 +8,7 @@ import { addPendingWrites, generateRecordID, getRecord, insertRecord, listenQuer
 import { validateCollectionPath, validateFilter, validateReadConfig, validateWriteValue } from "./validator";
 import { awaitRefreshToken, listenToken } from "../auth/accessor";
 import { DEFAULT_DB_NAME, DEFAULT_DB_URL, DELIVERY, RETRIEVAL } from "../../helpers/values";
-import setLodash from 'lodash/set';
+import setLodash from 'lodash.set';
 
 export class MTCollection {
     constructor(config) {
@@ -111,7 +111,7 @@ const {
 } = EngineApi;
 
 const listenDocument = (callback, onError, builder, config) => {
-    const { projectUrl, serverE2E_PublicKey, baseUrl, dbUrl, dbName, accessKey, path, disableCache, command, uglify } = builder,
+    const { projectUrl, wsPrefix, serverE2E_PublicKey, baseUrl, dbUrl, dbName, accessKey, path, disableCache, command, uglify } = builder,
         { find, findOne, sort, direction, limit } = command,
         { disableAuth } = config || {},
         accessId = generateRecordID(builder, config),
@@ -163,7 +163,7 @@ const listenDocument = (callback, onError, builder, config) => {
 
         const [encPlate, [privateKey]] = uglify ? serializeE2E({ accessKey, _body: authObj }, mtoken, serverE2E_PublicKey) : ['', []];
 
-        socket = io(`ws://${baseUrl}`, {
+        socket = io(`${wsPrefix}://${baseUrl}`, {
             auth: uglify ? { e2e: encPlate, _m_internal: true } : {
                 accessKey,
                 _body: authObj,
@@ -217,7 +217,7 @@ const listenDocument = (callback, onError, builder, config) => {
 }
 
 const initOnDisconnectionTask = (builder, value, type) => {
-    const { projectUrl, baseUrl, serverE2E_PublicKey, dbUrl, dbName, accessKey, path, command, uglify } = builder,
+    const { projectUrl, wsPrefix, baseUrl, serverE2E_PublicKey, dbUrl, dbName, accessKey, path, command, uglify } = builder,
         { find } = command || {},
         disableAuth = false;
 
@@ -240,7 +240,7 @@ const initOnDisconnectionTask = (builder, value, type) => {
                 dbUrl
             };
 
-        socket = io(`ws://${baseUrl}`, {
+        socket = io(`${wsPrefix}://${baseUrl}`, {
             auth: uglify ? {
                 e2e: serializeE2E(authObj, mtoken, serverE2E_PublicKey)[0],
                 _m_internal: true

package/src/products/database/validator.js

@@ -1,7 +1,7 @@
 import { IS_DECIMAL_NUMBER, IS_RAW_OBJECT, IS_WHOLE_NUMBER, queryEntries } from "../../helpers/peripherals";
 import { READ_OPS, READ_OPS_LIST, RETRIEVAL } from "../../helpers/values";
-import getLodash from 'lodash/get';
-import isEqual from 'lodash/isEqual';
+import getLodash from 'lodash.get';
+import isEqual from 'lodash.isequal';
 
 const dirn = ['desc', 'asc', 'ascending', 'descending'];
 
@@ -202,12 +202,19 @@ const evaluateFilter = (data = {}, filter = {}) => {
                 } else logics.push(false);
             } else if ($ === $TEXT) {
                 if (commandSplit.slice(-1)[0].$ === '$search') {
-                    const { $caseSensitive, $localFields = [], $search } = dataObj.$text;
+                    const { $caseSensitive, $search, $field } = filter.$text;
 
                     if (typeof value !== 'string' || typeof $search !== 'string')
                         throw `$search must have a string value`;
+                    if (!$field) throw '"$field" is required inside "$text" operator when "disableCache=false"';
+                    const fieldArr = Array.isArray($field) ? $field : [$field];
 
-                    const searchTxt = $localFields.map(v => getLodash(dataObj, v || '')).map(v =>
+                    fieldArr.forEach(v => {
+                        if (typeof v !== 'string' || !v.trim())
+                            throw `invalid item inside "$field", expected a non-empty string but got "${v}"`;
+                    });
+
+                    const searchTxt = fieldArr.map(v => getLodash(dataObj, v || '')).map(v =>
                         `${typeof v === 'string' ? v :
                             Array.isArray(v) ? v.map(v => typeof v === 'string' ? v : '').join(' ').trim() : ''}`.trim()
                     ).join(' ').trim();