mosquito-transport-js 0.2.4 → 0.2.6

package/TODO

@@ -1,3 +1,4 @@
 - fix local cache query on sqlite and fs
 - fix and add all mongodb query and update operator
-- reauthenticate
+- reauthenticate
+- change `Object` in d.ts to [key: string]: any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/deflexable/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -33,8 +33,13 @@
     "@types/lodash": "^4.14.194",
     "buffer": "^6.0.3",
     "crypto-js": "^4.2.0",
+    "fast-json-stable-stringify": "^2.1.0",
+    "guard-object": "^1.0.6",
     "json-buffer": "^3.0.1",
-    "lodash": "^4.17.21",
+    "lodash.get": "^4.4.2",
+    "lodash.isequal": "^4.5.0",
+    "lodash.set": "^4.3.2",
+    "lodash.unset": "^4.5.2",
     "set-large-timeout": "^1.0.1",
     "socket.io-client": "^4.6.2",
     "subscription-listener": "^1.1.2",

package/src/helpers/peripherals.js

@@ -98,9 +98,12 @@ export const cloneInstance = (v) => {
     return v;
 }
 
-export const listenReachableServer = (callback, projectUrl) => ServerReachableListener.listenTo(projectUrl, t => {
-    if (typeof t === 'boolean') callback?.(t);
-}, true);
+export const listenReachableServer = (callback, projectUrl) => {
+    let lastValue;
+    return ServerReachableListener.listenTo(projectUrl, t => {
+        if (typeof t === 'boolean' && t !== lastValue) callback?.(t);
+    }, true);
+}
 
 export const prefixStoragePath = (path, prefix = 'file:///') => {
     if (!path) return path;

package/src/helpers/utils.js

@@ -20,7 +20,7 @@ export const updateCacheStore = () => {
         );
 
         if (io) {
-            io.ouput(txt);
+            io.output(txt);
         } else if (cacheProtocol === CACHE_PROTOCOL.LOCAL_STORAGE) {
             window.localStorage.setItem(CACHE_STORAGE_PATH, txt);
         }

package/src/helpers/values.js

@@ -63,4 +63,13 @@ export const READ_OPS_LIST = Object.values(READ_OPS);
 
 export const Regexs = {
     LINK: () => /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
-}
+};
+
+export const AUTH_PROVIDER_ID = {
+    GOOGLE: 'google.com',
+    FACEBOOK: 'facebook.com',
+    PASSWORD: 'password',
+    TWITTER: 'x.com',
+    GITHUB: 'github.com',
+    APPLE: 'apple.com'
+};

package/src/index.d.ts

@@ -25,6 +25,43 @@ interface mtimestamp { $timestamp: 'now' }
 export const TIMESTAMP: mtimestamp;
 export function DOCUMENT_EXTRACTION(path: string): { $dynamicValue: number };
 
