wingbot-mongodb 3.2.1 → 3.2.3

package/.nyc_output/processinfo/8db620e2-5deb-4db5-b239-32d4e6eb824a.json

@@ -0,0 +1 @@
+{"parent":null,"pid":4692,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1681800952490,"ppid":4686,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/8db620e2-5deb-4db5-b239-32d4e6eb824a.json","externalId":"","uuid":"8db620e2-5deb-4db5-b239-32d4e6eb824a","files":["/Users/david/Development/wingbot-mongodb/src/BaseStorage.js","/Users/david/Development/wingbot-mongodb/src/defaultLogger.js","/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js","/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js","/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js","/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js","/Users/david/Development/wingbot-mongodb/src/tokenFactory.js","/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js","/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js","/Users/david/Development/wingbot-mongodb/src/StateStorage.js"]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"6a7ed916-683a-43fd-8624-795a77e80a4a":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["6a7ed916-683a-43fd-8624-795a77e80a4a"]},"externalIds":{}}
+{"processes":{"8db620e2-5deb-4db5-b239-32d4e6eb824a":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {

package/src/BaseStorage.js

@@ -270,6 +270,12 @@ class BaseStorage {
         return this._collection;
     }
 
+    /**
+     *
+     * @param {object[]} indexes
+     * @param {Collection} collection
+     * @returns {Promise}
+     */
     async _ensureIndexes (indexes, collection) {
         let existing;
         try {
@@ -290,7 +296,7 @@ class BaseStorage {
                     });
             }, Promise.resolve());
 
-        const updated = await indexes
+        let updated = await indexes
             .filter((i) => !existing.some((e) => e.name === i.options.name))
             .reduce((p, i) => {
                 this._log.log(`DB.${this._collectionName} creating index ${i.options.name}`);
@@ -302,21 +308,46 @@ class BaseStorage {
                     .then(() => true);
             }, Promise.resolve(false));
 
-        if (updated || existing.every((i) => this.systemIndexes.includes(i.name))) {
-            // upsert fixtures
+        if (!updated) {
+            updated = existing.every((i) => this.systemIndexes.includes(i.name));
+        }
+
+        let fixtures = this._fixtures;
+
+        const $in = fixtures
+            .map((f) => f._id)
+            .filter((f) => !!f);
+
+        if (!updated && $in.length !== 0) {
+            const found = await collection
+                .find({ _id: { $in } })
+                .project({ _id: 1 })
+                .map((doc) => doc._id.toString())
+                .toArray();
+
+            if (found.length !== $in.length) {
+                updated = true;
+                fixtures = fixtures
+                    .filter((f) => !f._id || !found.includes(f._id.toString()));
+            }
 
-            await this._fixtures.reduce(
-                (p, o) => p
-                    .then(() => collection.insertOne(o))
-                    .then(() => this._log.log(`DB.${this._collectionName} Inserted fixture doc to "${this._collectionName}"`))
-                    .catch((e) => {
-                        if (e.code !== 11000) {
-                            this._log.error(`DB.${this._collectionName} failed to insert fixture doc to "${this._collectionName}"`, e);
-                        }
-                    }),
-                Promise.resolve()
-            );
         }
+
+        if (!updated || fixtures.length === 0) {
+            return;
+        }
+
+        await fixtures.reduce(
+            (p, o) => p
+                .then(() => collection.insertOne(o))
+                .then(() => this._log.log(`DB.${this._collectionName} Inserted fixture doc to "${this._collectionName}"`))
+                .catch((e) => {
+                    if (e.code !== 11000) {
+                        this._log.error(`DB.${this._collectionName} failed to insert fixture doc to "${this._collectionName}"`, e);
+                    }
+                }),
+            Promise.resolve()
+        );
     }
 
     /**

package/src/NotificationsStorage.js

@@ -303,13 +303,14 @@ class NotificationsStorage {
 
         const findMissingIds = tasks
             .reduce((arr, {
-                campaignId, senderId, pageId, sent
+                campaignId, senderId, pageId, sent, enqueue
             }, i) => {
                 if (typeof res.upsertedIds[i] !== 'undefined') {
                     return arr;
                 }
                 arr.push({
                     i,
+                    enqueue,
                     filter: {
                         campaignId, senderId, pageId, sent
                     }
@@ -321,23 +322,31 @@ class NotificationsStorage {
 
         if (findMissingIds.length > 0) {
             await Promise.all(findMissingIds
-                .map(({ filter, i }) => c.findOne(filter, {
+                .map(({ filter, i, enqueue }) => c.findOne(filter, {
                     projection: {
                         _id: 1, insEnqueue: 1, enqueue: 1, ups: 1
                     }
                 })
                     .then((found) => {
-                        const id = typeof found._id === 'string'
-                            ? found._id
-                            : found._id.toHexString();
-                        missingIds.set(i, {
-                            id,
-                            insEnqueue: found.insEnqueue,
-                            enqueue: found.insEnqueue === found.enqueue
-                                && found.enqueue !== MAX_TS && found.ups !== 1
-                                ? found.enqueue + 1
-                                : found.enqueue
-                        });
+                        if (!found) { // race condition occurred
+                            missingIds.set(i, {
+                                id: null,
+                                insEnqueue: -1,
+                                enqueue
+                            });
+                        } else {
+                            const id = typeof found._id === 'string'
+                                ? found._id
+                                : found._id.toHexString();
+                            missingIds.set(i, {
+                                id,
+                                insEnqueue: found.insEnqueue,
+                                enqueue: found.insEnqueue === found.enqueue
+                                    && found.enqueue !== MAX_TS && found.ups !== 1
+                                    ? found.enqueue + 1
+                                    : found.enqueue
+                            });
+                        }
                     })));
         }