wingbot-mongodb 2.22.0-alpha.2 → 2.22.0-alpha.5

package/.nyc_output/processinfo/{28ee104d-8ece-4824-bb02-ada068f4d2d3.json → 1f0c249b-861d-4ebb-a415-267bb18646dd.json}

@@ -1 +1 @@
-{"parent":null,"pid":12323,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1649854800937,"ppid":12322,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/28ee104d-8ece-4824-bb02-ada068f4d2d3.json","externalId":"","uuid":"28ee104d-8ece-4824-bb02-ada068f4d2d3","files":["/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js","/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js","/Users/david/Development/wingbot-mongodb/src/BaseStorage.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":83585,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1650546848107,"ppid":83584,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/1f0c249b-861d-4ebb-a415-267bb18646dd.json","externalId":"","uuid":"1f0c249b-861d-4ebb-a415-267bb18646dd","files":["/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js","/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js","/Users/david/Development/wingbot-mongodb/src/BaseStorage.js","/Users/david/Development/wingbot-mongodb/src/defaultLogger.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":{"28ee104d-8ece-4824-bb02-ada068f4d2d3":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["28ee104d-8ece-4824-bb02-ada068f4d2d3"]},"externalIds":{}}
+{"processes":{"1f0c249b-861d-4ebb-a415-267bb18646dd":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["1f0c249b-861d-4ebb-a415-267bb18646dd"]},"externalIds":{}}

package/package.json

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

package/src/AuditLogStorage.js

@@ -5,6 +5,7 @@
 
 const jsonwebtoken = require('jsonwebtoken');
 const BaseStorage = require('./BaseStorage');
+const defaultLogger = require('./defaultLogger');
 
 const LEVEL_CRITICAL = 'Critical';
 const LEVEL_IMPORTANT = 'Important';
@@ -106,7 +107,7 @@ class AuditLogStorage extends BaseStorage {
      * @param {string|Promise<string>} [secret]
      * @param {string|Promise<string>} [jwtVerifier]
      */
-    constructor (mongoDb, collectionName = 'auditlog', log = console, isCosmo = false, secret = null, jwtVerifier = null) {
+    constructor (mongoDb, collectionName = 'auditlog', log = defaultLogger, isCosmo = false, secret = null, jwtVerifier = null) {
         super(mongoDb, collectionName, log, isCosmo);
 
         this.addIndex({

package/src/BaseStorage.js

@@ -3,8 +3,9 @@
  */
 'use strict';
 
-const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
+const { ObjectId } = require('mongodb');
 const crypto = require('crypto');
+const defaultLogger = require('./defaultLogger');
 
 /** @typedef {import('mongodb').Db} Db */
 /** @typedef {import('mongodb').Collection} Collection */
@@ -43,7 +44,7 @@ class BaseStorage {
      *
      * }
      */
-    constructor (mongoDb, collectionName, log = console, isCosmo = false) {
+    constructor (mongoDb, collectionName, log = defaultLogger, isCosmo = false) {
         this._mongoDb = mongoDb;
         this._collectionName = collectionName;
         this._isCosmo = isCosmo;
@@ -89,6 +90,40 @@ 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;
+    }
+
+    /**
+     *
+     * @protected
+     * @param {string} attr
+     * @param {{[key: string]: any}} obj
+     * @returns {{[key: string]: any}}
+     */
+    _expandObjectToSet (attr, obj) {
+        const keys = Object.keys(obj);
+        if (keys.length === 0) {
+            return null;
+        }
+        return keys
+            .reduce((o, key) => Object.assign(o, {
+                [`${attr}.${key}`]: obj[key]
+            }), {});
+    }
+
     async _getOrCreateCollection (name) {
         const db = typeof this._mongoDb === 'function'
             ? await this._mongoDb()

package/src/ChatLogStorage.js

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

package/src/NotificationsStorage.js

@@ -4,8 +4,9 @@
 'use strict';
 
 const mongodb = require('mongodb');
+const defaultLogger = require('./defaultLogger');
 
-const { ObjectID } = mongodb;
+const { ObjectId } = mongodb;
 
 /**
  * @typedef Target {Object}
@@ -84,7 +85,7 @@ class NotificationsStorage {
      * @param {{error:Function,log:Function}} [log] - console like logger
      * @param {boolean} isCosmo
      */
-    constructor (mongoDb, collectionsPrefix = '', log = console, isCosmo = false) {
+    constructor (mongoDb, collectionsPrefix = '', log = defaultLogger, isCosmo = false) {
         this._mongoDb = mongoDb;
 
         this.taksCollection = `${collectionsPrefix}notification-tasks`;
@@ -452,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
         });
 
@@ -469,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
@@ -606,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);
@@ -739,7 +740,7 @@ class NotificationsStorage {
             useCondition = {
                 ...useCondition,
                 _id: {
-                    $lt: ObjectID.createFromHexString(key._id)
+                    $lt: ObjectId.createFromHexString(key._id)
                 }
             };
         }
@@ -898,7 +899,7 @@ class NotificationsStorage {
             condition = {
                 ...condition,
                 _id: {
-                    $gt: ObjectID.createFromHexString(key._id)
+                    $gt: ObjectId.createFromHexString(key._id)
                 }
             };
         }

package/src/StateStorage.js

@@ -4,6 +4,7 @@
 'use strict';
 
 const BaseStorage = require('./BaseStorage');
+const defaultLogger = require('./defaultLogger');
 
 const USER_INDEX = 'senderId_1_pageId_1';
 const LAST_INTERACTION_INDEX = 'lastInteraction_1';
@@ -37,7 +38,7 @@ class StateStorage extends BaseStorage {
      * @param {{error:Function,log:Function}} [log] - console like logger
      * @param {boolean} isCosmo
      */
-    constructor (mongoDb, collectionName = 'states', log = console, isCosmo = false) {
+    constructor (mongoDb, collectionName = 'states', log = defaultLogger, isCosmo = false) {
         super(mongoDb, collectionName, log, isCosmo);
 
         this.addIndex(

package/src/defaultLogger.js

@@ -0,0 +1,19 @@
+/**
+ * @author {David Menger}
+ */
+'use strict';
+
+function log (...args) {
+    const mapped = args.map((a) => (typeof a === 'string' ? a : JSON.stringify(a, null, 2)));
+    process.stderr.write(` + ${mapped.join(' ')}\n`);
+}
+
+const defaultLogger = {
+    log,
+    error: (...args) => log('ERROR:', ...args),
+    info: log,
+    warn: (...args) => log('WARN:', ...args),
+    debug: log
+};
+
+module.exports = defaultLogger;