react-native-mosquito-transport 0.0.45 → 0.0.47

package/ios/Mosquitodb.swift

@@ -95,7 +95,7 @@ class MosquitodbUploadTask: NSObject, URLSessionDataDelegate {
             var request = URLRequest(url: URL(string: url)!)
             request.httpMethod = "POST"
 
-            if let extraHeaders = options["extraHeaders"] as? [[String: String]] {
+            if let extraHeaders = options["extraHeaders"] as? [String: String] {
                 for (key, value) in extraHeaders {
                     request.setValue(value, forHTTPHeaderField: key)
                 }
@@ -191,7 +191,7 @@ class MosquitodbDownloadTask: NSObject, URLSessionDownloadDelegate {
         var request = URLRequest(url: URL(string: url)!)
         request.httpMethod = "POST"
 
-        if let extraHeaders = options["extraHeaders"] as? [[String: String]] {
+        if let extraHeaders = options["extraHeaders"] as? [String: String] {
             for (key, value) in extraHeaders {
                 request.setValue(value, forHTTPHeaderField: key)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -34,7 +34,7 @@
     "poke-object": "^1.0.1",
     "simplify-error": "^1.0.1",
     "socket.io-client": "^4.8.1",
-    "subscription-listener": "^1.1.2",
+    "subscription-listener": "^1.1.3",
     "tweetnacl": "^1.0.3"
   },
   "peerDependencies": {

package/src/helpers/peripherals.js

@@ -10,10 +10,10 @@ const { box, randomBytes } = naclPkg;
 
 export const listenReachableServer = (callback, projectUrl) => {
     let lastValue;
-    return ServerReachableListener.listenTo(projectUrl, t => {
+    return ServerReachableListener.listenToPersist(projectUrl, t => {
         if (typeof t === 'boolean' && t !== lastValue) callback?.(t);
         lastValue = t;
-    }, true);
+    });
 };
 
 export const prefixStoragePath = (path, prefix = 'file:///') => {

package/src/helpers/utils.js

@@ -134,7 +134,7 @@ export const releaseCacheStore = async (builder) => {
         Scoped.AuthJWTToken[key] = value?.token;
     });
     Scoped.IsStoreReady = true;
-    StoreReadyListener.dispatch('_', 'ready');
+    StoreReadyListener.dispatchPersist('_', 'ready');
     setTimeout(() => {
         if (tobePurged.length) updateCacheStore(tobePurged);
     }, 0);
@@ -147,12 +147,12 @@ export const awaitStore = () => new Promise(resolve => {
         resolve();
         return;
     }
-    const l = StoreReadyListener.listenTo('_', t => {
+    const l = StoreReadyListener.listenToPersist('_', t => {
         if (t === 'ready') {
             resolve();
             l();
         }
-    }, true);
+    });
 });
 
 export const awaitReachableServer = (projectUrl) => new Promise(resolve => {
@@ -160,12 +160,12 @@ export const awaitReachableServer = (projectUrl) => new Promise(resolve => {
         resolve();
         return;
     }
-    const l = ServerReachableListener.listenTo(projectUrl, t => {
+    const l = ServerReachableListener.listenToPersist(projectUrl, t => {
         if (t) {
             resolve();
             l();
         }
-    }, true);
+    });
 });
 
 export const getReachableServer = (projectUrl) => new Promise(resolve => {
@@ -173,12 +173,12 @@ export const getReachableServer = (projectUrl) => new Promise(resolve => {
         resolve(Scoped.IS_CONNECTED[projectUrl]);
         return;
     }
-    const l = ServerReachableListener.listenTo(projectUrl, t => {
+    const l = ServerReachableListener.listenToPersist(projectUrl, t => {
         if (typeof t === 'boolean') {
             resolve(t);
             l();
         }
-    }, true);
+    });
 });
 
 export const buildFetchInterface = async ({ body, authToken, method, uglify, serverE2E_PublicKey, extraHeaders }) => {

package/src/index.d.ts

@@ -432,8 +432,13 @@ interface DocumentWriteValue {
 interface RNMTAuth {
     customSignin: (email: string, password: string) => Promise<SigninResult>;
     customSignup: (email: string, password: string, name?: string, metadata?: Object) => Promise<SignupResult>;
-    googleSignin: (token: string) => Promise<SignupResult>;
-    appleSignin: () => Promise<SignupResult>;
+    /**
+     * 
+     * @param token can be an `id_token` or `authorization code` returned from Google Identity Services
+     * @param metadata 
+     */
+    googleSignin: (token: string, metadata?: any | undefined) => Promise<SignupResult>;
+    appleSignin: (id_token: string, metadata?: any | undefined) => Promise<SignupResult>;
     facebookSignin: () => Promise<SignupResult>;
     twitterSignin: () => Promise<SignupResult>;
     githubSignin: () => Promise<SignupResult>;

package/src/index.js

@@ -63,9 +63,7 @@ class RNMT {
             triggerAuthToken(projectUrl);
             initTokenRefresher({ ...this.config }, true);
 
-            let isConnected,
-                lastSentToken,
-                queuedToken;
+            let isConnected, recentToken;
 
             const socket = io(`${this.config.wsPrefix}://${this.config.baseUrl}`, {
                 transports: ['websocket', 'polling', 'flashsocket'],
@@ -80,8 +78,8 @@ class RNMT {
                 ++connectionIte;
                 isConnected = true;
                 Scoped.IS_CONNECTED[projectUrl] = true;
-                if (queuedToken) updateMountedToken(queuedToken.token);
-                ServerReachableListener.dispatch(projectUrl, true);
+                if (recentToken) updateMountedToken();
+                ServerReachableListener.dispatchPersist(projectUrl, true);
                 awaitStore().then(() => {
                     if (isConnected) trySendPendingWrite(projectUrl);
                 });
@@ -90,7 +88,7 @@ class RNMT {
                 ++connectionIte;
                 isConnected = false;
                 Scoped.IS_CONNECTED[projectUrl] = false;
-                ServerReachableListener.dispatch(projectUrl, false);
+                ServerReachableListener.dispatchPersist(projectUrl, false);
             }
 
             const manualCheckConnection = () => {
@@ -114,18 +112,13 @@ class RNMT {
                 manualCheckConnection();
             });
 
-            const updateMountedToken = (token) => {
-                if ((lastSentToken || null) !== (token || null)) {
-                    socket.emit('_update_mounted_user', token || null);
-                    lastSentToken = token;
-                }
-                queuedToken = undefined;
+            const updateMountedToken = () => {
+                socket.emit('_update_mounted_user', recentToken || null);
             };
 
             listenToken(token => {
-                if (isConnected) {
-                    updateMountedToken(token);
-                } else queuedToken = { token };
+                recentToken = token;
+                if (isConnected) updateMountedToken();
             }, projectUrl);
 
             TokenRefreshListener.listenTo(projectUrl, v => {

package/src/products/auth/accessor.js

@@ -9,10 +9,10 @@ import { Validator } from "guard-object";
 import { basicClone } from "../../helpers/basic_clone";
 
 export const listenToken = (callback, projectUrl) =>
-    AuthTokenListener.listenTo(projectUrl, (t, n) => {
+    AuthTokenListener.listenToPersist(projectUrl, (t, n) => {
         if (t === undefined) return;
         callback?.(t || null, n);
-    }, true);
+    });
 
 export const injectFreshToken = async (config, { token, refreshToken }) => {
     const { projectUrl } = config;
@@ -56,19 +56,19 @@ export const parseToken = (token) => JSON.parse(decodeBinary(token.split('.')[1]
 
 export const triggerAuthToken = async (projectUrl, isInit) => {
     await awaitStore();
-    AuthTokenListener.dispatch(projectUrl, CacheStore.AuthStore[projectUrl]?.token || null, isInit);
+    AuthTokenListener.dispatchPersist(projectUrl, CacheStore.AuthStore[projectUrl]?.token || null, isInit);
 };
 
 export const awaitRefreshToken = (projectUrl) => new Promise(resolve => {
-    const l = TokenRefreshListener.listenTo(projectUrl, v => {
+    const l = TokenRefreshListener.listenToPersist(projectUrl, v => {
         if (v === 'ready') {
             l();
             resolve();
         }
-    }, true);
+    });
 });
 
-export const listenTokenReady = (callback, projectUrl) => TokenRefreshListener.listenTo(projectUrl, callback, true);
+export const listenTokenReady = (callback, projectUrl) => TokenRefreshListener.listenToPersist(projectUrl, callback);
 
 export const initTokenRefresher = async (config, forceRefresh) => {
     const { projectUrl, maxRetries } = config;
@@ -81,9 +81,9 @@ export const initTokenRefresher = async (config, forceRefresh) => {
     if (emulatedURL) return;
 
     const notifyAuthReady = (value) => {
-        TokenRefreshListener.dispatch(projectUrl, value);
+        TokenRefreshListener.dispatchPersist(projectUrl, value);
         getEmulatedLinks(projectUrl).forEach(v => {
-            TokenRefreshListener.dispatch(v, value);
+            TokenRefreshListener.dispatchPersist(v, value);
         });
     }
 

package/src/products/auth/index.js

@@ -14,6 +14,7 @@ const {
     _customSignin,
     _customSignup,
     _googleSignin,
+    _appleSignin,
     _areYouOk
 } = EngineApi;
 
@@ -28,9 +29,7 @@ export default class MTAuth {
 
     googleSignin = (token, metadata) => doGoogleSignin(this.builder, token, metadata);
 
-    appleSignin() {
-        throw 'unsupported method call';
-    }
+    appleSignin = (token, metadata) => doAppleSignin(this.builder, token, metadata);
 
     facebookSignin() {
         throw 'unsupported method call';
@@ -240,7 +239,7 @@ const purgeCache = (url, isMain) => {
     ].forEach(e => {
         if (e && CacheStore[e]?.[url]) delete CacheStore[e][url];
     });
-    TokenRefreshListener.dispatch(url);
+    TokenRefreshListener.dispatchPersist(url);
     triggerAuthToken(url);
 };
 
@@ -308,7 +307,10 @@ export const purgePendingToken = async (nodeId) => {
     }
 };
 
-const doGoogleSignin = (builder, token, metadata) => new Promise(async (resolve, reject) => {
+const doGoogleSignin = (builder, token, metadata) => doProviderSignin(builder, token, metadata, _googleSignin);
+const doAppleSignin = (builder, token, metadata) => doProviderSignin(builder, token, metadata, _appleSignin);
+
+const doProviderSignin = (builder, token, metadata, endpointer) => new Promise(async (resolve, reject) => {
     const { projectUrl, serverE2E_PublicKey, uglify, extraHeaders } = builder;
 
     try {
@@ -322,7 +324,7 @@ const doGoogleSignin = (builder, token, metadata) => new Promise(async (resolve,
             extraHeaders
         });
 
-        const data = await buildFetchResult(await fetch(_googleSignin(projectUrl, uglify), reqBuilder), uglify);
+        const data = await buildFetchResult(await fetch(endpointer(projectUrl, uglify), reqBuilder), uglify);
 
         const f = uglify ? await deserializeE2E(data, serverE2E_PublicKey, privateKey) : data;
 
@@ -337,8 +339,4 @@ const doGoogleSignin = (builder, token, metadata) => new Promise(async (resolve,
     } catch (e) {
         reject(simplifyCaughtError(e).simpleError);
     }
-});
-
-const doAppleSignin = async () => {
-
-}
+});