mosquito-transport-js 0.4.3 → 0.4.7

package/TODO

@@ -1,11 +1,11 @@
 - fix local cache query on sqlite ✅
-- fix and add all mongodb query and update operator
+- fix and add all mongodb query and update operator ✅
 - reauthenticate
 - change `Object` in d.ts to [key: string]: any
 - add `getServerTimeOffset` method
 - change undefined to null in `value` ✅
 - `provide functionality to add extra header to MT instance (all outgoing request)` ✅
-- borrowToken
+- borrowToken ✅
 - `add sqlite` ✅
 - minimize extraction data ✅
 - change `collection().onDisconnect()` to `collection().socket().onDisconnect()` and `collection().socket().onConnect()` ✅
@@ -14,10 +14,11 @@
 - dynamic import for fs ✅
 - new URL() work around ✅
 - fetchHttp, default retrieval if has body ✅
-- native hashing
+- native hashing ✅
 - TextEncoder
-- native storage upload
+- native storage upload ✅
 - lodashes ✅
 - switch to events package
 - serverTimeOffset
+- avoid sending cookies ✅
 <!-- - error: "refreshToken retry limit exceeded" <--- no need -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.4.3",
+  "version": "0.4.7",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",
@@ -28,15 +28,15 @@
   },
   "homepage": "https://github.com/brainbehindx/mosquito-transport-js#readme",
   "dependencies": {
-    "@turf/turf": "^7.1.0",
+    "@turf/turf": "^7.2.0",
     "bson": "^6.8.0",
     "buffer": "^6.0.3",
-    "entity-serializer": "^1.0.2",
-    "guard-object": "^1.1.3",
+    "entity-serializer": "^1.0.3",
+    "guard-object": "^1.1.4",
     "limit-task": "1.0.0",
     "lodash": "^4.17.21",
     "simplify-error": "^1.0.1",
-    "socket.io-client": "^4.6.2",
+    "socket.io-client": "^4.8.1",
     "subscription-listener": "^1.1.2",
     "tweetnacl-functional": "^1.0.5"
   },

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/helpers/utils.js

@@ -129,7 +129,8 @@ export const buildFetchInterface = async ({ body, authToken, method, uglify, ser
             'Content-type': uglify ? 'request/buffer' : 'application/json',
             ...(authToken && !uglify) ? { 'Mosquito-Token': authToken } : {}
         },
-        method: method || 'POST'
+        method: method || 'POST',
+        credentials: 'omit'
     }, keyPair];
 };
 

package/src/index.d.ts

@@ -71,6 +71,7 @@ export const AUTH_PROVIDER_ID: auth_provider_id;
  * useful for avoiding encrypting data and extra overhead
  */
 export class DoNotEncrypt {
+    constructor(value: any);
     value: any;
 }
 
@@ -419,7 +420,7 @@ interface DocumentWriteValue {
 
 interface MTAuth {
     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>;
@@ -525,7 +526,7 @@ interface DownloadProgressStats {
 }
 
 interface UploadProgressStats {
-    sentBtyes: number;
+    sentBytes: number;
     totalBytes: number;
 }
 

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,9 @@ export class MosquitoTransport {
                     _from_base: true
                 }
             });
