wingbot-mongodb 2.21.2 → 2.22.0-alpha.3

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"32821199-22af-42bd-8e0d-c255510f3efa":{"parent":null,"children":[]}},"files":{"/Users/david/Downloads/wingbot-mongodb/src/AttachmentCache.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/AuditLogStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/BaseStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/BotConfigStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/BotTokenStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/tokenFactory.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/ChatLogStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/NotificationsStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"],"/Users/david/Downloads/wingbot-mongodb/src/StateStorage.js":["32821199-22af-42bd-8e0d-c255510f3efa"]},"externalIds":{}}
+{"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":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "2.21.2",
+  "version": "2.22.0-alpha.3",
   "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": "^3.7.3",
+    "mongodb": "^4.5.0",
     "nyc": "^15.1.0",
-    "wingbot": "^3.30.0"
+    "wingbot": "^3.30.2"
   },
   "peerDependencies": {
-    "mongodb": "^3.0.0"
+    "mongodb": "^4.0.0"
   },
   "optionalDependencies": {
     "wingbot": "^3.0.0"

package/src/AttachmentCache.js

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

package/src/AuditLogStorage.js

@@ -5,8 +5,7 @@
 
 const jsonwebtoken = require('jsonwebtoken');
 const BaseStorage = require('./BaseStorage');
-
-/** @typedef {import('mongodb/lib/db')} Db */
+const defaultLogger = require('./defaultLogger');
 
 const LEVEL_CRITICAL = 'Critical';
 const LEVEL_IMPORTANT = 'Important';
@@ -91,6 +90,9 @@ const TYPE_INFO = 'Info';
  * @returns {Promise}
  */
 
+/** @typedef {import('mongodb').Db} Db */
+/** @typedef {import('mongodb').Collection} Collection */
+
 /**
  * Storage for audit logs with signatures chain
  */
@@ -105,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

@@ -5,9 +5,11 @@
 
 const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const crypto = require('crypto');
+const defaultLogger = require('./defaultLogger');
 
-/** @typedef {import('mongodb/lib/db')} Db */
-/** @typedef {import('mongodb/lib/collection')} Collection */
+/** @typedef {import('mongodb').Db} Db */
+/** @typedef {import('mongodb').Collection} Collection */
+/** @typedef {import('mongodb').CreateIndexesOptions} CreateIndexesOptions */
 
 class BaseStorage {
 
@@ -42,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;
@@ -76,7 +78,7 @@ class BaseStorage {
      * Add custom indexing rule
      *
      * @param {object} index
-     * @param {mongodb.IndexOptions} options
+     * @param {CreateIndexesOptions} options
      */
     addIndex (index, options) {
         if (!options.name) {
@@ -209,7 +211,7 @@ class BaseStorage {
 
     /**
      *
-     * @private
+     * @protected
      * @template T
      * @param {T} object
      * @returns {T}

package/src/BotConfigStorage.js

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

package/src/BotTokenStorage.js

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

package/src/ChatLogStorage.js

@@ -4,11 +4,12 @@
 '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/lib/db')} Db */
+/** @typedef {import('mongodb').Db} Db */
 
 /**
  * Storage for conversation logs
@@ -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,6 +4,7 @@
 'use strict';
 
 const mongodb = require('mongodb');
+const defaultLogger = require('./defaultLogger');
 
 const { ObjectID } = mongodb;
 
@@ -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`;

package/src/StateStorage.js

@@ -3,8 +3,8 @@
 */
 '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';
@@ -22,6 +22,8 @@ const SEARCH = 'search-text';
  * @prop {string} [search]
  */
 
+/** @typedef {import('mongodb').Db} Db */
+
 /**
  * Storage for chat states
  *
@@ -31,17 +33,17 @@ class StateStorage extends BaseStorage {
 
     /**
      *
-     * @param {mongodb.Db|{():Promise<mongodb.Db>}} mongoDb
+     * @param {Db|{():Promise<Db>}} mongoDb
      * @param {string} collectionName
      * @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(
             { senderId: 1, pageId: 1 },
-            { name: USER_INDEX, unique: true, dropDups: true }
+            { name: USER_INDEX, unique: true }
         );
         this.addIndex(
             { lastInteraction: isCosmo ? 1 : -1 },
@@ -77,7 +79,9 @@ class StateStorage extends BaseStorage {
      */
     async getState (senderId, pageId) {
         const c = await this._getCollection();
-        return c.findOne({ senderId, pageId }, { projection: { _id: 0 } });
+        const doc = await c.findOne({ senderId, pageId }, { projection: { _id: 0 } });
+        // @ts-ignore
+        return doc;
     }
 
     /**

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;