wingbot-mongodb 2.21.1 → 2.22.0-alpha.2

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "wingbot-mongodb",
-  "version": "2.21.1",
+  "version": "2.22.0-alpha.2",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {
     "test": "npm run test:lint && npm run test:coverage && npm run test:coverage:threshold",
-    "test:unit": "mocha ./test/**/*.test.js",
+    "test:unit": "mocha ./test/**/*.js",
     "test:unit:watch": "npm run test:unit -- --watch",
     "test:cosmos": "cross-env DB_TYPE=cosmos mocha ./test",
     "test:coverage": "nyc --reporter=html mocha ./test && nyc report",
@@ -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

@@ -6,8 +6,6 @@
 const jsonwebtoken = require('jsonwebtoken');
 const BaseStorage = require('./BaseStorage');
 
-/** @typedef {import('mongodb/lib/db')} Db */
-
 const LEVEL_CRITICAL = 'Critical';
 const LEVEL_IMPORTANT = 'Important';
 const LEVEL_DEBUG = 'Debug';
@@ -91,6 +89,9 @@ const TYPE_INFO = 'Info';
  * @returns {Promise}
  */
 
+/** @typedef {import('mongodb').Db} Db */
+/** @typedef {import('mongodb').Collection} Collection */
+
 /**
  * Storage for audit logs with signatures chain
  */

package/src/BaseStorage.js

@@ -6,8 +6,9 @@
 const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const crypto = require('crypto');
 
-/** @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 {
 
@@ -76,7 +77,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 +210,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

@@ -8,7 +8,7 @@ const BaseStorage = require('./BaseStorage');
 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

package/src/NotificationsStorage.js

@@ -793,7 +793,13 @@ class NotificationsStorage {
                     update: { $addToSet: { subs: tag } },
                     upsert: !onlyToKnown
                 }
-            }))
+            })),
+            {
+                ordered: false,
+                writeConcern: {
+                    w: onlyToKnown ? 0 : 1
+                }
+            }
         );
     }
 

package/src/StateStorage.js

@@ -3,7 +3,6 @@
 */
 'use strict';
 
-const mongodb = require('mongodb'); // eslint-disable-line no-unused-vars
 const BaseStorage = require('./BaseStorage');
 
 const USER_INDEX = 'senderId_1_pageId_1';
@@ -22,6 +21,8 @@ const SEARCH = 'search-text';
  * @prop {string} [search]
  */
 
+/** @typedef {import('mongodb').Db} Db */
+
 /**
  * Storage for chat states
  *
@@ -31,7 +32,7 @@ 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
@@ -41,7 +42,7 @@ class StateStorage extends BaseStorage {
 
         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 +78,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;
     }
 
     /**