-
-            socket.on('_signal_signout', () => {
-                this.auth().signOut();
-            });
-
-            socket.on('connect', () => {
+            let connectionIte = 0;
+            const onConnect = () => {
+                ++connectionIte;
                 isConnected = true;
                 Scoped.IS_CONNECTED[projectUrl] = true;
                 if (queuedToken) updateMountedToken(queuedToken.token);
@@ -86,12 +84,33 @@ export class MosquitoTransport {
                 awaitStore().then(() => {
                     trySendPendingWrite(projectUrl);
                 });
-            });
-
-            socket.on('disconnect', () => {
+            };
+            const onDisconnect = () => {
+                ++connectionIte;
                 isConnected = false;
                 Scoped.IS_CONNECTED[projectUrl] = false;
                 ServerReachableListener.dispatch(projectUrl, false);
+            }
+
+            const manualCheckConnection = () => {
+                const ref = ++connectionIte;
+                fetch(_areYouOk(projectUrl), { cache: 'no-cache', credentials: 'omit' }).then(async r => {
+                    if ((await r.json()).status === 'yes') {
+                        if (ref === connectionIte) onConnect();
+                    } else throw null;
+                }).catch(() => {
+                    if (ref === connectionIte) onDisconnect();
+                });
+            }
+            manualCheckConnection();
+
+            socket.on('_signal_signout', () => {
+                this.auth().signOut();
+            });
+
+            socket.on('connect', onConnect);
+            socket.on('disconnect', () => {
+                manualCheckConnection();
             });
 
             const updateMountedToken = (token) => {
@@ -189,8 +208,11 @@ export class MosquitoTransport {
             socketListenerList = [],
             socketListenerIte = 0;
 
+        /**
+         * @type {import('socket.io-client').Socket}
+         */
+        let socket;
         let hasCancelled,
-            socket,
             tokenListener,
             clientPrivateKey;
 
@@ -315,7 +337,7 @@ export class MosquitoTransport {
                 lastTokenStatus = status || false;
             }, projectUrl);
         }
-
+        // TODO: disconnected
         return {
             timeout: (timeout) => {
                 if (timeout !== undefined && !Validator.POSITIVE_INTEGER(timeout))
@@ -460,7 +482,7 @@ const ConfigValidator = {
     },
     extraHeaders: v => {
         if (!Validator.OBJECT(v)) throw '"extraHeaders" must be an object';
-        const reservedHeaders = ['mtoken', 'mosquito-token', 'init-content-type', 'content-type', 'uglified'];
+        const reservedHeaders = ['mtoken', 'mosquito-token', 'init-content-type', 'content-type', 'uglified', 'entity-encoded'];
 
         Object.entries(v).forEach(([k, v]) => {
             if (typeof v !== 'string') throw `expected a string at extraHeaders.${k} but got "${v}"`;

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);
@@ -285,7 +286,7 @@ export const purgePendingToken = async (nodeId) => {
     try {
         let isConnected;
         try {
-            isConnected = (await (await fetch(_areYouOk(projectUrl))).json(), { cache: 'no-cache' }).status === 'yes';
+            isConnected = (await (await fetch(_areYouOk(projectUrl))).json(), { cache: 'no-cache', credentials: 'omit' }).status === 'yes';
         } catch (_) { }
 
         if (!isConnected)

package/src/products/database/index.js

@@ -435,7 +435,7 @@ const hydrateForeignDoc = ({ data, doc_holder }) => {
         if (v?._foreign_doc) {
             v._foreign_doc = Array.isArray(v._foreign_doc)
                 ? v._foreign_doc.map(k => doc_holder[k])
-                : doc_holder[k];
+                : doc_holder[v._foreign_doc];
         }
         return v;
     });
@@ -505,8 +505,11 @@ const findObject = async (builder, config) => {
                     Scoped.PendingDbReadCollective[processAccessId] = [];
                 }
 
-                const staleData = await getRecordData();
-                if (retrieval.startsWith('sticky') && staleData) {
+                let staleData;
+                if (
+                    retrieval.startsWith('sticky') &&
+                    (staleData = await getRecordData())
+                ) {
                     finalize(staleData);
                     if (retrieval !== RETRIEVAL.STICKY_RELOAD) return;
                 }

package/src/products/http_callable/accessor.js

@@ -6,16 +6,16 @@ import { incrementFetcherSize } from "./counter";
 
 export const insertFetchResources = async (projectUrl, access_id, value) => {
     value = cloneDeep(value);
-    const data = serialize(value).toString('base64');
+    const dataSize = serialize(value).byteLength;
 
     if (!CacheStore.FetchedStore[projectUrl])
         CacheStore.FetchedStore[projectUrl] = {};
     const b4 = CacheStore.FetchedStore[projectUrl][access_id];
-    incrementFetcherSize(projectUrl, data.length - (b4?.size || 0));
+    incrementFetcherSize(projectUrl, dataSize - (b4?.size || 0));
     CacheStore.FetchedStore[projectUrl][access_id] = {
         touched: Date.now(),
         data: value,
-        size: data.length
+        size: dataSize
     };
 
     updateCacheStore(undefined, ['FetchedStore']);

package/src/products/http_callable/index.js

@@ -126,8 +126,11 @@ export const mfetch = async (input = '', init, config) => {
                     Scoped.PendingFetchCollective[processReqId] = [];
                 }
 
-                const reqData = await getFetchResources(projectUrl, reqId);
-                if (retrieval.startsWith('sticky') && reqData) {
+                let reqData;
+                if (
+                    retrieval.startsWith('sticky') &&
+                    (reqData = await getFetchResources(projectUrl, reqId))
+                ) {
                     resolveCache(reqData);
                     if (retrieval !== RETRIEVAL.STICKY_RELOAD) return;
                 }
@@ -144,6 +147,7 @@ export const mfetch = async (input = '', init, config) => {
 
             const f = await fetch(isLink ? input : `${projectUrl}/${normalizeRoute(input)}`, {
                 ...(!isBaseUrl || hasBody) ? { method: 'POST' } : {},
+                credentials: 'omit',
                 ...init,
                 ...uglified ? { body: reqBuilder } : encodeBody ? { body: serialize(body) } : {},
                 // cache: 'no-cache',
@@ -154,7 +158,9 @@ export const mfetch = async (input = '', init, config) => {
                         uglified,
                         'content-type': 'request/buffer',
                         ...initType ? { 'init-content-type': initType } : {}
-                    } : {},
+                    } : encodeBody
+                        ? { 'content-type': 'request/buffer', 'entity-encoded': '1' }
+                        : {},
                     ...(disableAuth || !mtoken || uglified || isBaseUrl) ? {} : { mtoken }
                 }
             });

package/src/products/storage/index.js

@@ -43,7 +43,7 @@ export class MTStorage {
                 return () => { };
             }
 
-            const { projectUrl, accessKey, uglify } = this.builder;
+            const { projectUrl, uglify, extraHeaders } = this.builder;
             xhr = new XMLHttpRequest();
 
             if (awaitServer) await awaitReachableServer(projectUrl);
@@ -51,7 +51,7 @@ export class MTStorage {
 
             xhr.open('POST', EngineApi._uploadFile(projectUrl, uglify), true);
             xhr.upload.addEventListener('progress', e => {
-                onProgress?.({ sentBtyes: e.loaded, totalBytes: e.total });
+                onProgress?.({ sentBytes: e.loaded, totalBytes: e.total });
             });
             xhr.addEventListener('load', () => {
                 if (hasFinished || hasCancelled) return;
@@ -75,12 +75,17 @@ export class MTStorage {
                 hasFinished = true;
                 onComplete?.({ error: 'upload_aborted', message: 'The upload process was aborted' });
             });
-            xhr.setRequestHeader('Accept', 'application/json');
+
+            Object.entries(extraHeaders || {}).forEach(([k, v]) => {
+                xhr.setRequestHeader(k, v);
+            });
+
             xhr.setRequestHeader('Content-Type', 'buffer/upload');
             if (Scoped.AuthJWTToken[projectUrl])
                 xhr.setRequestHeader('Mosquito-Token', Scoped.AuthJWTToken[projectUrl]);
             if (createHash) xhr.setRequestHeader('hash-upload', 'yes');
             xhr.setRequestHeader('Mosquito-Destination', destination);
+            xhr.withCredentials = false;
             xhr.send(fileStream || buffer);
         })();