mosquito-transport-js 0.2.7 → 0.2.8

package/TODO

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/deflexable/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -33,7 +33,7 @@
     "buffer": "^6.0.3",
     "crypto-js": "^4.2.0",
     "fast-json-stable-stringify": "^2.1.0",
-    "guard-object": "^1.0.7",
+    "guard-object": "^1.0.9",
     "json-buffer": "^3.0.1",
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
@@ -57,4 +57,4 @@
   "engines": {
     "node": ">=14"
   }
-}
+}

package/src/index.js

@@ -5,7 +5,7 @@ import { MTAuth } from "./products/auth";
 import { MTCollection, batchWrite } from "./products/database";
 import { MTStorage } from "./products/storage";
 import { ServerReachableListener, TokenRefreshListener } from "./helpers/listeners";
-import { initTokenRefresher, listenToken, listenTokenReady, parseToken, triggerAuthToken } from "./products/auth/accessor";
+import { initTokenRefresher, listenToken, listenTokenReady, 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";
@@ -47,41 +47,43 @@ export class MosquitoTransport {
             triggerAuthToken(projectUrl);
             initTokenRefresher({ ...this.config }, true);
 
-            const disconnectionGlich = {};
-            let socket, lastUid, lastSocketProcess = 0, hasInited;
+            let isConnected, lastSentToken, queuedToken;
 
-            listenToken((token, thisInited) => {
-                const user = token && parseToken(token);
+            const socket = io(`${this.config.wsPrefix}://${projectUrl.split('://')[1]}`, {
+                transports: ['websocket', 'polling', 'flashsocket'],
+                auth: {
+                    _m_internal: true,
+                    _from_base: true
+                }
+            });
 
-                const thisUid = (user?.uid || null);
-                if (lastUid === thisUid && (hasInited || !thisInited)) return;
-                if (!hasInited) hasInited = thisInited;
-                lastUid = thisUid;
+            socket.on('_signal_signout', () => {
+                this.auth().signOut();
+            });
 
-                if (lastSocketProcess) disconnectionGlich[lastSocketProcess] = true;
-                if (socket) socket.close();
+            socket.on('connect', () => {
+                isConnected = true;
+                if (queuedToken) updateMountedToken(queuedToken.token);
+                ServerReachableListener.dispatch(projectUrl, true);
+            });
 
-                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('disconnect', () => {
+                isConnected = false;
+                ServerReachableListener.dispatch(projectUrl, false);
+            });
 
-                socket.on('_signal_signout', () => {
-                    this.auth().signOut();
-                });
+            const updateMountedToken = (token) => {
+                if ((lastSentToken || null) !== (token || null)) {
+                    socket.emit('_update_mounted_user', token || null);
+                    lastSentToken = token;
+                }
+                queuedToken = undefined;
+            }
 
-                socket.on('connect', () => {
-                    ServerReachableListener.dispatch(projectUrl, true);
-                });
-                socket.on('disconnect', () => {
-                    if (!disconnectionGlich[thisProcess])
-                        ServerReachableListener.dispatch(projectUrl, false);
-                });
+            listenToken(token => {
+                if (isConnected) {
+                    updateMountedToken(token);
+                } else queuedToken = { token };
             }, projectUrl);
 
             listenReachableServer(c => {

package/src/products/database/index.js

@@ -69,8 +69,8 @@ export class MTCollection {
         updateMany: (find, value) => initOnDisconnectionTask({ ...this.builder, command: { find } }, value, 'updateMany'),
         mergeOne: (find, value) => initOnDisconnectionTask({ ...this.builder, command: { find } }, value, 'mergeOne'),
         mergeMany: (find, value) => initOnDisconnectionTask({ ...this.builder, command: { find } }, value, 'mergeMany'),
-        deleteOne: (find) => initOnDisconnectionTask({ ...this.builder, command: { find } }, null, 'deleteOne'),
-        deleteMany: (find) => initOnDisconnectionTask({ ...this.builder, command: { find } }, null, 'deleteMany'),
+        deleteOne: (find) => initOnDisconnectionTask({ ...this.builder, command: { find } }, undefined, 'deleteOne'),
+        deleteMany: (find) => initOnDisconnectionTask({ ...this.builder, command: { find } }, undefined, 'deleteMany'),
         replaceOne: (find, value) => initOnDisconnectionTask({ ...this.builder, command: { find } }, value, 'replaceOne'),
         putOne: (find, value) => initOnDisconnectionTask({ ...this.builder, command: { find } }, value, 'putOne')
     })
@@ -91,9 +91,9 @@ export class MTCollection {
 
     putOne = (find, value, config) => commitData({ ...this.builder, find }, value, 'putOne', config);
 
-    deleteOne = (find, config) => commitData({ ...this.builder, find }, null, 'deleteOne', config);
+    deleteOne = (find, config) => commitData({ ...this.builder, find }, undefined, 'deleteOne', config);
 
-    deleteMany = (find, config) => commitData({ ...this.builder, find }, null, 'deleteMany', config);
+    deleteMany = (find, config) => commitData({ ...this.builder, find }, undefined, 'deleteMany', config);
 }
 
 export const batchWrite = (builder, map, config) => commitData({ ...builder }, map, 'batchWrite', config);