react-native-mosquito-transport 0.0.21 → 0.0.22

package/src/index.js

@@ -2,17 +2,17 @@ import 'react-native-get-random-values';
 import { deserializeE2E, listenReachableServer, serializeE2E } from "./helpers/peripherals";
 import { awaitStore, releaseCacheStore } from "./helpers/utils";
 import { CacheStore, Scoped } from "./helpers/variables";
-import { MTCollection, batchWrite, trySendPendingWrite } from "./products/database";
+import { MTCollection, batchWrite, onCollectionConnect, trySendPendingWrite } from "./products/database";
 import { MTStorage } from "./products/storage";
 import { ServerReachableListener, TokenRefreshListener } from "./helpers/listeners";
 import { initTokenRefresher, listenToken, listenTokenReady, triggerAuthToken } from "./products/auth/accessor";
-import { TIMESTAMP, DOCUMENT_EXTRACTION, FIND_GEO_JSON, GEO_JSON } from "./products/database/types";
+import { TIMESTAMP, DOCUMENT_EXTRACTION, FIND_GEO_JSON, GEO_JSON, TIMESTAMP_OFFSET } from "./products/database/types";
 import { mfetch } from "./products/http_callable";
 import { io } from "socket.io-client";
-import { AUTH_PROVIDER_ID, CACHE_PROTOCOL } from "./helpers/values";
+import { AUTH_PROVIDER_ID } from "./helpers/values";
 import EngineApi from './helpers/engine_api';
 import { Validator } from 'guard-object';
-import cloneDeep from 'lodash.clonedeep';
+import cloneDeep from 'lodash/cloneDeep';
 import { Buffer } from 'buffer';
 import MTAuth, { purgePendingToken } from './products/auth';
 
@@ -39,6 +39,8 @@ class RNMT {
         validateMTConfig(config, this);
         this.config = {
             ...config,
+            dbName: config.dbName || '',
+            dbUrl: config.dbUrl || '',
             serverE2E_PublicKey: config.serverE2E_PublicKey && new Uint8Array(Buffer.from(config.serverE2E_PublicKey, 'base64')),
             castBSON: config.castBSON === undefined || config.castBSON,
             maxRetries: config.maxRetries || 3,
@@ -125,16 +127,24 @@ class RNMT {
         });
     }
 
-    getDatabase = (dbName, dbUrl) => ({
-        collection: (path) => new MTCollection({
-            ...this.config,
-            path,
-            ...dbName ? { dbName } : {},
-            ...dbUrl ? { dbUrl } : {}
-        })
-    });
+    getDatabase = (dbName, dbUrl) => {
+        if (dbName) ConfigValidator.dbName(dbName);
+        if (dbUrl) ConfigValidator.dbUrl(dbUrl);
+
+        return {
+            collection: (path) => new MTCollection({
+                ...this.config,
+                path,
+                dbName: dbName || '',
+                dbUrl: dbUrl || ''
+            })
+        };
+    }
 
     collection = (path) => new MTCollection({ ...this.config, path });
+
+    onConnect = () => onCollectionConnect({ ...this.config });
+
     batchWrite = (map, configx) => batchWrite({ ...this.config }, map, configx);
     auth = () => new MTAuth({ ...this.config });
     storage = () => new MTStorage({ ...this.config });
