wingbot-mongodb 3.2.6-alpha.1 → 4.0.0-alpha.1

package/.nyc_output/processinfo/{1091dc07-773b-48f1-9817-b8048f05d575.json → c5005d32-ad45-472c-811c-860ccef899fe.json}

@@ -1 +1 @@
-{"parent":null,"pid":38479,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1692102034748,"ppid":38478,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/1091dc07-773b-48f1-9817-b8048f05d575.json","externalId":"","uuid":"1091dc07-773b-48f1-9817-b8048f05d575","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"]}
+{"parent":null,"pid":94202,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1695123947917,"ppid":94201,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/c5005d32-ad45-472c-811c-860ccef899fe.json","externalId":"","uuid":"c5005d32-ad45-472c-811c-860ccef899fe","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":{"1091dc07-773b-48f1-9817-b8048f05d575":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["1091dc07-773b-48f1-9817-b8048f05d575"]},"externalIds":{}}
+{"processes":{"c5005d32-ad45-472c-811c-860ccef899fe":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["c5005d32-ad45-472c-811c-860ccef899fe"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "3.2.6-alpha.1",
+  "version": "4.0.0-alpha.1",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {
@@ -27,7 +27,7 @@
   "author": "wingbot.ai",
   "license": "MIT",
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "bugs": {
     "url": "https://github.com/wingbotai/wingbot-mongodb/issues"
@@ -45,12 +45,12 @@
     "jsdoc-to-markdown": "^7.1.1",
     "jsdoc-tsimport-plugin": "^1.0.5",
     "mocha": "^10.1.0",
-    "mongodb": "^4.12.1",
+    "mongodb": "^6.1.0",
     "nyc": "^15.1.0",
     "wingbot": "^3.46.3"
   },
   "peerDependencies": {
-    "mongodb": "^4.0.0"
+    "mongodb": "^6.0.0"
   },
   "optionalDependencies": {
     "wingbot": "^3.0.0"

package/src/BaseStorage.js

@@ -4,6 +4,7 @@
 'use strict';
 
 const { ObjectId } = require('mongodb');
+const { default: assert } = require('assert');
 const crypto = require('crypto');
 const defaultLogger = require('./defaultLogger');
 
@@ -130,6 +131,9 @@ class BaseStorage {
                 }
             });
         }
+
+        this._indexing = null;
+        this._shouldIndexBeforeRead = null;
     }
 
     /**
@@ -178,7 +182,7 @@ class BaseStorage {
     /**
      * Insert defalt document to DB
      *
-     * @param  {...any} objects
+     * @param  {...{ _id: string|number|ObjectId }} objects
      */
     addFixtureDoc (...objects) {
         this._fixtures.push(...objects);
@@ -256,7 +260,17 @@ class BaseStorage {
             collection = db.collection(name);
         }
 
-        await this._ensureIndexes(this._indexes, collection);
+        this._shouldIndexBeforeRead = this._fixtures.length !== 0;
+
+        this._indexing = this._ensureIndexes(this._indexes, collection)
+            .then(() => {
+                this._indexing = false;
+            })
+            .catch((e) => {
+                this._collection = null;
+                this._log.log(`DB.${this._collectionName} - init failed`, e);
+                return e;
+            });
 
         return collection;
     }
@@ -265,9 +279,10 @@ class BaseStorage {
      * Returns the collection to operate with
      *
      * @protected
+     * @param {boolean} [forRead]
      * @returns {Promise<Collection>}
      */
-    async _getCollection () {
+    async _getCollection (forRead = false) {
         if (this._collection === null) {
             let c;
             try {
@@ -280,6 +295,13 @@ class BaseStorage {
                 throw e;
             }
         }
+
+        if (this._indexing && (!forRead || this._shouldIndexBeforeRead)) {
+            const err = await this._indexing;
+            this._indexing = false;
+            if (err) throw err;
+        }
+
         return this._collection;
     }
 
@@ -290,12 +312,10 @@ class BaseStorage {
      * @returns {Promise}
      */
     async _ensureIndexes (indexes, collection) {
-        let existing;
-        try {
-            existing = await collection.indexes();
-        } catch (e) {
-            existing = [];
-        }
+        const [existing, fixtures] = await Promise.all([
+            this._checkExistingIndexes(collection),
+            this._checkFixtures(collection)
+        ]);
 
         await existing
             .filter((e) => !this.systemIndexes.includes(e.name)
@@ -309,7 +329,7 @@ class BaseStorage {
                     });
             }, Promise.resolve());
 
-        let updated = await indexes
+        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}`);
@@ -324,31 +344,7 @@ class BaseStorage {
                     .then(() => true);
             }, Promise.resolve(false));
 
-        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()));
-            }
-        }
-
-        if (!updated || fixtures.length === 0) {
+        if (fixtures.length === 0) {
             return;
         }
 
@@ -367,6 +363,45 @@ class BaseStorage {
         );
     }
 
+    async _checkExistingIndexes (collection) {
+        let existing;
+        try {
+            existing = await collection.indexes();
+        } catch (e) {
+            existing = [];
+        }
+        return existing;
+    }
+
+    async _checkFixtures (collection) {
+        if (this._fixtures.length === 0) {
+            return this._fixtures;
+        }
+
+        const fixtures = this._fixtures
+            .map((f) => {
+                assert(f._id, `DB.${this._collectionName} fixture must have _id property`);
+                return {
+                    ...f,
+                    _id: this._id(f._id)
+                };
+            });
+
+        const $in = fixtures.map((f) => f._id);
+
+        const found = await collection
+            .find({ _id: { $in } })
+            .project({ _id: 1 })
+            .map((doc) => doc._id.toString())
+            .toArray();
+
+        if (found.length === $in.length) {
+            return [];
+        }
+
+        return fixtures.filter((f) => !found.includes(f._id.toString()));
+    }
+
     /**
      *
      * @template T

package/src/BotTokenStorage.js

@@ -134,9 +134,6 @@ class BotTokenStorage {
             returnDocument: 'after'
         });
 
-        // @ts-ignore
-        res = res.value;
-
         // @ts-ignore
         if (res.token === temporaryInsecureToken) {
 

package/src/NotificationsStorage.js

@@ -403,8 +403,8 @@ class NotificationsStorage {
                 sort: { enqueue: 1 },
                 returnDocument: 'after'
             });
-            if (found.value) {
-                pop.push(this._mapGenericObject(found.value));
+            if (found) {
+                pop.push(this._mapGenericObject(found));
                 go = pop.length < limit;
             } else {
                 go = false;
@@ -498,7 +498,7 @@ class NotificationsStorage {
             returnDocument: 'after'
         });
 
-        return this._mapGenericObject(res.value);
+        return this._mapGenericObject(res);
     }
 
     /**
@@ -590,7 +590,7 @@ class NotificationsStorage {
         );
 
         return result
-            .map((res) => (res.value ? this._mapGenericObject(res.value) : null))
+            .map((res) => (res ? this._mapGenericObject(res) : null))
             .filter((r) => r !== null);
     }
 
@@ -624,7 +624,7 @@ class NotificationsStorage {
                 upsert: true,
                 returnDocument: 'after'
             });
-            ret = this._mapCampaign(res.value);
+            ret = this._mapCampaign(res);
         } else {
             const id = new ObjectId();
             ret = { id: id.toHexString(), _id: id, ...campaign };
@@ -684,7 +684,7 @@ class NotificationsStorage {
             returnDocument: 'after'
         });
 
-        return this._mapCampaign(res.value);
+        return this._mapCampaign(res);
     }
 
     /**
@@ -704,7 +704,7 @@ class NotificationsStorage {
             returnDocument: 'before'
         });
 
-        return this._mapCampaign(res.value);
+        return this._mapCampaign(res);
     }
 
     /**
@@ -845,9 +845,9 @@ class NotificationsStorage {
                 returnDocument: 'after'
             });
 
-            if (res.value) {
+            if (res) {
                 ret.push(tag);
-                removeWholeSubscribtion = res.value.subs.length === 0;
+                removeWholeSubscribtion = res.subs.length === 0;
             } else {
                 return [];
             }
@@ -855,8 +855,8 @@ class NotificationsStorage {
 
         if (removeWholeSubscribtion) {
             const res = await c.findOneAndDelete({ pageId, senderId });
-            if (res.value) {
-                ret.push(...res.value.subs);
+            if (res) {
+                ret.push(...res.subs);
             }
         }
 

package/src/StateStorage.js

@@ -137,7 +137,7 @@ class StateStorage extends BaseStorage {
             }
         }));
 
-        if (this._uniqueIndexFailed && !res.value.lastInteraction) {
+        if (this._uniqueIndexFailed && !res.lastInteraction) {
             // check if there was a locked state
             const existing = await c.find({
                 senderId,
@@ -155,7 +155,7 @@ class StateStorage extends BaseStorage {
 
                 const logLevel = this.logCollisionsAsErrors ? 'error' : 'log';
                 this._log[logLevel]('StateStorage: unique index workaround DETECTED', {
-                    v: res.value, existing, $in: $in.map((i) => i.toString())
+                    v: res, existing, $in: $in.map((i) => i.toString())
                 });
 
                 if ($in.length > 0) {
@@ -164,11 +164,11 @@ class StateStorage extends BaseStorage {
 
                 throw Object.assign(new Error('State was locked'), { code: 11000 });
             } else {
-                this._log.log('StateStorage: unique index workaround OK', res.value);
+                this._log.log('StateStorage: unique index workaround OK', res);
             }
         }
 
-        return res.value;
+        return res;
     }
 
     /**