wingbot 3.31.5 → 3.31.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.31.5",
+  "version": "3.31.8",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/BuildRouter.js

@@ -310,7 +310,8 @@ class BuildRouter extends Router {
             this._configTs = 0;
         }
         if (this._prebuiltGlobalIntents !== null) {
-            this.globalIntents = new Map(this._prebuiltGlobalIntents);
+            this.globalIntents.clear();
+            this._prebuiltGlobalIntents.forEach(([k, v]) => this.globalIntents.set(k, v));
         }
     }
 
@@ -326,7 +327,8 @@ class BuildRouter extends Router {
         if (this._prebuiltGlobalIntents === null) {
             this._prebuiltGlobalIntents = Array.from(this.globalIntents.entries());
         } else {
-            this.globalIntents = new Map(this._prebuiltGlobalIntents);
+            this.globalIntents.clear();
+            this._prebuiltGlobalIntents.forEach(([k, v]) => this.globalIntents.set(k, v));
         }
 
         if (this._prebuiltRoutesCount === null) {

package/src/ConversationTester.js

@@ -524,7 +524,7 @@ class ConversationTester {
                 await tester.text(textCase.text);
 
                 if (textCase.action) {
-                    tester.passedAction(textCase.action);
+                    tester.passedAction(textCase.action, true);
                 }
 
                 if (textCase.appId) {
@@ -623,7 +623,7 @@ class ConversationTester {
             if (!this._options.disableAssertActions) {
                 passedAction.split('\n')
                     .map((a) => (a.trim().match(/^[a-z\-0-9/_]+$/) ? a : tokenize(a)))
-                    .forEach((a) => a && t.passedAction(a));
+                    .forEach((a) => a && t.passedAction(a, true));
             }
 
             const any = t.any();

package/src/Tester.js

@@ -69,9 +69,21 @@ class Tester {
             info: e => console.info(e) // eslint-disable-line
         };
 
+        this._cachedGiMap = null;
+
         this._listener = (senderIdentifier, action, text, req, prevAction, doNotTrack) => {
+            const reqAction = req.action();
+            if (reqAction
+                && !this._actionMatches(action, reqAction)
+                && this._actionHasGlobalIntent(reqAction)) {
+
+                this._actionsCollector.push({
+                    action: reqAction, text, prevAction, doNotTrack, isReqAction: true
+                });
+            }
+
             this._actionsCollector.push({
-                action, text, prevAction, doNotTrack
+                action, text, prevAction, doNotTrack, isReqAction: false
             });
         };
 
@@ -127,10 +139,27 @@ class Tester {
         this.features = null;
     }
 
+    _actionHasGlobalIntent (action) {
+        if (!this.processor.reducer
+            || !('globalIntents' in this.processor.reducer)) {
+            return false;
+        }
+        if (this._cachedGiMap === null) {
+            this._cachedGiMap = new Set();
+
+            for (const value of this.processor.reducer.globalIntents.values()) {
+                this._cachedGiMap.add(value.action);
+            }
+        }
+
+        return this._cachedGiMap.has(action.replace(/^\/?/, '/'));
+    }
+
     dealloc () {
         this.processor.reducer
             .removeListener('_action', this._listener);
         this.processor.reducer = null;
+        this._cachedGiMap = null;
     }
 
     /**
@@ -255,22 +284,30 @@ class Tester {
         return new ResponseAssert(this.responses[this.responses.length - 1]);
     }
 
+    _actionMatches (botAction, path) {
+        return botAction === path
+            || (path === '*' && botAction === '/*')
+            || (!botAction.match(/\*/) && actionMatches(botAction, path));
+    }
+
     /**
-     * Checks, that app past the action
+     * Checks, that request passed an interaction
      *
      * @param {string} path
+     * @param {boolean} [matchRequestActions]
      * @returns {this}
      *
      * @memberOf Tester
      */
-    passedAction (path) {
+    passedAction (path, matchRequestActions = false) {
         const ok = this.actions
-            .some((action) => (action.action === path
-                || (!action.action.match(/\*/) && actionMatches(action.action, path))));
+            .some((action) => (!action.isReqAction || matchRequestActions)
+                && this._actionMatches(action.action, path));
         let actual;
         if (!ok) {
             const set = new Set();
             actual = this.actions
+                .filter((a) => !a.isReqAction || matchRequestActions)
                 .map((a) => (a.doNotTrack ? `(system interaction) ${a.action}` : a.action))
                 .filter((a) => !set.has(a) && set.add(a));
             assert.fail(asserts.ex('Interaction was not passed', path, actual));