mosquito-transport-js 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/helpers/broadcaster.js

@@ -32,10 +32,8 @@ broadcaster.onmessage = async (e) => {
         };
         result.value = deserializeBSON(result.value, false)._;
 
-        console.log('newBuilder:', newBuilder, ' result:', result);
         const { editions, pathChanges } = await syncCache(newBuilder, result);
         Scoped.broadcastedWrites[writeId] = { editions, builder: newBuilder };
-        console.log('pathChanges:', pathChanges);
         notifyDatabaseNodeChanges(newBuilder, pathChanges);
     } else if (kind === 'database-revert') {
         // only if cache protocol is in-memory

package/src/index.d.ts

@@ -1,3 +1,5 @@
+import { BSON } from "bson";
+
 interface MTConfig {
     dbName?: string;
     dbUrl?: string;
@@ -75,6 +77,8 @@ export class DoNotEncrypt {
     value: any;
 }
 
+export { BSON }
+
 interface auth_provider_id {
     GOOGLE: 'google';
     FACEBOOK: 'facebook';

package/src/index.js

@@ -15,6 +15,7 @@ import sendMessage from "./helpers/broadcaster";
 import cloneDeep from 'lodash/cloneDeep';
 import { Buffer } from 'buffer';
 import MTAuth, { purgePendingToken } from './products/auth';
+import { BSON } from "bson";
 
 const {
     _listenCollection,
@@ -527,5 +528,6 @@ export {
     DOCUMENT_EXTRACTION,
     FIND_GEO_JSON,
     GEO_JSON,
-    AUTH_PROVIDER_ID
+    AUTH_PROVIDER_ID,
+    BSON
 };

package/src/products/database/accessor.js

@@ -19,7 +19,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] = {};
@@ -794,7 +794,7 @@ export 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);
 };