wingbot 3.31.5-alpha.1 → 3.31.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.31.5-alpha.1",
+  "version": "3.31.6",
   "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) {

package/src/Responder.js

@@ -528,6 +528,8 @@ class Responder {
         if (prepend) Object.assign(prep, { _prepend: true });
         if (justToExisting) Object.assign(prep, { _justToExisting: true });
 
+        const useCa = this.currentAction();
+
         if (actionIsObject) {
             this._quickReplyCollector.push({
                 ...prep,
@@ -535,7 +537,8 @@ class Responder {
                 data: {
                     ...prep.data,
                     ...data
-                }
+                },
+                useCa
             });
         } else {
             this._quickReplyCollector.push({
@@ -543,6 +546,7 @@ class Responder {
                 action: this.toAbsoluteAction(action),
                 title,
                 data,
+                useCa,
                 ...prep
             });
         }

package/src/RouterWrap.js

@@ -48,6 +48,8 @@ class RouterWrap extends EventEmitter {
 
         const { items, router, params } = this;
 
+        const { path, routePath } = res;
+
         // attach params
         req.params = params;
 
@@ -60,9 +62,15 @@ class RouterWrap extends EventEmitter {
                     return true;
                 }
 
+                const { path: runPath, routePath: runRoutePath } = res;
+
+                res.setPath(path, routePath);
+
                 const reducers = items.get(codeBlockName);
                 const result = await router
-                    .processReducers(reducers, req, res, postBack, useAction, true);
+                    .processReducers(reducers, req, res, postBack, path, useAction, true);
+
+                res.setPath(runPath, runRoutePath);
 
                 return result;
             }

package/src/Tester.js

@@ -70,8 +70,15 @@ class Tester {
         };
 
         this._listener = (senderIdentifier, action, text, req, prevAction, doNotTrack) => {
+            const reqAction = req.action();
+            if (reqAction && !this._actionMatches(action, reqAction)) {
+                this._actionsCollector.push({
+                    action: reqAction, text, prevAction, doNotTrack, isReqAction: true
+                });
+            }
+
             this._actionsCollector.push({
-                action, text, prevAction, doNotTrack
+                action, text, prevAction, doNotTrack, isReqAction: false
             });
         };
 
@@ -255,18 +262,25 @@ 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();

package/src/utils/quickReplies.js

@@ -133,7 +133,8 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                 data = {},
                 isLocation = false,
                 isEmail = false,
-                isPhone = false
+                isPhone = false,
+                useCa = currentAction
             } = reply;
             let {
                 setState = null
@@ -219,7 +220,7 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                 payload = {
                     action: absoluteAction,
                     data: {
-                        _ca: currentAction,
+                        _ca: useCa,
                         ...data
                     }
                 };