+type longitude = number;
+type latitude = number;
+
+export function GEO_JSON(latitude: latitude, longitude: longitude): {
+    type: "Point",
+    coordinates: [longitude, latitude],
+};
+
+export function FIND_GEO_JSON(coordinates: [latitude, longitude], offSetMeters: number, centerMeters?: number): {
+    $near: {
+        $geometry: {
+            type: "Point",
+            coordinates: [longitude, latitude]
+        },
+        $minDistance: number | 0,
+        $maxDistance: number
+    }
+};
+
+export const AUTH_PROVIDER_ID: auth_provider_id;
+
+interface auth_provider_id {
+    GOOGLE: 'google.com';
+    FACEBOOK: 'facebook.com';
+    PASSWORD: 'password';
+    TWITTER: 'x.com';
+    GITHUB: 'github.com';
+    APPLE: 'apple.com';
+}
+
+type auth_provider_id_values = auth_provider_id['GOOGLE'] |
+    auth_provider_id['FACEBOOK'] |
+    auth_provider_id['PASSWORD'] |
+    auth_provider_id['GITHUB'] |
+    auth_provider_id['TWITTER'] |
+    auth_provider_id['APPLE'];
+
 interface ReleaseCacheOption_IO {
     /**
      * This password will be used to encrypt data stored locally
@@ -342,8 +379,8 @@ interface SignupResult extends SigninResult {
 interface AuthData {
     email?: string;
     metadata: Object;
-    signupMethod: 'google' | 'apple' | 'custom' | 'github' | 'twitter' | 'facebook' | string;
-    currentAuthMethod: 'google' | 'apple' | 'custom' | 'github' | 'twitter' | 'facebook' | string;
+    signupMethod: auth_provider_id_values;
+    currentAuthMethod: auth_provider_id_values;
     joinedOn: number;
     uid: string;
     claims: Object;

package/src/index.js

@@ -5,12 +5,12 @@ import { MTAuth } from "./products/auth";
 import { MTCollection, batchWrite } from "./products/database";
 import { MTStorage } from "./products/storage";
 import { ServerReachableListener, TokenRefreshListener } from "./helpers/listeners";
-import { initTokenRefresher, listenTokenReady, triggerAuthToken } from "./products/auth/accessor";
+import { initTokenRefresher, listenToken, listenTokenReady, parseToken, triggerAuthToken } from "./products/auth/accessor";
 import { TIMESTAMP, DOCUMENT_EXTRACTION, FIND_GEO_JSON, GEO_JSON } from "./products/database/types";
 import { mfetch } from "./products/http_callable";
 import { io } from "socket.io-client";
 import { validateCollectionPath } from "./products/database/validator";
-import { CACHE_PROTOCOL, Regexs } from "./helpers/values";
+import { AUTH_PROVIDER_ID, CACHE_PROTOCOL, Regexs } from "./helpers/values";
 import { trySendPendingWrite } from "./products/database/accessor";
 import EngineApi from './helpers/EngineApi';
 import { parse, stringify } from 'json-buffer';
@@ -47,21 +47,42 @@ export class MosquitoTransport {
             triggerAuthToken(projectUrl);
             initTokenRefresher({ ...this.config }, true);
 
-            const socket = io(`${this.config.wsPrefix}://${projectUrl.split('://')[1]}`, {
-                transports: ['websocket', 'polling', 'flashsocket'],
-                auth: { _m_internal: true, _from_base: true }
-            });
+            const disconnectionGlich = {};
+            let socket, lastUid, lastSocketProcess = 0, hasInited;
 
-            socket.on('_signal_signout', () => {
-                this.auth().signOut();
-            });
+            listenToken((token, thisInited) => {
+                const user = token && parseToken(token);
 
-            socket.on('connect', () => {
-                ServerReachableListener.dispatch(projectUrl, true);
-            });
-            socket.on('disconnect', () => {
-                ServerReachableListener.dispatch(projectUrl, false);
-            });
+                const thisUid = (user?.uid || null);
+                if (lastUid === thisUid && (hasInited || !thisInited)) return;
+                if (!hasInited) hasInited = thisInited;
+                lastUid = thisUid;
+
+                if (lastSocketProcess) disconnectionGlich[lastSocketProcess] = true;
+                if (socket) socket.close();
+
+                const thisProcess = ++lastSocketProcess;
+                socket = io(`${this.config.wsPrefix}://${projectUrl.split('://')[1]}`, {
+                    transports: ['websocket', 'polling', 'flashsocket'],
+                    auth: {
+                        _m_internal: true,
+                        _from_base: true,
+                        atoken: token
+                    }
+                });
+
+                socket.on('_signal_signout', () => {
+                    this.auth().signOut();
+                });
+
+                socket.on('connect', () => {
+                    ServerReachableListener.dispatch(projectUrl, true);
+                });
+                socket.on('disconnect', () => {
+                    if (!disconnectionGlich[thisProcess])
+                        ServerReachableListener.dispatch(projectUrl, false);
+                });
+            }, projectUrl);
 
             listenReachableServer(c => {
                 Scoped.IS_CONNECTED[projectUrl] = c;
@@ -379,5 +400,6 @@ export {
     TIMESTAMP,
     DOCUMENT_EXTRACTION,
     FIND_GEO_JSON,
-    GEO_JSON
+    GEO_JSON,
+    AUTH_PROVIDER_ID
 };

package/src/products/auth/index.js

@@ -119,6 +119,9 @@ export class MTAuth {
         }, this.builder.projectUrl);
     });
 
+    /**
+     * @type {import('../../index').RNMTAuth['listenAuth']}
+     */
     listenAuth = (callback) => {
         let lastTrig;
 

package/src/products/database/accessor.js

@@ -2,10 +2,10 @@ import { IS_RAW_OBJECT, objToUniqueString, queryEntries, shuffleArray, sortArray
 import { awaitStore, updateCacheStore } from "../../helpers/utils";
 import { CacheStore } from "../../helpers/variables";
 import { confirmFilterDoc } from "./validator";
-import getLodash from 'lodash/get';
-import setLodash from 'lodash/set';
-import unsetLodash from 'lodash/unset';
-import isEqual from 'lodash/isEqual';
+import getLodash from 'lodash.get';
+import setLodash from 'lodash.set';
+import unsetLodash from 'lodash.unset';
+import isEqual from 'lodash.isequal';
 import { DEFAULT_DB_NAME, DEFAULT_DB_URL, DELIVERY, RETRIEVAL, WRITE_OPS, WRITE_OPS_LIST } from "../../helpers/values";
 import { DatabaseRecordsListener } from "../../helpers/listeners";
 

package/src/products/database/index.js

@@ -8,7 +8,7 @@ import { addPendingWrites, generateRecordID, getRecord, insertRecord, listenQuer
 import { validateCollectionPath, validateFilter, validateReadConfig, validateWriteValue } from "./validator";
 import { awaitRefreshToken, listenToken } from "../auth/accessor";
 import { DEFAULT_DB_NAME, DEFAULT_DB_URL, DELIVERY, RETRIEVAL } from "../../helpers/values";
-import setLodash from 'lodash/set';
+import setLodash from 'lodash.set';
 
 export class MTCollection {
     constructor(config) {

package/src/products/database/validator.js

@@ -1,7 +1,7 @@
 import { IS_DECIMAL_NUMBER, IS_RAW_OBJECT, IS_WHOLE_NUMBER, queryEntries } from "../../helpers/peripherals";
 import { READ_OPS, READ_OPS_LIST, RETRIEVAL } from "../../helpers/values";
-import getLodash from 'lodash/get';
-import isEqual from 'lodash/isEqual';
+import getLodash from 'lodash.get';
+import isEqual from 'lodash.isequal';
 
 const dirn = ['desc', 'asc', 'ascending', 'descending'];