wingbot-mongodb 2.22.0-alpha.6 → 2.22.0

package/.nyc_output/processinfo/{81c4e49f-c93d-4e44-b749-eec4d22cfcf1.json → 0d879467-0e5f-4098-bea4-73c520af6dcd.json}

@@ -1 +1 @@
-{"parent":null,"pid":85364,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1651496192378,"ppid":85363,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/81c4e49f-c93d-4e44-b749-eec4d22cfcf1.json","externalId":"","uuid":"81c4e49f-c93d-4e44-b749-eec4d22cfcf1","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":17347,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1669369533432,"ppid":17346,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/0d879467-0e5f-4098-bea4-73c520af6dcd.json","externalId":"","uuid":"0d879467-0e5f-4098-bea4-73c520af6dcd","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":{"81c4e49f-c93d-4e44-b749-eec4d22cfcf1":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["81c4e49f-c93d-4e44-b749-eec4d22cfcf1"]},"externalIds":{}}
+{"processes":{"0d879467-0e5f-4098-bea4-73c520af6dcd":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["0d879467-0e5f-4098-bea4-73c520af6dcd"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "2.22.0-alpha.6",
+  "version": "2.22.0",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {
@@ -45,12 +45,12 @@
     "jsdoc-to-markdown": "^7.1.1",
     "jsdoc-tsimport-plugin": "^1.0.5",
     "mocha": "^9.2.2",
-    "mongodb": "^4.5.0",
+    "mongodb": "^3.7.3",
     "nyc": "^15.1.0",
-    "wingbot": "^3.30.2"
+    "wingbot": "^3.34.0"
   },
   "peerDependencies": {
-    "mongodb": "^4.0.0"
+    "mongodb": "^3.0.0"
   },
   "optionalDependencies": {
     "wingbot": "^3.0.0"

package/src/AttachmentCache.js

@@ -3,8 +3,7 @@
  */
 'use strict';
 
-/** @typedef {import('mongodb').Db} Db */
-/** @typedef {import('mongodb').Collection} Collection */
+const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 
 /**
  * Cache storage for Facebook attachments
@@ -15,7 +14,7 @@ class AttachmentCache {
 
     /**
      *
-     * @param {Db|{():Promise<Db>}} mongoDb
+     * @param {mongodb.Db|{():Promise<mongodb.Db>}} mongoDb
      * @param {string} collectionName
      */
     constructor (mongoDb, collectionName = 'attachments') {
@@ -23,13 +22,13 @@ class AttachmentCache {
         this._collectionName = collectionName;
 
         /**
-         * @type {Collection}
+         * @type {mongodb.Collection}
          */
         this._collection = null;
     }
 
     /**
-     * @returns {Promise<Collection>}
+     * @returns {Promise<mongodb.Collection>}
      */
     async _getCollection () {
         if (this._collection === null) {

package/src/AuditLogStorage.js

@@ -5,7 +5,8 @@
 
 const jsonwebtoken = require('jsonwebtoken');
 const BaseStorage = require('./BaseStorage');
-const defaultLogger = require('./defaultLogger');
+
+/** @typedef {import('mongodb/lib/db')} Db */
 
 const LEVEL_CRITICAL = 'Critical';
 const LEVEL_IMPORTANT = 'Important';
@@ -90,9 +91,6 @@ const TYPE_INFO = 'Info';
  * @returns {Promise}
  */
 
-/** @typedef {import('mongodb').Db} Db */
-/** @typedef {import('mongodb').Collection} Collection */
-
 /**
  * Storage for audit logs with signatures chain
  */
@@ -107,7 +105,7 @@ class AuditLogStorage extends BaseStorage {
      * @param {string|Promise<string>} [secret]
      * @param {string|Promise<string>} [jwtVerifier]
      */
-    constructor (mongoDb, collectionName = 'auditlog', log = defaultLogger, isCosmo = false, secret = null, jwtVerifier = null) {
+    constructor (mongoDb, collectionName = 'auditlog', log = console, isCosmo = false, secret = null, jwtVerifier = null) {
         super(mongoDb, collectionName, log, isCosmo);
 
         this.addIndex({

package/src/BaseStorage.js

@@ -3,33 +3,11 @@
  */
 'use strict';
 
-const { ObjectId } = require('mongodb');
+const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const crypto = require('crypto');
-const defaultLogger = require('./defaultLogger');
 
-/** @typedef {import('mongodb').Db} Db */
-/** @typedef {import('mongodb').Collection} Collection */
-/** @typedef {import('mongodb').CreateIndexesOptions} CreateIndexesOptions */
-
-/**
- *
- * @param {any} obj
- * @param {boolean} nested
- * @param {string} [attr]
- * @param {object} [ret]
- * @returns {object}
- */
-function getNestedObjects (obj, nested, attr = null, ret = {}) {
-    if (typeof obj !== 'object' || !obj || nested === null || Array.isArray(obj)) {
-        Object.assign(ret, { [attr]: obj === undefined ? null : obj });
-    } else {
-        Object.entries(obj)
-            .forEach(([key, val]) => {
-                getNestedObjects(val, nested || null, attr ? `${attr}.${key}` : key, ret);
-            });
-    }
-    return ret;
-}
+/** @typedef {import('mongodb/lib/db')} Db */
+/** @typedef {import('mongodb/lib/collection')} Collection */
 
 class BaseStorage {
 
@@ -45,7 +23,7 @@ class BaseStorage {
      *
      * class MyCoolDataStorage extends BaseStorage {
      *
-     *     constructor (mongoDb, collectionName, log = undefined, isCosmo = false) {
+     *     constructor (mongoDb, collectionName = 'myCoolData', log = console, isCosmo = false) {
      *          super(mongoDb, collectionName, log, isCosmo);
      *
      *          this.addIndex({
@@ -64,7 +42,7 @@ class BaseStorage {
      *
      * }
      */
-    constructor (mongoDb, collectionName, log = defaultLogger, isCosmo = false) {
+    constructor (mongoDb, collectionName, log = console, isCosmo = false) {
         this._mongoDb = mongoDb;
         this._collectionName = collectionName;
         this._isCosmo = isCosmo;
@@ -83,6 +61,21 @@ class BaseStorage {
         this.systemIndexes = ['_id_', '_id'];
 
         this._fixtures = [];
+
+        if (isCosmo && !process.argv.some((a) => a.endsWith('mocha'))) {
+            process.nextTick(() => {
+                const hasUniqueIndex = this._indexes.some((i) => i.options.unique);
+
+                if (hasUniqueIndex) {
+                    this._getCollection()
+                        .catch((e) => log.error(`DB.${this._collectionName} index pre-heat FAILED`, e));
+                }
+            });
+        }
+    }
+
+    preHeat () {
+        return this._getCollection();
     }
 
     /**
@@ -98,7 +91,7 @@ class BaseStorage {
      * Add custom indexing rule
      *
      * @param {object} index
-     * @param {CreateIndexesOptions} options
+     * @param {mongodb.IndexOptions} options
      */
     addIndex (index, options) {
         if (!options.name) {
@@ -110,36 +103,6 @@ class BaseStorage {
         });
     }
 
-    /**
-     * @example
-     * {
-     *   _id: ObjectId.isValid(id) ? new ObjectId(input) : input
-     * }
-     *
-     * @protected
-     * @param {string} id
-     * @returns {string|ObjectId}
-     */
-    _id (id) {
-        return ObjectId.isValid(id) && `${id}`.length === 24
-            ? new ObjectId(id)
-            : id;
-    }
-
-    /**
-     *
-     * @param {string|null} attr
-     * @param {{[key: string]: any}} obj
-     * @param {boolean} [nested]
-     * @returns {{[key: string]: any}}
-     */
-    _expandObjectToSet (attr, obj, nested = false) {
-        if (Object.keys(obj).length === 0) {
-            return null;
-        }
-        return getNestedObjects(obj, nested, attr);
-    }
-
     async _getOrCreateCollection (name) {
         const db = typeof this._mongoDb === 'function'
             ? await this._mongoDb()
@@ -261,7 +224,7 @@ class BaseStorage {
 
     /**
      *
-     * @protected
+     * @private
      * @template T
      * @param {T} object
      * @returns {T}

package/src/BotConfigStorage.js

@@ -11,8 +11,8 @@ try {
     // noop
 }
 
-/** @typedef {import('mongodb').Db} Db */
-/** @typedef {import('mongodb').Collection} Collection */
+/** @typedef {import('mongodb/lib/db')} Db */
+/** @typedef {import('mongodb/lib/collection')} Collection */
 
 const CONFIG_ID = 'config';
 

package/src/BotTokenStorage.js

@@ -3,6 +3,7 @@
 */
 'use strict';
 
+const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const tokenFactory = require('./tokenFactory');
 
 const TOKEN_INDEX = 'token-index';
@@ -15,9 +16,6 @@ const USER_INDEX = 'user-page-index';
  * @prop {string} token
  */
 
-/** @typedef {import('mongodb').Db} Db */
-/** @typedef {import('mongodb').Collection} Collection */
-
 /**
  * Storage for webview tokens
  *
@@ -27,7 +25,7 @@ class BotTokenStorage {
 
     /**
      *
-     * @param {Db|{():Promise<Db>}} mongoDb
+     * @param {mongodb.Db|{():Promise<mongodb.Db>}} mongoDb
      * @param {string} collectionName
      */
     constructor (mongoDb, collectionName = 'tokens') {
@@ -35,13 +33,13 @@ class BotTokenStorage {
         this._collectionName = collectionName;
 
         /**
-         * @type {Collection}
+         * @type {mongodb.Collection}
          */
         this._collection = null;
     }
 
     /**
-     * @returns {Promise<Collection>}
+     * @returns {Promise<mongodb.Collection>}
      */
     async _getCollection () {
         if (this._collection === null) {
@@ -62,7 +60,8 @@ class BotTokenStorage {
                     token: 1
                 }, {
                     unique: true,
-                    name: TOKEN_INDEX
+                    name: TOKEN_INDEX,
+                    dropDups: true
                 });
             }
             try {
@@ -76,7 +75,8 @@ class BotTokenStorage {
                     pageId: 1
                 }, {
                     unique: true,
-                    name: USER_INDEX
+                    name: USER_INDEX,
+                    dropDups: true
                 });
             }
         }

package/src/ChatLogStorage.js

@@ -4,12 +4,11 @@
 'use strict';
 
 const BaseStorage = require('./BaseStorage');
-const defaultLogger = require('./defaultLogger');
 
 const PAGE_SENDER_TIMESTAMP = 'pageId_1_senderId_1_timestamp_-1';
 const TIMESTAMP = 'timestamp_1';
 
-/** @typedef {import('mongodb').Db} Db */
+/** @typedef {import('mongodb/lib/db')} Db */
 
 /**
  * Storage for conversation logs
@@ -26,7 +25,7 @@ class ChatLogStorage extends BaseStorage {
      * @param {boolean} [isCosmo]
      * @param {string|Promise<string>} [secret]
      */
-    constructor (mongoDb, collectionName = 'chatlogs', log = defaultLogger, isCosmo = false, secret = null) {
+    constructor (mongoDb, collectionName = 'chatlogs', log = console, isCosmo = false, secret = null) {
         super(mongoDb, collectionName, log, isCosmo);
 
         this.addIndex({

package/src/NotificationsStorage.js

@@ -4,9 +4,8 @@
 'use strict';
 
 const mongodb = require('mongodb');
-const defaultLogger = require('./defaultLogger');
 
-const { ObjectId } = mongodb;
+const { ObjectID } = mongodb;
 
 /**
  * @typedef Target {Object}
@@ -22,7 +21,7 @@ const { ObjectId } = mongodb;
  */
 
 /**
- * @typedef Campaign {object}
+ *  @typedef Campaign {object}
  * @prop {string} id
  * @prop {string} name
  *
@@ -85,7 +84,7 @@ class NotificationsStorage {
      * @param {{error:Function,log:Function}} [log] - console like logger
      * @param {boolean} isCosmo
      */
-    constructor (mongoDb, collectionsPrefix = '', log = defaultLogger, isCosmo = false) {
+    constructor (mongoDb, collectionsPrefix = '', log = console, isCosmo = false) {
         this._mongoDb = mongoDb;
 
         this.taksCollection = `${collectionsPrefix}notification-tasks`;
@@ -101,6 +100,17 @@ class NotificationsStorage {
          * @type {Map<string,Promise<mongodb.Collection>>}
          */
         this._collections = new Map();
+
+        if (isCosmo && !process.argv.some((a) => a.endsWith('mocha'))) {
+            process.nextTick(() => {
+                Promise.all([
+                    this._getCollection(this.taksCollection),
+                    this._getCollection(this.campaignsCollection),
+                    this._getCollection(this.subscribtionsCollection)
+                ])
+                    .catch((e) => log.error('DB.<NotificationsStorage> index pre-heat FAILED', e));
+            });
+        }
     }
 
     async _getOrCreateCollection (name) {
@@ -243,8 +253,7 @@ class NotificationsStorage {
                     if (i.isTextIndex) {
                         this._doesNotSupportTextIndex = true;
                     } else {
-                        this._log.error(`failed to create index ${i.options.name} on ${collection.collectionName}`);
-                        throw e;
+                        this._log.error(`failed to create index ${i.options.name} on ${collection.collectionName}`, e);
                     }
                 })));
     }
@@ -453,8 +462,8 @@ class NotificationsStorage {
         const c = await this._getCollection(this.taksCollection);
 
         const res = await c.findOne({
-            _id: ObjectId.isValid(taskId)
-                ? ObjectId.createFromHexString(taskId)
+            _id: ObjectID.isValid(taskId)
+                ? ObjectID.createFromHexString(taskId)
                 : taskId
         });
 
@@ -470,8 +479,8 @@ class NotificationsStorage {
         const c = await this._getCollection(this.taksCollection);
 
         const res = await c.findOneAndUpdate({
-            _id: ObjectId.isValid(taskId)
-                ? ObjectId.createFromHexString(taskId)
+            _id: ObjectID.isValid(taskId)
+                ? ObjectID.createFromHexString(taskId)
                 : taskId
         }, {
             $set: data
@@ -607,7 +616,7 @@ class NotificationsStorage {
             });
             ret = this._mapCampaign(res.value);
         } else {
-            const id = new ObjectId();
+            const id = new ObjectID();
             ret = { id: id.toHexString(), _id: id, ...campaign };
             if (updateCampaign) {
                 Object.assign(ret, updateCampaign);
@@ -740,7 +749,7 @@ class NotificationsStorage {
             useCondition = {
                 ...useCondition,
                 _id: {
-                    $lt: ObjectId.createFromHexString(key._id)
+                    $lt: ObjectID.createFromHexString(key._id)
                 }
             };
         }
@@ -899,7 +908,7 @@ class NotificationsStorage {
             condition = {
                 ...condition,
                 _id: {
-                    $gt: ObjectId.createFromHexString(key._id)
+                    $gt: ObjectID.createFromHexString(key._id)
                 }
             };
         }

package/src/StateStorage.js

@@ -3,12 +3,13 @@
 */
 'use strict';
 
+const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const BaseStorage = require('./BaseStorage');
-const defaultLogger = require('./defaultLogger');
 
 const USER_INDEX = 'senderId_1_pageId_1';
 const LAST_INTERACTION_INDEX = 'lastInteraction_1';
 const SEARCH = 'search-text';
+const NAME = 'name_1';
 
 /**
  * @typedef {object} State
@@ -22,8 +23,6 @@ const SEARCH = 'search-text';
  * @prop {string} [search]
  */
 
-/** @typedef {import('mongodb').Db} Db */
-
 /**
  * Storage for chat states
  *
@@ -33,24 +32,29 @@ class StateStorage extends BaseStorage {
 
     /**
      *
-     * @param {Db|{():Promise<Db>}} mongoDb
+     * @param {mongodb.Db|{():Promise<mongodb.Db>}} mongoDb
      * @param {string} collectionName
      * @param {{error:Function,log:Function}} [log] - console like logger
      * @param {boolean} isCosmo
      */
-    constructor (mongoDb, collectionName = 'states', log = defaultLogger, isCosmo = false) {
+    constructor (mongoDb, collectionName = 'states', log = console, isCosmo = false) {
         super(mongoDb, collectionName, log, isCosmo);
 
         this.addIndex(
             { senderId: 1, pageId: 1 },
-            { name: USER_INDEX, unique: true }
+            { name: USER_INDEX, unique: true, dropDups: true }
         );
         this.addIndex(
             { lastInteraction: isCosmo ? 1 : -1 },
             { name: LAST_INTERACTION_INDEX }
         );
 
-        if (!isCosmo) {
+        if (isCosmo) {
+            this.addIndex(
+                { name: 1 },
+                { name: NAME }
+            );
+        } else {
             this.addIndex(
                 { '$**': 'text' },
                 { name: SEARCH }
@@ -79,9 +83,7 @@ class StateStorage extends BaseStorage {
      */
     async getState (senderId, pageId) {
         const c = await this._getCollection();
-        const doc = await c.findOne({ senderId, pageId }, { projection: { _id: 0 } });
-        // @ts-ignore
-        return doc;
+        return c.findOne({ senderId, pageId }, { projection: { _id: 0 } });
     }
 
     /**
@@ -160,8 +162,12 @@ class StateStorage extends BaseStorage {
 
         if (searchStates) {
             if (this._isCosmo) {
+                const $regex = `^${condition.search.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')}`;
                 Object.assign(useCondition, {
-                    name: { $regex: condition.search, $options: 'i' }
+                    $or: [
+                        { senderId: { $regex } },
+                        { name: { $regex } }
+                    ]
                 });
             } else {
                 Object.assign(useCondition, {