react-native-mosquito-transport 0.0.37 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mosquito-transport",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "React native javascript sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/products/database/accessor.js

@@ -18,7 +18,7 @@ export const listenQueryEntry = (callback, { accessId, builder, config, processI
     const { projectUrl, dbName, dbUrl, path } = builder;
     const { episode = 0 } = config || {};
 
-    const nodeID = `${projectUrl}${dbName}${dbUrl}${path}`;
+    const nodeID = `${projectUrl}_${dbName}_${dbUrl}_${path}`;
 
     if (!Scoped.ActiveDatabaseListeners[nodeID])
         Scoped.ActiveDatabaseListeners[nodeID] = {};
@@ -713,7 +713,7 @@ export const removePendingWrite = async (builder, writeId, revert) => {
     const pendingData = grab(CacheStore.PendingWrites, [projectUrl, writeId]);
     if (!pendingData) return;
 
-    const pathChanges = revert ? revertChanges(builder, pendingData.editions) : [];
+    const pathChanges = revert ? await revertChanges(builder, pendingData.editions) : [];
 
     unpoke(CacheStore.PendingWrites, [projectUrl, writeId]);
     updateCacheStore(['PendingWrites', 'DatabaseStore', 'DatabaseStats']);
@@ -787,7 +787,7 @@ const notifyDatabaseNodeChanges = (builder, changedCollections = []) => {
     const { projectUrl, dbName, dbUrl } = builder;
 
     changedCollections.forEach(path => {
-        const nodeID = `${projectUrl}${dbName}${dbUrl}${path}`;
+        const nodeID = `${projectUrl}_${dbName}_${dbUrl}_${path}`;
         Object.entries(Scoped.ActiveDatabaseListeners[nodeID] || {})
             .sort((a, b) => a[1] - b[1])
             .forEach(([processId]) => {

package/src/products/database/index.js

@@ -721,43 +721,47 @@ const commitData = async (builder, value, type, config) => {
     return (await sendValue());
 };
 
-export const trySendPendingWrite = (projectUrl) => {
+export const trySendPendingWrite = async (projectUrl) => {
     if (Scoped.dispatchingWritesPromise[projectUrl]) return;
 
+    let resolveCallback;
     Scoped.dispatchingWritesPromise[projectUrl] = new Promise(async resolve => {
-        const sortedWrite = Object.entries(CacheStore.PendingWrites[projectUrl] || {})
-            .filter(([k]) => !Scoped.OutgoingWrites[k])
-            .sort((a, b) => a[1].addedOn - b[1].addedOn);
-        let resolveCounts = 0;
-
-        for (const [writeId, { snapshot, builder, attempts = 1 }] of sortedWrite) {
-            try {
-                await commitData(
-                    { ...Scoped.InitializedProject[projectUrl], ...builder, find: deserializeBSON(builder.find, true)._ },
-                    deserializeBSON(snapshot.value, true)._,
-                    snapshot.type,
-                    { ...snapshot.config, delivery: DELIVERY.NO_CACHE_NO_AWAIT }
-                );
+        resolveCallback = resolve;
+    });
+
+    const sortedWrite = Object.entries(CacheStore.PendingWrites[projectUrl] || {})
+        .filter(([k]) => !Scoped.OutgoingWrites[k])
+        .sort((a, b) => a[1].addedOn - b[1].addedOn);
+    let resolveCounts = 0;
 
+    for (const [writeId, { snapshot, builder, attempts = 1 }] of sortedWrite) {
+        try {
+            await commitData(
+                { ...Scoped.InitializedProject[projectUrl], ...builder, find: deserializeBSON(builder.find, true)._ },
+                deserializeBSON(snapshot.value, true)._,
+                snapshot.type,
+                { ...snapshot.config, delivery: DELIVERY.NO_CACHE_NO_AWAIT }
+            );
+
+            delete CacheStore.PendingWrites[projectUrl][writeId];
+            ++resolveCounts;
+        } catch (err) {
+            const { maxRetries } = builder;
+            if (err?.ack || !maxRetries || attempts >= maxRetries) {
                 delete CacheStore.PendingWrites[projectUrl][writeId];
                 ++resolveCounts;
-            } catch (err) {
-                const { maxRetries } = builder;
-                if (err?.ack || !maxRetries || attempts >= maxRetries) {
-                    delete CacheStore.PendingWrites[projectUrl][writeId];
-                    ++resolveCounts;
-                } else if (CacheStore.PendingWrites[projectUrl]?.[writeId]) {
-                    CacheStore.PendingWrites[projectUrl][writeId].attempts = attempts + 1;
-                }
+            } else if (CacheStore.PendingWrites[projectUrl]?.[writeId]) {
+                CacheStore.PendingWrites[projectUrl][writeId].attempts = attempts + 1;
             }
         }
-        resolve();
-        Scoped.dispatchingWritesPromise[projectUrl] = undefined;
-        updateCacheStore(['PendingWrites']);
-
-        if (
-            (sortedWrite.length - resolveCounts) &&
-            await getReachableServer(projectUrl)
-        ) trySendPendingWrite(projectUrl);
-    });
+    }
+    resolveCallback();
+    if (Scoped.dispatchingWritesPromise[projectUrl])
+        delete Scoped.dispatchingWritesPromise[projectUrl];
+    updateCacheStore(['PendingWrites']);
+
+    if (
+        (sortedWrite.length - resolveCounts) &&
+        await getReachableServer(projectUrl)
+    ) trySendPendingWrite(projectUrl);
 };