react-native-mosquito-transport 0.0.29 → 0.0.31

package/TODO

@@ -1,11 +1,11 @@
 - fix local cache query on sqlite ✅
-- fix and add all mongodb query and update operator
+- fix and add all mongodb query and update operator ✅
 - reauthenticate
 - change `Object` in d.ts to [key: string]: any
 - add `getServerTimeOffset` method
 - change undefined to null in `value` ✅
 - `provide functionality to add extra header to MT instance (all outgoing request)` ✅
-- borrowToken
+- borrowToken ✅
 - `add sqlite` ✅
 - minimize extraction data ✅
 - change `collection().onDisconnect()` to `collection().socket().onDisconnect()` and `collection().socket().onConnect()` ✅
@@ -14,11 +14,11 @@
 - dynamic import for fs ✅
 - new URL() work around ✅
 - fetchHttp, default retrieval if has body ✅
-- native hashing
+- native hashing ✅
 - TextEncoder
-- native storage upload
+- native storage upload ✅
 - lodashes ✅
 - switch to events package
 - serverTimeOffset
-- avoid sending cookies
+- avoid sending cookies ✅
 <!-- - error: "refreshToken retry limit exceeded" <--- no need -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -27,24 +27,23 @@
   },
   "homepage": "https://github.com/brainbehindx/react-native-mosquito-transport#readme",
   "dependencies": {
-    "@turf/turf": "^7.1.0",
+    "@turf/turf": "^7.2.0",
     "bson": "^6.8.0",
     "buffer": "^6.0.3",
     "entity-serializer": "^1.0.3",
     "guard-object": "^1.1.4",
     "lodash": "^4.17.21",
-    "react-native-get-random-values": "^1.9.0",
     "simplify-error": "^1.0.1",
-    "socket.io-client": "^4.6.2",
+    "socket.io-client": "^4.8.1",
     "subscription-listener": "^1.1.2",
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {
-    "react": "*",
     "react-native": "*",
     "react-native-fs": "*",
     "react-native-sha256": "*",
-    "react-native-sqlite-storage": "*"
+    "react-native-sqlite-storage": "*",
+    "react-native-get-random-values": "*"
   },
   "devDependencies": {
     "@types/react-native-sqlite-storage": "^6.0.5"

package/src/helpers/fs_manager.js

@@ -1,12 +1,12 @@
 import { Platform } from "react-native";
 import { Buffer } from 'buffer';
 import { deserialize, serialize } from 'entity-serializer';
-import { writeFile, mkdir, MainBundlePath, readFile, unlink } from "react-native-fs";
+import { writeFile, mkdir, MainBundlePath, readFile, unlink, DocumentDirectoryPath } from "react-native-fs";
 
 const MAX_INLINE_BLOB = 1024;
 
-const DIR_PATH = `${Platform.OS === 'android' ? DocumentDirectoryPath.split('/').slice(0, -1).join('/').concat('/database') : MainBundlePath}/MOSQUITO`;
-const resolvePath = (path = '') => `${DIR_PATH}/${path.startsWith('/') ? path : '/' + path}`;
+const DIR_PATH = `${Platform.OS === 'android' ? DocumentDirectoryPath.split('/').slice(0, -1).join('/').concat('/databases') : MainBundlePath}/MOSQUITO`;
+const resolvePath = (path = '') => `${DIR_PATH}${path.startsWith('/') ? path : '/' + path}`;
 
 const DIR_CREATION_PROMISE = mkdir(DIR_PATH).catch(() => null);
 
@@ -20,7 +20,16 @@ const fsRead = async (path) => {
     return Buffer.from(await readFile(resolvePath(path), 'base64'), 'base64');
 }
 
-export const getStoreID = (db_filename, table, primary_key) => `${table}_${primary_key}_${db_filename}.blob`;
+const purifyFilename = (filename) => {
+    if (!filename || typeof filename !== 'string') return 'unnamed';
+
+    // Remove invalid characters for both iOS and Android
+    return filename
+        .replace(/[/\\?%*:|"<>]/g, '') // Remove forbidden characters
+        .trim(); // Remove leading/trailing whitespace
+}
+
+export const getStoreID = (db_filename, table, primary_key) => purifyFilename(`${table}_${primary_key}_${db_filename}.blob`);
 
 export const deleteBigData = (store_id) => unlink(resolvePath(store_id));
 

package/src/helpers/sqlite_manager.js

@@ -137,7 +137,7 @@ export const SQLITE_PATH = {
 };
 
 export const SQLITE_COMMANDS = {
-    MERGE: (table, columns = []) => `INSERT INTO ${table} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')}) ON CONFLICT(${columns[0]}) DO UPDATE SET ${columns.slice(1).map(v => `${v} = excluded.${v}`).join(', ')}`,
+    MERGE: (table, columns = []) => `INSERT OR REPLACE INTO ${table} (${columns.join(', ')}) VALUES (${columns.fill('?').join(', ')})`,
     UPDATE_COLUMNS: (table, columns = [], query = '') => `UPDATE ${table} SET ${columns.map(v => `${v} = ?`).join(', ')} WHERE ${query}`,
     CREATE_INDEX: (table, columns) => `CREATE INDEX idx_${columns.join('_')} ON ${table}(${columns.join(', ')})`,
     DELETE_ROW: (table, query) => `DELETE FROM ${table} WHERE ${query}`

package/src/helpers/utils.js

@@ -164,7 +164,8 @@ export const buildFetchInterface = async ({ body, authToken, method, uglify, ser
             'Content-type': uglify ? 'request/buffer' : 'application/json',
             ...(authToken && !uglify) ? { 'Mosquito-Token': authToken } : {}
         },
-        method: method || 'POST'
+        method: method || 'POST',
+        credentials: 'omit'
     }, keyPair];
 };
 

package/src/index.d.ts

@@ -146,6 +146,10 @@ interface RNMTSocket {
     on: (route: string, callback?: () => any) => void;
     once: (route: string, callback?: () => any) => void;
     destroy: () => void;
+    /**
+     * Whether the socket is currently disconnected
+     */
+    disconnected: boolean;
 }
 
 interface BatchWriteValue {

package/src/index.js

@@ -74,7 +74,9 @@ class RNMT {
                     _from_base: true
                 }
             });
+            let connectionIte = 0;
             const onConnect = () => {
+                ++connectionIte;
                 isConnected = true;
                 Scoped.IS_CONNECTED[projectUrl] = true;
                 if (queuedToken) updateMountedToken(queuedToken.token);
@@ -84,17 +86,22 @@ class RNMT {
                 });
             };
             const onDisconnect = () => {
+                ++connectionIte;
                 isConnected = false;
                 Scoped.IS_CONNECTED[projectUrl] = false;
                 ServerReachableListener.dispatch(projectUrl, false);
             }
 
-            const manualCheckConnection = () =>
-                fetch(_areYouOk(projectUrl), { cache: 'no-cache' }).then(async r => {
+            const manualCheckConnection = () => {
+                const ref = ++connectionIte;
+                fetch(_areYouOk(projectUrl), { cache: 'no-cache', credentials: 'omit' }).then(async r => {
                     if ((await r.json()).status === 'yes') {
-                        onConnect();
+                        if (ref === connectionIte) onConnect();
                     } else throw null;
-                }).catch(onDisconnect);
+                }).catch(() => {
+                    if (ref === connectionIte) onDisconnect();
+                });
+            }
             manualCheckConnection();
 
             socket.on('_signal_signout', () => {
@@ -314,8 +321,8 @@ class RNMT {
                 lastTokenStatus = status || false;
             }, projectUrl);
         }
-        // TODO: disconnected
-        return {
+
+        const resultant = {
             timeout: (timeout) => {
                 if (timeout !== undefined && !Validator.POSITIVE_INTEGER(timeout))
                     throw `expected a positive integer for timeout but got ${timeout}`;
@@ -371,7 +378,17 @@ class RNMT {
                 if (socket) socket.close();
                 socketListenerList = [];
             }
-        }
+        };
+
+        Object.defineProperty(resultant, 'disconnected', {
+            get() {
+                return socket.disconnected;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        return resultant;
     }
 };
 

package/src/products/auth/index.js

@@ -286,7 +286,7 @@ export const purgePendingToken = async (nodeId) => {
     try {
         let isConnected;
         try {
-            isConnected = (await (await fetch(_areYouOk(projectUrl))).json(), { cache: 'no-cache' }).status === 'yes';
+            isConnected = (await (await fetch(_areYouOk(projectUrl))).json(), { cache: 'no-cache', credentials: 'omit' }).status === 'yes';
         } catch (_) { }
 
         if (!isConnected)

package/src/products/database/accessor.js

@@ -57,7 +57,7 @@ export const insertCountQuery = async (builder, access_id, value) => {
                 Scoped.initedSqliteInstances.dbQueryCount[initNode] = (async () => {
                     await sqlite.executeSql(`CREATE TABLE IF NOT EXISTS ${DB_COUNT_QUERY(path)} ( access_id TEXT PRIMARY KEY, value TEXT, touched INTEGER )`).catch(() => null);
                     await Promise.allSettled([
-                        sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(DB_COUNT_QUERY(path), ['access_id'])),
+                        // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(DB_COUNT_QUERY(path), ['access_id'])),
                         // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(DB_COUNT_QUERY(path), ['touched']))
                     ]);
                 })();
@@ -117,9 +117,9 @@ export const insertRecord = async (builder, config, accessIdWithoutLimit, value,
                     ]);
 
                     await Promise.allSettled([
-                        sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_DATA(path), ['access_id'])),
+                        // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_DATA(path), ['access_id'])),
                         // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_DATA(path), ['touched'])),
-                        sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_RESULT(path), ['access_id_limiter'])),
+                        // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_RESULT(path), ['access_id_limiter'])),
                         // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX(LIMITER_RESULT(path), ['touched']))
                     ]);
                 })();

package/src/products/http_callable/accessor.js

@@ -31,8 +31,8 @@ export const insertFetchResources = async (projectUrl, access_id, value) => {
                 Scoped.initedSqliteInstances.httpFetch[initNode] = (async () => {
                     await sqlite.executeSql(`CREATE TABLE IF NOT EXISTS main ( access_id TEXT PRIMARY KEY, value BLOB, touched INTEGER, size INTEGER )`).catch(() => null);
                     await Promise.allSettled([
-                        sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX('main', ['access_id'])),
-                        sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX('main', ['touched']))
+                        // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX('main', ['access_id'])),
+                        // sqlite.executeSql(SQLITE_COMMANDS.CREATE_INDEX('main', ['touched']))
                     ]);
                 })();
             }

package/src/products/http_callable/index.js

@@ -143,6 +143,7 @@ export const mfetch = async (input = '', init, config) => {
 
             const f = await fetch(isLink ? input : `${projectUrl}/${normalizeRoute(input)}`, {
                 ...(!isBaseUrl || hasBody) ? { method: 'POST' } : {},
+                credentials: 'omit',
                 ...init,
                 ...uglified ? { body: reqBuilder } : encodeBody ? { body: serialize(body) } : {},
                 // cache: 'no-cache',