react-native-mosquito-transport 0.0.47 → 0.0.49

package/ios/{Mosquitodb.swift → MosquitoTransport.swift}

@@ -1,52 +1,34 @@
 import React
 
-@objc(Mosquitodb)
-class Mosquitodb:  RCTEventEmitter, URLSessionDataDelegate {
+@objc
+public protocol NativeMosquitoTransportImplDelegate {
+    func sendEvent(name: String, body: Any)
+}
+
+@objc(NativeMosquitoTransportImpl)
+public class NativeMosquitoTransportImpl: NSObject, URLSessionDataDelegate {
+    // Add property for the Objective-C bridge
+    @objc public weak var delegate: NativeMosquitoTransportImplDelegate? = nil
     
     public override init() {
         super.init()
     }
-    
-    override public static func requiresMainQueueSetup() -> Bool {
-        return true;
-    }
-    
-    @objc(supportedEvents)
-    override public func supportedEvents() -> [String] {
-        return [
-            "mt-uploading-progress",
-            "mt-uploading-status",
-            "mt-download-progress",
-            "mt-download-status"
-        ]
+
+    private func emitNewEvent(name: String, body: Any? = nil) {
+        delegate?.sendEvent(name: name, body: body ?? [])
     }
     
-    var uploadTask: [String: MosquitodbUploadTask] = [:]
-    var downloadTask: [String: MosquitodbDownloadTask] = [:]
-    
-    @objc(downloadFile:)
-    func downloadFile(options: [String: Any]) -> Void {
-        let processID = options["processID"] as! String
-        downloadTask[processID] = MosquitodbDownloadTask()
-        downloadTask[processID]?.downloadFile(options: options, completion: { res in
-            let status = res![0] as? String
-            
-            self.sendEvent(withName: status, body: res![1])
-            if status == "mt-download-status" {
-                self.downloadTask.removeValue(forKey: processID)
-            }
-        })
-    }
+    var uploadTask: [String: MosquitoTransportUploadTask] = [:]
     
     @objc(uploadFile:)
-    func uploadFile(options: [String: Any]) -> Void {
+    public func uploadFile(options: [String: Any]) -> Void {
         let processID = options["processID"] as! String
         
-        uploadTask[processID] = MosquitodbUploadTask()
+        uploadTask[processID] = MosquitoTransportUploadTask()
         uploadTask[processID]?.uploadFile(options: options, completion: { res in
             let status = res![0] as? String
             
-            self.sendEvent(withName: status, body: res![1])
+            self.emitNewEvent(name: status!, body: res![1])
             if status == "mt-uploading-status" {
                 self.uploadTask.removeValue(forKey: processID)
             }
@@ -54,28 +36,43 @@ class Mosquitodb:  RCTEventEmitter, URLSessionDataDelegate {
     }
     
     @objc(cancelUpload:)
-    func cancelUpload (processID: String)-> Void {
+    public func cancelUpload (processID: String)-> Void {
         uploadTask[processID]?.cancelUpload()
     }
     
+    var downloadTask: [String: MosquitoTransportDownloadTask] = [:]
+    
+    @objc(downloadFile:)
+    public func downloadFile(options: [String: Any]) -> Void {
+        let processID = options["processID"] as! String
+        downloadTask[processID] = MosquitoTransportDownloadTask()
+        downloadTask[processID]?.downloadFile(options: options, completion: { res in
+            let status = res![0] as? String
+            
+            self.emitNewEvent(name: status!, body: res![1])
+            if status == "mt-download-status" {
+                self.downloadTask.removeValue(forKey: processID)
+            }
+        })
+    }
+    
     @objc(cancelDownload:)
-    func cancelDownload (processID: String)-> Void {
+    public func cancelDownload (processID: String)-> Void {
         downloadTask[processID]?.cancelDownload()
     }
     
     @objc(pauseDownload:)
-    func pauseDownload (processID: String)-> Void {
+    public func pauseDownload (processID: String)-> Void {
         downloadTask[processID]?.pauseDownload()
     }
     
     @objc(resumeDownload:)
-    func resumeDownload (processID: String)-> Void {
+    public func resumeDownload (processID: String)-> Void {
         downloadTask[processID]?.resumeDownload()
     }
 }
 
-
-class MosquitodbUploadTask: NSObject, URLSessionDataDelegate {
+class MosquitoTransportUploadTask: NSObject, URLSessionDataDelegate {
     
     var mainProcessID: String = ""
     var mainTask : URLSessionUploadTask? = nil
@@ -177,7 +174,7 @@ class MosquitodbUploadTask: NSObject, URLSessionDataDelegate {
 }
 
 
-class MosquitodbDownloadTask: NSObject, URLSessionDownloadDelegate {
+class MosquitoTransportDownloadTask: NSObject, URLSessionDownloadDelegate {
     
     var mainProcessID: String = ""
     var mainTask : URLSessionDownloadTask? = nil
@@ -208,7 +205,7 @@ class MosquitodbDownloadTask: NSObject, URLSessionDownloadDelegate {
         mainOptions = options
         trigger = completion
         task.resume()
-        print("MosquitodbDownloadTask started:\(mainProcessID)")
+        print("MosquitoTransportDownloadTask started:\(mainProcessID)")
     }
     
     func cancelDownload ()-> Void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -26,10 +26,18 @@
     "url": "https://github.com/brainbehindx/react-native-mosquito-transport/issues"
   },
   "homepage": "https://github.com/brainbehindx/react-native-mosquito-transport#readme",
+  "codegenConfig": {
+    "name": "MosquitoTransportSpec",
+    "type": "modules",
+    "jsSrcsDir": "src",
+    "android": {
+      "javaPackageName": "com.mosquitotransport"
+    }
+  },
   "dependencies": {
     "@turf/turf": "^7.2.0",
     "buffer": "^6.0.3",
-    "entity-serializer": "^1.0.3",
+    "entity-serializer": "^1.0.4",
     "guard-object": "^1.1.4",
     "poke-object": "^1.0.1",
     "simplify-error": "^1.0.1",
@@ -43,4 +51,4 @@
     "react-native-get-random-values": "*",
     "react-native-sha256": "*"
   }
-}
+}

package/src/NativeMosquitoTransport.js

@@ -0,0 +1,24 @@
+// @flow
+import type { TurboModule } from 'react-native';
+import { type UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  // storage
+  uploadFile(option: UnsafeObject): void;
+  cancelUpload(process_id: string): void;
+  downloadFile(option: UnsafeObject): void;
+  cancelDownload(process_id: string): void;
+  pauseDownload(process_id: string): void;
+  resumeDownload(process_id: string): void;
+
+  // utils
+  getSystemUptime(): Promise<number>;
+
+  // event listeners
+  // readonly onMessage?: EventEmitter<{ message: string }>;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('MosquitoTransport');

package/src/helpers/fs_manager.js

@@ -4,7 +4,7 @@ import { Platform } from "react-native";
 import { Dirs, FileSystem } from "react-native-file-access";
 import { Buffer } from "buffer";
 
-const PARENT_FOLDER = `${Platform.OS === 'android' ? Dirs.DocumentDir.split('/').slice(0, -1).join('/') : Dirs.MainBundleDir}/mosquito_base`;
+const PARENT_FOLDER = `${Platform.OS === 'android' ? Dirs.DocumentDir.split('/').slice(0, -1).join('/') : Dirs.LibraryDir}/mosquito_base`;
 
 /**
  * this method linearize read/write for individual access_id on the file system ensuring consistency across concurrent operations

package/src/helpers/utils.js

@@ -134,21 +134,19 @@ export const releaseCacheStore = async (builder) => {
         Scoped.AuthJWTToken[key] = value?.token;
     });
     Scoped.IsStoreReady = true;
-    StoreReadyListener.dispatchPersist('_', 'ready');
+    StoreReadyListener.dispatchPersist('_', true);
     setTimeout(() => {
         if (tobePurged.length) updateCacheStore(tobePurged);
     }, 0);
 };
 
-export const getPrefferTime = () => Date.now() + (Scoped.serverTimeOffset || 0);
-
 export const awaitStore = () => new Promise(resolve => {
     if (Scoped.IsStoreReady) {
         resolve();
         return;
     }
     const l = StoreReadyListener.listenToPersist('_', t => {
-        if (t === 'ready') {
+        if (t) {
             resolve();
             l();
         }

package/src/helpers/variables.js

@@ -10,7 +10,8 @@ export const Scoped = {
     AuthJWTToken: {},
     IsStoreReady: false,
     TokenRefreshTimer: {},
-    LastTokenRefreshRef: {},
+    TokenRefreshProcess: {},
+    TokenTimestamping: {},
     StorageProcessID: 0,
     InitiatedForcedToken: {},
     PendingFetchCollective: {},

package/src/index.d.ts

@@ -1,6 +1,6 @@
 import { BSON } from "./vendor/bson";
 
-interface RNMTConfig {
+export interface RNMTConfig {
     dbName?: string;
     dbUrl?: string;
     projectUrl: string;
@@ -38,7 +38,7 @@ interface RNMTConfig {
     castBSON?: boolean;
 }
 
-interface GetDatabase {
+export interface GetDatabase {
     collection: (path: string) => RNMTCollection;
 }
 
@@ -98,7 +98,7 @@ type auth_provider_id_values = auth_provider_id['GOOGLE'] |
 interface ReleaseCacheOption_IO {
 }
 
-interface ReleaseCacheOption {
+export interface ReleaseCacheOption {
     /**
      * fs is used as the default caching mechanism
      * 
@@ -137,7 +137,7 @@ interface ReleaseCacheOption {
     promoteCache?: boolean;
 }
 
-interface RNMTSocket {
+export interface RNMTSocket {
     timeout: (timeout?: number) => ({
         emitWithAck: (...args: any) => Promise<any>;
     });
@@ -167,13 +167,18 @@ interface CountConfig {
     disableAuth?: boolean;
 }
 
-interface FetchHttpResponse extends Response {
+export interface FetchHttpResponse extends Response {
     /**
      * true if this response was from local cache
      */
     fromCache?: boolean | undefined;
 }
 
+interface CustomSocketOption extends OveridenProjectUrl {
+    disableAuth?: boolean;
+    authHandshake?: Object;
+}
+
 export default class RNMT {
     constructor(config: RNMTConfig);
     static initializeCache(option?: ReleaseCacheOption): void;
@@ -183,12 +188,12 @@ export default class RNMT {
     storage(): RNMTStorage;
     fetchHttp(endpoint: string, init?: RequestInit, config?: FetchHttpConfig): Promise<FetchHttpResponse>;
     listenReachableServer(callback: (reachable: boolean) => void): () => void;
-    getSocket(options: { disableAuth?: boolean; authHandshake?: Object }): RNMTSocket;
+    getSocket(options?: CustomSocketOption): RNMTSocket;
     onConnect: () => CollectionIO;
     batchWrite(map: BatchWriteValue[], config?: BatchWriteConfig): Promise<DocumentWriteResult[] | undefined>;
 }
 
-interface RNMTCollection {
+export interface RNMTCollection {
     find: (find?: DocumentFind) => ({
         get: (config?: GetConfig) => Promise<DocumentResult[]>;
         listen: (callback: (snapshot?: DocumentResult[]) => void, onError?: (error?: DocumentError) => void, config?: GetConfig) => void;
@@ -258,7 +263,7 @@ interface RNMTCollection {
     deleteMany: (find?: DocumentFind, config?: WriteConfig) => Promise<DocumentWriteResult>;
 }
 
-interface CollectionTaskIO<T> {
+export interface CollectionTaskIO<T> {
     batchWrite(map: BatchWriteValue[], config?: BatchWriteConfig): T;
 }
 
@@ -270,7 +275,7 @@ interface OnConnectChain extends StartStop {
     onDisconnect: () => CollectionTaskIO<StartStop>;
 }
 
-interface CollectionIO extends CollectionTaskIO<OnConnectChain> {
+export interface CollectionIO extends CollectionTaskIO<OnConnectChain> {
     onDisconnect: () => CollectionTaskIO<StartStop>;
 }
 
@@ -282,7 +287,7 @@ interface DocumentError extends ErrorResponse {
 
 }
 
-interface FetchHttpConfig {
+export interface FetchHttpConfig {
     retrieval?: GetConfig['retrieval'];
     /**
      * disable sending authentication token along with this request
@@ -342,7 +347,7 @@ interface GetConfig {
     retrieval?: Retrieval;
     /**
      * - 0: returns data that may have been internally updated locally with updateOne, updateMany, mergeOne, deleteOne, deleteMany, putOne, replaceOne
-     * - 1: returns exact data which was cached in the last query process
+     * - 1: returns exact remote data which was cached in the last query process
      * 
      * @defaults - 0
      * 
@@ -429,7 +434,7 @@ interface DocumentWriteValue {
 
 }
 
-interface RNMTAuth {
+export interface RNMTAuth {
     customSignin: (email: string, password: string) => Promise<SigninResult>;
     customSignup: (email: string, password: string, name?: string, metadata?: Object) => Promise<SignupResult>;
     /**
@@ -465,7 +470,7 @@ export interface SignupResult extends SigninResult {
     isNewUser: boolean;
 }
 
-interface AuthData {
+export interface AuthData {
     email?: string;
     metadata: Object;
     signupMethod: auth_provider_id_values;
@@ -473,7 +478,8 @@ interface AuthData {
     joinedOn: number;
     uid: string;
     claims: Object;
-    emailVerified: boolean;
+    authVerified: boolean;
+    passwordVerified?: boolean | undefined;
     tokenID: string;
     disabled: boolean;
     entityOf: string;
@@ -487,7 +493,7 @@ interface AuthData {
     sub: string;
 }
 
-interface RefreshTokenData {
+export interface RefreshTokenData {
     uid: string;
     tokenID: string;
     isRefreshToken: true;
@@ -497,24 +503,37 @@ interface RefreshTokenData {
     sub: string;
 }
 
-interface TokenEventData extends AuthData {
+export interface TokenEventData extends AuthData {
     tokenManager: TokenManager;
 }
 
-interface TokenManager {
+export interface TokenManager {
     refreshToken: string;
     accessToken: string;
 }
 
-interface UploadOptions {
+interface OveridenProjectUrl {
+    /**
+     * The server instance to send requests to. This overrides the parent `projectUrl`, but still relies on the parent `projectUrl` for authentication token resolution and verify server reachability.
+     */
+    projectUrl?: string;
+}
+
+interface UploadOptions extends OveridenProjectUrl {
     /**
      * optionally create hash for this upload to save disk space
      */
     createHash?: boolean;
+
     /**
      * wait for a reachable server before initiating the upload task
      */
     awaitServer?: boolean;
+
+    /**
+     * monitor upload progress stats
+     */
+    onProgress?: (stats: UploadProgressStats) => void;
 }
 
 interface DownloadOptions {
@@ -522,16 +541,28 @@ interface DownloadOptions {
      * wait for a reachable server before initiating the download task
      */
     awaitServer?: boolean;
+
+    /**
+     * monitor download progress stats
+     */
+    onProgress?: (stats: DownloadProgressStats) => void;
+}
+
+interface StorageTask extends Promise<string> {
+    /**
+     * abort the running task process
+     */
+    abort: () => void;
 }
 
-interface RNMTStorage {
-    downloadFile: (link: string, onComplete?: (error?: ErrorResponse, filepath?: string) => void, destination?: string, onProgress?: (stats: DownloadProgressStats) => void, options?: DownloadOptions) => () => void;
-    uploadFile: (file: string, destination: string, onComplete?: (error?: ErrorResponse, downloadUrl?: string) => void, onProgress?: (stats: UploadProgressStats) => void, options?: UploadOptions) => () => void;
-    deleteFile: (path: string) => Promise<void>;
-    deleteFolder: (folder: string) => Promise<void>;
+export interface RNMTStorage {
+    downloadFile: (link: string, filepath?: string | undefined, options?: DownloadOptions | undefined) => StorageTask;
+    uploadFile: (filepath: string, destination: string, options?: UploadOptions | undefined) => StorageTask;
+    deleteFile: (path: string, options?: OveridenProjectUrl | undefined) => Promise<void>;
+    deleteFolder: (folder: string, options?: OveridenProjectUrl | undefined) => Promise<void>;
 }
 
-interface DownloadProgressStats {
+export interface DownloadProgressStats {
     receivedBtyes: number;
     expectedBytes: number;
     isPaused: boolean;

package/src/index.js

@@ -16,6 +16,7 @@ import { Buffer } from 'buffer';
 import MTAuth, { purgePendingToken } from './products/auth';
 import { BSON } from "./vendor/bson";
 import { basicClone } from './helpers/basic_clone';
+import { AppState } from "react-native";
 
 const {
     _listenCollection,
@@ -59,11 +60,10 @@ class RNMT {
 
         if (!Scoped.InitializedProject[projectUrl]) {
             Scoped.InitializedProject[projectUrl] = basicClone(this.config);
-            Scoped.LastTokenRefreshRef[projectUrl] = 0;
             triggerAuthToken(projectUrl);
-            initTokenRefresher({ ...this.config }, true);
+            initTokenRefresher({ config: this.config, forceRefresh: true });
 
-            let isConnected, recentToken;
+            let isConnected, recentToken, isVirtualMachineFocused = true;
 
             const socket = io(`${this.config.wsPrefix}://${this.config.baseUrl}`, {
                 transports: ['websocket', 'polling', 'flashsocket'],
@@ -86,9 +86,9 @@ class RNMT {
             };
             const onDisconnect = () => {
                 ++connectionIte;
-                isConnected = false;
-                Scoped.IS_CONNECTED[projectUrl] = false;
-                ServerReachableListener.dispatchPersist(projectUrl, false);
+                isConnected = isVirtualMachineFocused ? false : null;
+                Scoped.IS_CONNECTED[projectUrl] = isConnected;
+                ServerReachableListener.dispatchPersist(projectUrl, isConnected);
             }
 
             const manualCheckConnection = () => {
@@ -112,6 +112,11 @@ class RNMT {
                 manualCheckConnection();
             });
 
+            AppState.addEventListener('change', (s) => {
+                isVirtualMachineFocused = s === 'active';
+                manualCheckConnection();
+            });
+
             const updateMountedToken = () => {
                 socket.emit('_update_mounted_user', recentToken || null);
             };
@@ -165,7 +170,7 @@ class RNMT {
     listenReachableServer = (callback) => listenReachableServer(callback, this.config.projectUrl);
 
     getSocket = (configOpts) => {
-        const { disableAuth, authHandshake } = configOpts || {};
+        const { disableAuth, authHandshake, projectUrl: overidenUrl } = configOpts || {};
         const { projectUrl, uglify, serverE2E_PublicKey, wsPrefix, extraHeaders } = this.config;
 
         const restrictedRoute = [
@@ -278,7 +283,10 @@ class RNMT {
             const mtoken = disableAuth ? undefined : Scoped.AuthJWTToken[projectUrl];
             const [reqBuilder, [privateKey]] = uglify ? await serializeE2E({ a_extras: authHandshake }, mtoken, serverE2E_PublicKey) : [null, []];
 
-            socket = io(`${wsPrefix}://${projectUrl.split('://')[1]}`, {
+            const getWsPrefix = url => url.startsWith('https') ? 'wss' : 'ws';
+            const wsUrl = overidenUrl ? `${getWsPrefix(overidenUrl)}://${overidenUrl.split('://')[1]}` : `${wsPrefix}://${projectUrl.split('://')[1]}`;
+
+            socket = io(wsUrl, {
                 transports: ['websocket', 'polling', 'flashsocket'],
                 extraHeaders,
                 auth: uglify ? {
@@ -305,7 +313,7 @@ class RNMT {
             tokenListener = listenTokenReady(status => {
                 if (lastTokenStatus === (status || false)) return;
 
-                if (status === 'ready') {
+                if (status) {
                     init();
                 } else {
                     socket?.close?.();
@@ -445,7 +453,7 @@ const ConfigValidator = {
         if (v.endsWith('/')) throw '"projectUrl" must not end with a trailing slash "/"';
     },
     disableCache: (v) => {
-        if (typeof v !== 'boolean')
+        if (typeof v !== 'boolean' && v !== undefined)
             throw `Invalid value supplied to disableCache, value must be a boolean`;
     },
     maxRetries: (v) => {
@@ -453,7 +461,7 @@ const ConfigValidator = {
             throw `Invalid value supplied to maxRetries, value must be positive integer greater than zero`;
     },
     enableE2E_Encryption: (v) => {
-        if (typeof v !== 'boolean')
+        if (typeof v !== 'boolean' && v !== undefined)
             throw `Invalid value supplied to enableE2E_Encryption, value must be a boolean`;
     },
     castBSON: v => {
@@ -465,7 +473,7 @@ const ConfigValidator = {
             throw `Expected "borrowToken" to be valid https or http link but got "${v}"`;
     },
     serverE2E_PublicKey: (v) => {
-        if (typeof v !== 'string' || !v.trim())
+        if (v !== undefined && (typeof v !== 'string' || !v.trim()))
             throw `Invalid value supplied to serverETE_PublicKey, value must be a non-empty string`;
     },
     extraHeaders: v => {