react-native-mosquito-transport 0.0.28 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -42,7 +42,7 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-file-access": "*",
+    "react-native-fs": "*",
     "react-native-sha256": "*",
     "react-native-sqlite-storage": "*"
   },

package/src/helpers/fs_manager.js

@@ -1,28 +1,28 @@
 import { Platform } from "react-native";
 import { Buffer } from 'buffer';
 import { deserialize, serialize } from 'entity-serializer';
-import { Dirs, FileSystem } from 'react-native-file-access';
+import { writeFile, mkdir, MainBundlePath, readFile, unlink } from "react-native-fs";
 
 const MAX_INLINE_BLOB = 1024;
 
-const DIR_PATH = `${Platform.OS === 'android' ? Dirs.DatabaseDir : Dirs.MainBundleDir}/MOSQUITO`;
+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_CREATION_PROMISE = FileSystem.mkdir(DIR_PATH).catch(() => null);
+const DIR_CREATION_PROMISE = mkdir(DIR_PATH).catch(() => null);
 
 const fsWrite = async (path, data) => {
     await DIR_CREATION_PROMISE;
-    return FileSystem.writeFile(resolvePath(path), data instanceof Buffer ? data.toString('base64') : data, 'base64');
+    return writeFile(resolvePath(path), data instanceof Buffer ? data.toString('base64') : data, 'base64');
 }
 
 const fsRead = async (path) => {
     await DIR_CREATION_PROMISE;
-    return Buffer.from(await FileSystem.readFile(resolvePath(path), 'base64'), 'base64');
+    return Buffer.from(await readFile(resolvePath(path), 'base64'), 'base64');
 }
 
 export const getStoreID = (db_filename, table, primary_key) => `${table}_${primary_key}_${db_filename}.blob`;
 
-export const deleteBigData = (store_id) => FileSystem.unlink(resolvePath(store_id));
+export const deleteBigData = (store_id) => unlink(resolvePath(store_id));
 
 export const handleBigData = async (store_id, data) => {
     const bufData = serialize(data);

package/src/helpers/peripherals.js

@@ -11,6 +11,7 @@ export const listenReachableServer = (callback, projectUrl) => {
     let lastValue;
     return ServerReachableListener.listenTo(projectUrl, t => {
         if (typeof t === 'boolean' && t !== lastValue) callback?.(t);
+        lastValue = t;
     }, true);
 };
 

package/src/index.d.ts

@@ -427,7 +427,7 @@ interface DocumentWriteValue {
 
 interface RNMTAuth {
     customSignin: (email: string, password: string) => Promise<SigninResult>;
-    customSignup: (email: string, password: string, name?: string, metadata?: Object) => Promise<SigninResult>;
+    customSignup: (email: string, password: string, name?: string, metadata?: Object) => Promise<SignupResult>;
     googleSignin: (token: string) => Promise<SignupResult>;
     appleSignin: () => Promise<SignupResult>;
     facebookSignin: () => Promise<SignupResult>;

package/src/index.js

@@ -21,7 +21,8 @@ const {
     _listenDocument,
     _startDisconnectWriteTask,
     _cancelDisconnectWriteTask,
-    _listenUserVerification
+    _listenUserVerification,
+    _areYouOk
 } = EngineApi;
 
 // https://socket.io/docs/v3/emit-cheatsheet/#reserved-events
@@ -73,12 +74,7 @@ class RNMT {
                     _from_base: true
                 }
             });
-
-            socket.on('_signal_signout', () => {
-                this.auth().signOut();
-            });
-
-            socket.on('connect', () => {
+            const onConnect = () => {
                 isConnected = true;
                 Scoped.IS_CONNECTED[projectUrl] = true;
                 if (queuedToken) updateMountedToken(queuedToken.token);
@@ -86,12 +82,28 @@ class RNMT {
                 awaitStore().then(() => {
                     trySendPendingWrite(projectUrl);
                 });
-            });
-
-            socket.on('disconnect', () => {
+            };
+            const onDisconnect = () => {
                 isConnected = false;
                 Scoped.IS_CONNECTED[projectUrl] = false;
                 ServerReachableListener.dispatch(projectUrl, false);
+            }
+
+            const manualCheckConnection = () =>
+                fetch(_areYouOk(projectUrl), { cache: 'no-cache' }).then(async r => {
+                    if ((await r.json()).status === 'yes') {
+                        onConnect();
+                    } else throw null;
+                }).catch(onDisconnect);
+            manualCheckConnection();
+
+            socket.on('_signal_signout', () => {
+                this.auth().signOut();
+            });
+
+            socket.on('connect', onConnect);
+            socket.on('disconnect', () => {
+                manualCheckConnection();
             });
 
             const updateMountedToken = (token) => {

package/src/products/auth/index.js

@@ -220,7 +220,8 @@ const doCustomSignup = (builder, email, password, name, metadata) => new Promise
         resolve({
             user: parseToken(r.result.token),
             token: r.result.token,
-            refreshToken: r.result.refreshToken
+            refreshToken: r.result.refreshToken,
+            isNewUser: !!r.result.isNewUser
         });
         await injectFreshToken(builder, r.result);
         revokeAuthIntance(builder, thisAuthStore);