react-native-mosquito-transport 0.0.17 → 0.0.19

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/example/ios/MosquitodbExample.xcodeproj/project.pbxproj

@@ -354,7 +354,6 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-MosquitodbExample/Pods-MosquitodbExample-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -501,7 +500,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MosquitodbExample;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.3;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -526,7 +525,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = MosquitodbExample;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.3;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
@@ -564,7 +563,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -598,6 +597,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -635,7 +635,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -661,6 +661,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

package/example/ios/MosquitodbExample.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:MosquitodbExample.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

package/example/ios/MosquitodbExample.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/example/ios/MosquitodbExample.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>

package/example/ios/MosquitodbExample.xcworkspace/xcuserdata/anthony.xcuserdatad/WorkspaceSettings.xcsettings

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildLocationStyle</key>
+	<string>UseAppPreferences</string>
+	<key>CustomBuildLocationType</key>
+	<string>RelativeToDerivedData</string>
+	<key>DerivedDataLocationStyle</key>
+	<string>Default</string>
+	<key>ShowSharedSchemesAutomaticallyEnabled</key>
+	<true/>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/deflexable/mosquito-transport)",
   "main": "src/index.js",
   "scripts": {
@@ -15,7 +15,6 @@
     "javascript",
     "selfhosted",
     "serverless",
-    "Baas",
     "database",
     "react-native",
     "mongodb"
@@ -32,7 +31,7 @@
     "buffer": "^6.0.3",
     "crypto-js": "^4.2.0",
     "fast-json-stable-stringify": "^2.1.0",
-    "guard-object": "^1.0.6",
+    "guard-object": "^1.0.9",
     "json-buffer": "^3.0.1",
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",
@@ -44,7 +43,8 @@
     "subscription-listener": "^1.1.2",
     "tweetnacl": "^1.0.3"
   },
-  "engines": {
-    "node": ">= 16.0.0"
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*"
   }
-}
+}

package/src/index.js

@@ -6,7 +6,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";
@@ -48,40 +48,42 @@ class RNMT {
             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]}`, {
+                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]}`, {
-                    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/accessor.js

@@ -36,8 +36,9 @@ export const insertRecord = async (builder, accessId, query, value) => {
         kaf = `${objToUniqueString(extraction || {})},${(excludeFields || []).join(',')},${(returnOnly || []).join(',')}`,
         colData = getLodash(CacheStore.DatabaseStore, [projectUrl, dbUrl, dbName, path, 'data', kaf], []);
 
+    // TODO:
     (Array.isArray(value) ? value : [value]).forEach(e => {
-        const b4DocIndex = colData.findIndex(v => v._id === e._id);
+        const b4DocIndex = colData.findIndex(v => v?._id === e?._id);
         if (b4DocIndex === -1) {
             colData.push(e);
         } else colData[b4DocIndex] = e;

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);
@@ -150,7 +150,7 @@ const listenDocument = (callback, onError, builder, config) => {
         const mtoken = disableAuth ? undefined : Scoped.AuthJWTToken[projectUrl],
             authObj = {
                 commands: {
-                    config,
+                    config: stripRequestConfig(config),
                     path,
                     find: findOne || find,
                     sort,
@@ -368,6 +368,14 @@ const countCollection = async (builder, config) => {
     return g;
 }
 
+const stripRequestConfig = (config) => {
+    const known_fields = ['extraction', 'returnOnly', 'excludeFields'];
+    const requestConfig = Object.entries({ ...config }).map(([k, v]) =>
+        known_fields.includes(k) ? [k, v] : null
+    ).filter(v => v);
+    return requestConfig.length ? Object.fromEntries(requestConfig) : undefined;
+}
+
 const findObject = async (builder, config) => {
     const { projectUrl, serverE2E_PublicKey, dbUrl, dbName, accessKey, maxRetries = 7, path, disableCache, uglify, command } = builder,
         { find, findOne, sort, direction, limit, random } = command,
@@ -445,7 +453,15 @@ const findObject = async (builder, config) => {
 
             const [reqBuilder, [privateKey]] = buildFetchInterface({
                 body: {
-                    commands: { config, path, find: findOne || find, sort, direction, limit, random },
+                    commands: {
+                        config: stripRequestConfig(config),
+                        path,
+                        find: findOne || find,
+                        sort,
+                        direction,
+                        limit,
+                        random
+                    },
                     dbName,
                     dbUrl
                 },