wingbot-mongodb 3.2.3 → 3.2.5-test.1

package/.nyc_output/processinfo/fb200475-7184-4caf-a314-c2fe4216d1dc.json

@@ -0,0 +1 @@
+{"parent":null,"pid":26311,"argv":["/usr/local/bin/node","/Users/david/Development/wingbot-mongodb/node_modules/.bin/mocha","./test"],"execArgv":[],"cwd":"/Users/david/Development/wingbot-mongodb","time":1681982211291,"ppid":26310,"coverageFilename":"/Users/david/Development/wingbot-mongodb/.nyc_output/fb200475-7184-4caf-a314-c2fe4216d1dc.json","externalId":"","uuid":"fb200475-7184-4caf-a314-c2fe4216d1dc","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":{"8db620e2-5deb-4db5-b239-32d4e6eb824a":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["8db620e2-5deb-4db5-b239-32d4e6eb824a"]},"externalIds":{}}
+{"processes":{"fb200475-7184-4caf-a314-c2fe4216d1dc":{"parent":null,"children":[]}},"files":{"/Users/david/Development/wingbot-mongodb/src/BaseStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/defaultLogger.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/AttachmentCache.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/AuditLogStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/BotConfigStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/BotTokenStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/tokenFactory.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/ChatLogStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/NotificationsStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"],"/Users/david/Development/wingbot-mongodb/src/StateStorage.js":["fb200475-7184-4caf-a314-c2fe4216d1dc"]},"externalIds":{}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot-mongodb",
-  "version": "3.2.3",
+  "version": "3.2.5-test.1",
   "description": "MongoDB storage for wingbot.ai",
   "main": "src/main.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "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",
-    "test:coverage:threshold": "nyc check-coverage --lines 80 --functions 75 --branches 75",
+    "test:coverage:threshold": "nyc check-coverage --lines 80 --functions 73 --branches 75",
     "test:lint": "eslint ./src/**/*.js ./bin/**/*.js ./test/**/*.js ",
     "doc": "node ./bin/makeApiDoc.js"
   },

package/src/BaseStorage.js

@@ -103,6 +103,8 @@ class BaseStorage {
 
         this._fixtures = [];
 
+        this._uniqueIndexFailed = false;
+
         if (typeof isCosmo === 'number') {
             BaseStorage.netFailuresCount = isCosmo;
         }
@@ -303,6 +305,9 @@ class BaseStorage {
                 return p
                     .then(() => collection.createIndex(i.index, i.options))
                     .catch((e) => {
+                        if (i.options.unique) {
+                            this._uniqueIndexFailed = true;
+                        }
                         this._log.error(`DB.${this._collectionName} failed to create index ${i.options.name} on ${collection.collectionName}`, e);
                     })
                     .then(() => true);
@@ -330,7 +335,6 @@ class BaseStorage {
                 fixtures = fixtures
                     .filter((f) => !f._id || !found.includes(f._id.toString()));
             }
-
         }
 
         if (!updated || fixtures.length === 0) {
@@ -342,7 +346,9 @@ class BaseStorage {
                 .then(() => collection.insertOne(o))
                 .then(() => this._log.log(`DB.${this._collectionName} Inserted fixture doc to "${this._collectionName}"`))
                 .catch((e) => {
-                    if (e.code !== 11000) {
+                    if (e.code === 11000) {
+                        this._log.log(`DB.${this._collectionName} fixture not inserted: ${e.message}`);
+                    } else {
                         this._log.error(`DB.${this._collectionName} failed to insert fixture doc to "${this._collectionName}"`, e);
                     }
                 }),
@@ -365,6 +371,10 @@ class BaseStorage {
         const objToSign = this._objectToSign(object);
         const sign = this._signWithSecret(objToSign, secret);
 
+        if (this.logSig) {
+            this._log.log(`sign ${this._collectionName}`, JSON.stringify(objToSign, null, 2));
+        }
+
         return Object.assign(objToSign, {
             sign
         });

package/src/ChatLogStorage.js

@@ -114,6 +114,7 @@ class ChatLogStorage extends BaseStorage {
             const compare = this._signWithSecret(objToSign, secret);
             const ok = compare === sign;
             if (!ok) {
+                this._log.log(`compare ${this._collectionName}`, JSON.stringify(objToSign, null, 2));
                 this._log.error(`ChatLog: found wrong signature at pageId: "${r.pageId}", senderId: "${r.senderId}", at: ${r.timestamp}`, r);
             }
 

package/src/StateStorage.js

@@ -51,6 +51,8 @@ class StateStorage extends BaseStorage {
             { name: LAST_INTERACTION_INDEX }
         );
 
+        this.logCollisionsAsErrors = false;
+
         if (isCosmo) {
             this.addIndex(
                 { name: 1 },
@@ -84,7 +86,12 @@ class StateStorage extends BaseStorage {
      */
     async getState (senderId, pageId) {
         const c = await this._getCollection();
-        const doc = await c.findOne({ senderId, pageId }, { projection: { _id: 0 } });
+        const doc = await c.findOne({
+            senderId, pageId
+        }, {
+            projection: { _id: 0 },
+            ...(this._uniqueIndexFailed ? { sort: { lastInteraction: -1 } } : {})
+        });
         // @ts-ignore
         return doc;
     }
@@ -123,12 +130,44 @@ class StateStorage extends BaseStorage {
             $set
         }, {
             upsert: true,
+            ...(this._uniqueIndexFailed ? { sort: { lastInteraction: -1 } } : {}),
             returnDocument: 'after',
             projection: {
                 _id: 0
             }
         }));
 
+        if (this._uniqueIndexFailed && !res.value.lastInteraction) {
+            // check if there was a locked state
+            const existing = await c.find({
+                senderId,
+                pageId
+            })
+                .sort({ lastInteraction: -1 })
+                .toArray();
+
+            if (existing.length > 1) {
+
+                // remove entries without lastInteraction
+                const $in = existing
+                    .filter((s) => !s.lastInteraction && (s.lock === now || s.lock < $lt))
+                    .map((s) => s._id);
+
+                const logLevel = this.logCollisionsAsErrors ? 'error' : 'log';
+                this._log[logLevel]('StateStorage: unique index workaround DETECTED', {
+                    v: res.value, existing, $in: $in.map((i) => i.toString())
+                });
+
+                if ($in.length > 0) {
+                    await c.deleteMany({ _id: { $in } });
+                }
+
+                throw Object.assign(new Error('State was locked'), { code: 11000 });
+            } else {
+                this._log.log('StateStorage: unique index workaround OK', res.value);
+            }
+        }
+
         return res.value;
     }
 
@@ -245,13 +284,24 @@ class StateStorage extends BaseStorage {
 
         const { senderId, pageId } = state;
 
-        await c.updateOne({
-            senderId, pageId
-        }, {
-            $set: state
-        }, {
-            upsert: true
-        });
+        if (this._uniqueIndexFailed) {
+            await c.findOneAndUpdate({
+                senderId, pageId
+            }, {
+                $set: state
+            }, {
+                sort: { lastInteraction: -1 },
+                upsert: true
+            });
+        } else {
+            await c.updateOne({
+                senderId, pageId
+            }, {
+                $set: state
+            }, {
+                upsert: true
+            });
+        }
 
         return state;
     }