@@ -143,7 +153,7 @@ class RNMT {
 
     getSocket = (configOpts) => {
         const { disableAuth, authHandshake } = configOpts || {};
-        const { projectUrl, uglify, accessKey, serverE2E_PublicKey, wsPrefix, extraHeaders } = this.config;
+        const { projectUrl, uglify, serverE2E_PublicKey, wsPrefix, extraHeaders } = this.config;
 
         const restrictedRoute = [
             _listenCollection,
@@ -163,8 +173,11 @@ class RNMT {
             socketListenerList = [],
             socketListenerIte = 0;
 
+        /**
+         * @type {import('socket.io-client').Socket}
+         */
+        let socket;
         let hasCancelled,
-            socket,
             tokenListener,
             clientPrivateKey;
 
@@ -250,7 +263,7 @@ class RNMT {
         const init = async () => {
             if (hasCancelled) return;
             const mtoken = disableAuth ? undefined : Scoped.AuthJWTToken[projectUrl];
-            const [reqBuilder, [privateKey]] = uglify ? await serializeE2E({ accessKey, a_extras: authHandshake }, mtoken, serverE2E_PublicKey) : [null, []];
+            const [reqBuilder, [privateKey]] = uglify ? await serializeE2E({ a_extras: authHandshake }, mtoken, serverE2E_PublicKey) : [null, []];
 
             socket = io(`${wsPrefix}://${projectUrl.split('://')[1]}`, {
                 transports: ['websocket', 'polling', 'flashsocket'],
@@ -260,8 +273,7 @@ class RNMT {
                     e2e: reqBuilder.toString('base64')
                 } : {
                     ...mtoken ? { mtoken } : {},
-                    a_extras: authHandshake,
-                    accessKey
+                    a_extras: authHandshake
                 }
             });
             clientPrivateKey = privateKey;
@@ -290,7 +302,7 @@ class RNMT {
                 lastTokenStatus = status || false;
             }, projectUrl);
         }
-
+        // TODO: disconnected
         return {
             timeout: (timeout) => {
                 if (timeout !== undefined && !Validator.POSITIVE_INTEGER(timeout))
@@ -377,14 +389,10 @@ const discloseSocketArguments = (args = []) => {
 }
 
 const validateReleaseCacheProp = (prop) => {
-    const cacheList = [...Object.values(CACHE_PROTOCOL)];
-
     Object.entries(prop).forEach(([k, v]) => {
-        if (k === 'cachePassword') {
+        if (k === 'sqliteKey') {
             if (typeof v !== 'string' || v.trim().length <= 0)
-                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}`;
+                throw `Invalid value supplied to "sqliteKey", value must be a string and greater than 0 characters`;
         } else if (k === 'io') {
             Object.entries(v).forEach(([k, v]) => {
                 if (k === 'input' || k === 'output') {
@@ -392,18 +400,17 @@ const validateReleaseCacheProp = (prop) => {
                         throw `Invalid value supplied to "io.${k}", expected a function but got "${v}"`;
                 } else throw `Unexpected property named "io.${k}"`;
             });
+            if (!v?.input && !v?.output) throw '"input" and "output" are required when "io" is provided';
         } else if (k === 'promoteCache') {
             if (typeof v !== 'boolean') throw 'promoteCache should be a boolean';
-        } else if (k === 'heapMemory') {
-            if (typeof v !== 'number' || v <= 0)
-                throw `Invalid value supplied to heapMemory, value must be an integer greater than zero`;
+        } else if (['maxLocalDatabaseSize', 'maxLocalFetchHttpSize'].includes(k)) {
+            if (!Validator.POSITIVE_INTEGER(v) || v <= 0)
+                throw `Invalid value supplied to ${k}, value must be a positive integer greater than zero`;
         } else throw `Unexpected property named ${k}`;
     });
-
-    if (!prop?.io && !prop?.cacheProtocol) throw 'You need to provide either "io" or "cacheProtocol"';
 }
 
-const validator = {
+const ConfigValidator = {
     dbName: (v) => {
         if (typeof v !== 'string' || !v.trim())
             throw `Invalid value supplied to dbName, value must be a non-empty string`;
@@ -415,15 +422,12 @@ const validator = {
     projectUrl: (v) => {
         if (typeof v !== 'string' || (!Validator.HTTPS(v) && !Validator.HTTP(v)))
             throw `Expected "projectUrl" to be valid https or http link but got "${v}"`;
+        if (v.endsWith('/')) throw '"projectUrl" must not end with a trailing slash "/"';
     },
     disableCache: (v) => {
         if (typeof v !== 'boolean')
             throw `Invalid value supplied to disableCache, value must be a boolean`;
     },
-    accessKey: (v) => {
-        if (typeof v !== 'string' || !v.trim())
-            throw `Invalid value supplied to accessKey, value must be a non-empty string`;
-    },
     maxRetries: (v) => {
         if (v <= 0 || !Validator.POSITIVE_INTEGER(v))
             throw `Invalid value supplied to maxRetries, value must be positive integer greater than zero`;
@@ -446,7 +450,7 @@ const validator = {
     },
     extraHeaders: v => {
         if (!Validator.OBJECT(v)) throw '"extraHeaders" must be an object';
-        const reservedHeaders = ['mtoken', 'mosquito-token', 'init-content-type', 'content-type', 'authorization', 'uglified'];
+        const reservedHeaders = ['mtoken', 'mosquito-token', 'init-content-type', 'content-type', 'uglified', 'entity-encoded'];
 
         Object.entries(v).forEach(([k, v]) => {
             if (typeof v !== 'string') throw `expected a string at extraHeaders.${k} but got "${v}"`;
@@ -461,19 +465,19 @@ const validateMTConfig = (config, that) => {
         throw `${that.constructor.name} config is not an object`;
 
     for (const [k, v] of Object.entries(config)) {
-        if (!validator[k]) throw `Unexpected property named ${k}`;
-        validator[k](v);
+        if (!ConfigValidator[k]) throw `Unexpected property named ${k}`;
+        ConfigValidator[k](v);
     }
 
     if (config.enableE2E_Encryption && !config.serverE2E_PublicKey)
         throw '"serverE2E_PublicKey" is missing, enabling end-to-end encryption requires a public encryption key from the server';
     if (!config.projectUrl) throw `projectUrl is a required property in ${that.constructor.name}() constructor`;
-    if (!config.accessKey) throw `accessKey is a required property in ${that.constructor.name}() constructor`;
 }
 
 export {
     DoNotEncrypt,
     TIMESTAMP,
+    TIMESTAMP_OFFSET,
     DOCUMENT_EXTRACTION,
     FIND_GEO_JSON,
     GEO_JSON,

package/src/products/auth/accessor.js

@@ -1,4 +1,4 @@
-import cloneDeep from "lodash.clonedeep";
+import cloneDeep from "lodash/cloneDeep";
 import { doSignOut, revokeAuthIntance } from ".";
 import EngineApi from "../../helpers/engine_api";
 import { AuthTokenListener, TokenRefreshListener } from "../../helpers/listeners";
@@ -20,10 +20,10 @@ export const injectFreshToken = async (config, { token, refreshToken }) => {
     await awaitStore();
     CacheStore.AuthStore[projectUrl] = { token, refreshToken };
     Scoped.AuthJWTToken[projectUrl] = token;
-    if (projectUrl in CacheStore.EmulatedAuth)
-        delete CacheStore.EmulatedAuth[projectUrl];
+    const isEmulated = projectUrl in CacheStore.EmulatedAuth;
+    if (isEmulated) delete CacheStore.EmulatedAuth[projectUrl];
 
-    updateCacheStore(0);
+    updateCacheStore(0, ['AuthStore', isEmulated ? 'EmulatedAuth' : ''].filter(v => v));
 
     triggerAuthToken(projectUrl);
     initTokenRefresher(config);
@@ -47,7 +47,7 @@ export const injectEmulatedAuth = async (config, emulatedURL) => {
     Scoped.AuthJWTToken[projectUrl] = token;
     CacheStore.EmulatedAuth[projectUrl] = emulatedURL;
 
-    updateCacheStore(0);
+    updateCacheStore(0, ['AuthStore', 'EmulatedAuth']);
     triggerAuthToken(projectUrl);
     initTokenRefresher(config);
 };
@@ -90,7 +90,7 @@ export const initTokenRefresher = async (config, forceRefresh) => {
     if (token) {
         const expireOn = (tokenInfo.exp * 1000) - 60000;
         const hasExpire = getPrefferTime() >= expireOn;
-        const rizz = () => refreshToken(config, ++Scoped.LastTokenRefreshRef[projectUrl], maxRetries, maxRetries, forceRefresh);
+        const rizz = () => refreshToken(config, ++Scoped.LastTokenRefreshRef[projectUrl], maxRetries, forceRefresh);
 
         if (hasExpire || forceRefresh) {
             notifyAuthReady();
@@ -117,8 +117,8 @@ export const getEmulatedLinks = (projectUrl) => Object.entries(CacheStore.Emulat
     .filter(([_, v]) => v === projectUrl)
     .map(v => v[0]);
 
-const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7, isForceRefresh) => new Promise(async (resolve, reject) => {
-    const { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders } = builder;
+const refreshToken = (builder, processRef, remainRetries = 1, isForceRefresh) => new Promise(async (resolve, reject) => {
+    const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
     const lostProcess = simplifyError('process_lost', 'The token refresh process has been lost and replaced with another one');
 
     try {
@@ -126,7 +126,6 @@ const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7
 
         const [reqBuilder, [privateKey]] = await buildFetchInterface({
             body: { token, r_token },
-            accessKey,
             uglify,
             serverE2E_PublicKey,
             extraHeaders
@@ -162,7 +161,7 @@ const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7
                 triggerAuthToken(v, isInit);
                 if (isForceRefresh) Scoped.InitiatedForcedToken[v] = true;
             });
-            updateCacheStore();
+            updateCacheStore(0, ['AuthStore']);
             initTokenRefresher(builder);
         } else reject(lostProcess.simpleError);
     } catch (e) {
@@ -184,7 +183,7 @@ const refreshToken = (builder, processRef, remainRetries = 7, initialRetries = 7
                     l();
                 } else if (c) {
                     l();
-                    refreshToken(builder, processRef, remainRetries - 1, initialRetries, isForceRefresh).then(resolve, reject);
+                    refreshToken(builder, processRef, remainRetries - 1, isForceRefresh).then(resolve, reject);
                 }
             }, projectUrl);
         }

package/src/products/auth/index.js

@@ -6,7 +6,7 @@ import { CacheStore, Scoped } from "../../helpers/variables";
 import { awaitRefreshToken, getEmulatedLinks, initTokenRefresher, injectEmulatedAuth, injectFreshToken, listenToken, parseToken, triggerAuthToken } from "./accessor";
 import { deserializeE2E, encodeBinary, serializeE2E } from "../../helpers/peripherals";
 import { simplifyCaughtError, simplifyError } from "simplify-error";
-import cloneDeep from "lodash.clonedeep";
+import cloneDeep from "lodash/cloneDeep";
 
 const {
     _listenUserVerification,
@@ -48,7 +48,6 @@ export default class MTAuth {
         const { projectUrl, serverE2E_PublicKey, uglify, baseUrl, wsPrefix } = this.builder;
 
         let socket,
-            wasDisconnected,
             hasCancelled,
             lastToken = Scoped.AuthJWTToken[projectUrl] || null,
             lastInitRef = 0;
@@ -67,14 +66,13 @@ export default class MTAuth {
 
             socket = io(`${wsPrefix}://${baseUrl}`, {
                 transports: ['websocket', 'polling', 'flashsocket'],
-                auth: uglify ? {
-                    e2e: reqBuilder.toString('base64'),
-                    _m_internal: true
-                } : { mtoken, _m_internal: true }
+                auth: {
+                    ...uglify ? { e2e: reqBuilder.toString('base64') } : { mtoken },
+                    _m_internal: true,
+                    _m_route: _listenUserVerification(uglify)
+                }
             });
 
-            socket.emit(_listenUserVerification(uglify));
-
             socket.on("onVerificationChanged", async ([err, verified]) => {
                 if (err) {
                     onError?.(simplifyCaughtError(err).simpleError);
@@ -82,14 +80,6 @@ export default class MTAuth {
                     callback?.(uglify ? await deserializeE2E(verified, serverE2E_PublicKey, privateKey) : verified);
                 }
             });
-
-            socket.on('connect', () => {
-                if (wasDisconnected) socket.emit(_listenUserVerification(uglify));
-            });
-
-            socket.on('disconnect', () => {
-                wasDisconnected = true;
-            });
         };
 
         init();
@@ -97,7 +87,6 @@ export default class MTAuth {
         const tokenListener = listenToken(t => {
             if ((t || null) !== lastToken) {
                 socket?.close?.();
-                wasDisconnected = undefined;
                 init();
             }
             lastToken = t;
@@ -178,7 +167,7 @@ export default class MTAuth {
 };
 
 const doCustomSignin = (builder, email, password) => new Promise(async (resolve, reject) => {
-    const { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders } = builder;
+    const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
     try {
         await awaitStore();
@@ -186,7 +175,6 @@ const doCustomSignin = (builder, email, password) => new Promise(async (resolve,
 
         const [reqBuilder, [privateKey]] = await buildFetchInterface({
             body: { data: `${encodeBinary(email)}.${encodeBinary(password)}` },
-            accessKey,
             serverE2E_PublicKey,
             uglify,
             extraHeaders
@@ -209,7 +197,7 @@ const doCustomSignin = (builder, email, password) => new Promise(async (resolve,
 });
 
 const doCustomSignup = (builder, email, password, name, metadata) => new Promise(async (resolve, reject) => {
-    const { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders } = builder;
+    const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
     try {
         await awaitStore();
@@ -220,7 +208,6 @@ const doCustomSignup = (builder, email, password, name, metadata) => new Promise
                 data: `${encodeBinary(email)}.${encodeBinary(password)}.${(encodeBinary((name || '').trim()))}`,
                 metadata,
             },
-            accessKey,
             serverE2E_PublicKey,
             uglify,
             extraHeaders
@@ -269,13 +256,13 @@ export const doSignOut = async (builder) => {
     const emulatedURL = CacheStore.EmulatedAuth[builder.projectUrl];
 
     clearCacheForSignout(builder, !emulatedURL);
-    updateCacheStore(0);
+    updateCacheStore(0, ['AuthStore', 'EmulatedAuth']);
     if (emulatedURL) return;
     await revokeAuthIntance(builder);
 };
 
 export const revokeAuthIntance = async (builder, authStore) => {
-    const { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders } = builder;
+    const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
     const { token, refreshToken: r_token } = { ...authStore };
 
     if (!r_token || CacheStore.EmulatedAuth[projectUrl]) return;
@@ -283,7 +270,7 @@ export const revokeAuthIntance = async (builder, authStore) => {
 
     CacheStore.PendingAuthPurge[nodeId] = {
         auth: { token, refreshToken: r_token },
-        data: { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders }
+        data: { projectUrl, serverE2E_PublicKey, uglify, extraHeaders }
     };
     await purgePendingToken(nodeId);
 };
@@ -291,7 +278,7 @@ export const revokeAuthIntance = async (builder, authStore) => {
 export const purgePendingToken = async (nodeId) => {
     const {
         auth: { token, refreshToken: r_token },
-        data: { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders }
+        data: { projectUrl, serverE2E_PublicKey, uglify, extraHeaders }
     } = CacheStore.PendingAuthPurge[nodeId];
 
     if (!token) return;
@@ -306,7 +293,6 @@ export const purgePendingToken = async (nodeId) => {
 
         const [reqBuilder] = await buildFetchInterface({
             body: { token, r_token },
-            accessKey,
             uglify,
             serverE2E_PublicKey,
             extraHeaders
@@ -322,7 +308,7 @@ export const purgePendingToken = async (nodeId) => {
 };
 
 const doGoogleSignin = (builder, token) => new Promise(async (resolve, reject) => {
-    const { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders } = builder;
+    const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
     try {
         await awaitStore();
@@ -330,7 +316,6 @@ const doGoogleSignin = (builder, token) => new Promise(async (resolve, reject) =
 
         const [reqBuilder, [privateKey]] = await buildFetchInterface({
             body: { token },
-            accessKey,
             uglify,
             serverE2E_PublicKey,
             extraHeaders