wingbot-mongodb 2.22.0-alpha.4 → 3.0.0-alpha.7

package/.nyc_output/processinfo/38fa2b60-0502-4dbc-9c7f-c478802fb2de.json

@@ -0,0 +1 @@
+{"parent":null,"pid":52036,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1655802879208,"ppid":52035,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/38fa2b60-0502-4dbc-9c7f-c478802fb2de.json","externalId":"","uuid":"38fa2b60-0502-4dbc-9c7f-c478802fb2de","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":{"75b2d1cb-d4fe-472b-a674-acdcb631b536":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["75b2d1cb-d4fe-472b-a674-acdcb631b536"]},"externalIds":{}}
+{"processes":{"38fa2b60-0502-4dbc-9c7f-c478802fb2de":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["38fa2b60-0502-4dbc-9c7f-c478802fb2de"]},"externalIds":{}}

package/package.json

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

package/src/BaseStorage.js

@@ -3,6 +3,7 @@
  */
 'use strict';
 
+const { ObjectId } = require('mongodb');
 const crypto = require('crypto');
 const defaultLogger = require('./defaultLogger');
 
@@ -10,6 +11,26 @@ const defaultLogger = require('./defaultLogger');
 /** @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;
+}
+
 class BaseStorage {
 
     /**
@@ -24,7 +45,7 @@ class BaseStorage {
      *
      * class MyCoolDataStorage extends BaseStorage {
      *
-     *     constructor (mongoDb, collectionName = 'myCoolData', log = console, isCosmo = false) {
+     *     constructor (mongoDb, collectionName, log = undefined, isCosmo = false) {
      *          super(mongoDb, collectionName, log, isCosmo);
      *
      *          this.addIndex({
@@ -90,21 +111,33 @@ class BaseStorage {
     }
 
     /**
+     * @example
+     * {
+     *   _id: ObjectId.isValid(id) ? new ObjectId(input) : input
+     * }
      *
      * @protected
-     * @param {string} attr
+     * @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) {
-        const keys = Object.keys(obj);
-        if (keys.length === 0) {
+    _expandObjectToSet (attr, obj, nested = false) {
+        if (Object.keys(obj).length === 0) {
             return null;
         }
-        return keys
-            .reduce((o, key) => Object.assign(o, {
-                [`${attr}.${key}`]: obj[key]
-            }), {});
+        return getNestedObjects(obj, nested, attr);
     }
 
     async _getOrCreateCollection (name) {

package/src/NotificationsStorage.js

@@ -6,7 +6,7 @@
 const mongodb = require('mongodb');
 const defaultLogger = require('./defaultLogger');
 
-const { ObjectID } = mongodb;
+const { ObjectId } = mongodb;
 
 /**
  * @typedef Target {Object}
@@ -453,8 +453,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 +470,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 +607,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 +740,7 @@ class NotificationsStorage {
             useCondition = {
                 ...useCondition,
                 _id: {
-                    $lt: ObjectID.createFromHexString(key._id)
+                    $lt: ObjectId.createFromHexString(key._id)
                 }
             };
         }
@@ -899,7 +899,7 @@ class NotificationsStorage {
             condition = {
                 ...condition,
                 _id: {
-                    $gt: ObjectID.createFromHexString(key._id)
+                    $gt: ObjectId.createFromHexString(key._id)
                 }
             };
         }

package/src/StateStorage.js

@@ -9,6 +9,7 @@ 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
@@ -50,7 +51,12 @@ class StateStorage extends BaseStorage {
             { name: LAST_INTERACTION_INDEX }
         );
 
-        if (!isCosmo) {
+        if (isCosmo) {
+            this.addIndex(
+                { name: 1 },
+                { name: NAME }
+            );
+        } else {
             this.addIndex(
                 { '$**': 'text' },
                 { name: SEARCH }
@@ -160,8 +166,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, {