botium-core 1.13.12 → 1.13.14

package/dist/botium-es.js

@@ -37,7 +37,7 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.13.12";
+var version$1 = "1.13.14";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
@@ -247,10 +247,14 @@ var Capabilities = {
   SIMPLEREST_RESPONSE_HOOK: 'SIMPLEREST_RESPONSE_HOOK',
   SIMPLEREST_MEDIA_JSONPATH: 'SIMPLEREST_MEDIA_JSONPATH',
   SIMPLEREST_BUTTONS_JSONPATH: 'SIMPLEREST_BUTTONS_JSONPATH',
+  SIMPLEREST_BUTTONS_TEXT_SUBJSONPATH: 'SIMPLEREST_BUTTONS_TEXT_SUBJSONPATH',
+  SIMPLEREST_BUTTONS_PAYLOAD_SUBJSONPATH: 'SIMPLEREST_BUTTONS_PAYLOAD_SUBJSONPATH',
   SIMPLEREST_CARDS_JSONPATH: 'SIMPLEREST_CARDS_JSONPATH',
   SIMPLEREST_CARD_TEXT_JSONPATH: 'SIMPLEREST_CARD_TEXT_JSONPATH',
   SIMPLEREST_CARD_SUBTEXT_JSONPATH: 'SIMPLEREST_CARD_SUBTEXT_JSONPATH',
   SIMPLEREST_CARD_BUTTONS_JSONPATH: 'SIMPLEREST_CARD_BUTTONS_JSONPATH',
+  SIMPLEREST_CARD_BUTTONS_TEXT_SUBJSONPATH: 'SIMPLEREST_CARD_BUTTONS_TEXT_SUBJSONPATH',
+  SIMPLEREST_CARD_BUTTONS_PAYLOAD_SUBJSONPATH: 'SIMPLEREST_CARD_BUTTONS_PAYLOAD_SUBJSONPATH',
   SIMPLEREST_CARD_ATTACHMENTS_JSONPATH: 'SIMPLEREST_CARD_ATTACHMENTS_JSONPATH',
   SIMPLEREST_CONTEXT_JSONPATH: 'SIMPLEREST_CONTEXT_JSONPATH',
   SIMPLEREST_CONTEXT_MERGE_OR_REPLACE: 'SIMPLEREST_CONTEXT_MERGE_OR_REPLACE',
@@ -409,10 +413,14 @@ Capabilities.SIMPLEREST_RESPONSE_JSONPATH;
 Capabilities.SIMPLEREST_RESPONSE_HOOK;
 Capabilities.SIMPLEREST_MEDIA_JSONPATH;
 Capabilities.SIMPLEREST_BUTTONS_JSONPATH;
+Capabilities.SIMPLEREST_BUTTONS_TEXT_SUBJSONPATH;
+Capabilities.SIMPLEREST_BUTTONS_PAYLOAD_SUBJSONPATH;
 Capabilities.SIMPLEREST_CARDS_JSONPATH;
 Capabilities.SIMPLEREST_CARD_TEXT_JSONPATH;
 Capabilities.SIMPLEREST_CARD_SUBTEXT_JSONPATH;
 Capabilities.SIMPLEREST_CARD_BUTTONS_JSONPATH;
+Capabilities.SIMPLEREST_CARD_BUTTONS_TEXT_SUBJSONPATH;
+Capabilities.SIMPLEREST_CARD_BUTTONS_PAYLOAD_SUBJSONPATH;
 Capabilities.SIMPLEREST_CARD_ATTACHMENTS_JSONPATH;
 Capabilities.SIMPLEREST_CONTEXT_JSONPATH;
 Capabilities.SIMPLEREST_CONTEXT_MERGE_OR_REPLACE;
@@ -7786,6 +7794,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
     await this._unsubscribeInbound();
     await this._stopPolling();
     this.view = {};
+    this.cookies = {};
   }
   Clean() {
     return this._cleanInbound();
@@ -7852,17 +7861,22 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
     }
     const result = [];
     if (isFromUser) {
-      const jsonPathRoots = [];
-      const jsonPathsBody = getAllCapValues(Capabilities.SIMPLEREST_BODY_JSONPATH, this.caps);
-      if (jsonPathsBody.length > 0) {
-        for (const jsonPathBody of jsonPathsBody) {
-          const rb = jsonpath.query(body, jsonPathBody);
+      const _extractFrom = (root, jsonPaths) => {
+        const flattened = [];
+        for (const jsonPath of jsonPaths) {
+          const rb = jsonpath.query(root, jsonPath);
           if (lodash.isArray(rb)) {
-            rb.forEach(r => jsonPathRoots.push(r));
+            lodash.flattenDeep(rb).forEach(r => flattened.push(r));
           } else if (rb) {
-            jsonPathRoots.push(rb);
+            flattened.push(rb);
           }
         }
+        return flattened;
+      };
+      const jsonPathRoots = [];
+      const jsonPathsBody = getAllCapValues(Capabilities.SIMPLEREST_BODY_JSONPATH, this.caps);
+      if (jsonPathsBody.length > 0) {
+        jsonPathRoots.push(..._extractFrom(body, jsonPathsBody));
       } else {
         jsonPathRoots.push(body);
       }
@@ -7880,16 +7894,33 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
           });
           return retrievedMedia;
         };
-        const _retrieveButtons = (jsonPathButtonRoot, jsonPathsButtons) => {
+        const _retrieveButtons = (jsonPathButtonRoot, capPrefix) => {
+          const jsonPathsButtons = getAllCapValues(`${capPrefix}_JSONPATH`, this.caps);
+          const jsonPathsButtonsText = getAllCapValues(`${capPrefix}_TEXT_SUBJSONPATH`, this.caps);
+          const jsonPathsButtonsPayload = getAllCapValues(`${capPrefix}_PAYLOAD_SUBJSONPATH`, this.caps);
           const retrievedButtons = [];
-          jsonPathsButtons.forEach(jsonPath => {
-            const responseButtons = jsonpath.query(jsonPathButtonRoot, jsonPath);
-            if (responseButtons) {
-              (lodash.isArray(responseButtons) ? lodash.flattenDeep(responseButtons) : [responseButtons]).forEach(b => retrievedButtons.push({
-                text: b
-              }));
+          const responseButtons = _extractFrom(jsonPathButtonRoot, jsonPathsButtons);
+          for (const responseButton of responseButtons) {
+            const retrievedButton = {};
+            if (lodash.isString(responseButton)) {
+              retrievedButton.text = responseButton;
+            } else {
+              if (jsonPathsButtonsText.length > 0) {
+                const possibleTexts = _extractFrom(responseButton, jsonPathsButtonsText);
+                if (possibleTexts.length > 0) retrievedButton.text = possibleTexts[0];
+              }
+              if (jsonPathsButtonsPayload.length > 0) {
+                const possiblePayloads = _extractFrom(responseButton, jsonPathsButtonsPayload);
+                if (possiblePayloads.length > 0) retrievedButton.payload = possiblePayloads[0];
+              }
             }
-          });
+            if (Object.keys(retrievedButton).length === 0 && responseButton) {
+              retrievedButton.text = JSON.stringify(responseButton);
+            }
+            if (Object.keys(retrievedButton).length > 0) {
+              retrievedButtons.push(retrievedButton);
+            }
+          }
           return retrievedButtons;
         };
         const _getCardText = responseCardText => {
@@ -7905,7 +7936,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
         };
         const media = _retrieveMedia(jsonPathRoot, getAllCapValues(Capabilities.SIMPLEREST_MEDIA_JSONPATH, this.caps));
         debug$4(`found response media: ${util.inspect(media)}`);
-        const buttons = _retrieveButtons(jsonPathRoot, getAllCapValues(Capabilities.SIMPLEREST_BUTTONS_JSONPATH, this.caps));
+        const buttons = _retrieveButtons(jsonPathRoot, 'SIMPLEREST_BUTTONS');
         debug$4(`found response buttons: ${util.inspect(buttons)}`);
         const cards = [];
         const jsonPathsCards = getAllCapValues(Capabilities.SIMPLEREST_CARDS_JSONPATH, this.caps);
@@ -7922,7 +7953,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
               jsonPathsCardSubText.forEach(jsonPath => {
                 card.subtext = _getCardText(jsonpath.query(c, jsonPath));
               });
-              card.buttons = _retrieveButtons(c, getAllCapValues(Capabilities.SIMPLEREST_CARD_BUTTONS_JSONPATH, this.caps));
+              card.buttons = _retrieveButtons(c, 'SIMPLEREST_CARD_BUTTONS');
               card.media = _retrieveMedia(c, getAllCapValues(Capabilities.SIMPLEREST_CARD_ATTACHMENTS_JSONPATH, this.caps));
               if (lodash.keys(card).length > 0) {
                 cards.push(card);
@@ -8132,13 +8163,17 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
       }));
       if (err) {
         debug$4(`_waitForUrlResponse error on url check ${pingConfig.uri}: ${err}`);
-        await timeout(pingConfig.timeout);
+        if (tries <= retries) {
+          await timeout(pingConfig.timeout);
+        }
       } else if (response.statusCode >= 400) {
         debug$4(`_waitForUrlResponse on url check ${pingConfig.uri} got error response: ${response.statusCode}/${response.statusMessage}`);
         if (debug$4.enabled && body) {
           debug$4(Utils.shortenJsonString(body));
         }
-        await timeout(pingConfig.timeout);
+        if (tries <= retries) {
+          await timeout(pingConfig.timeout);
+        }
       } else {
         debug$4(`_waitForUrlResponse success on url check ${pingConfig.uri}: ${response.statusCode}/${response.statusMessage}`);
         this._storeCookiesFromResponse(response);
@@ -9187,43 +9222,59 @@ Plugins.PLUGIN_TYPE_LOGICHOOK;
 Plugins.PLUGIN_TYPE_USERINPUT;
 Plugins.TYPE_TO_PREFIX;
 
+var hasWaitForBotTimeout = transciptError => {
+  if (!transciptError) {
+    return false;
+  }
+  const str = transciptError.message || (lodash.isString(transciptError) ? transciptError : null);
+  if (!str) {
+    return false;
+  }
+  return str.indexOf(': error waiting for bot - Bot did not respond within') > 0;
+};
+var TranscriptUtils = {
+  hasWaitForBotTimeout: hasWaitForBotTimeout
+};
+
 var botiumCore = {
   BotDriver: BotDriver_1,
-  ScriptingProvider: ScriptingProvider_1,
-  ScriptingConstants: Constants,
   Capabilities: Capabilities,
   Defaults: Defaults$1,
   Enums: Enums,
-  Source: Source,
   Events: Events,
   Plugins: Plugins,
+  Source: Source,
+  InboundProxy: proxy,
+  HookUtils: HookUtils,
+  TranscriptUtils: TranscriptUtils,
+  BotiumMockRichMessageTypes: BotiumMockRichMessageTypes,
   BotiumError: BotiumError_1.BotiumError,
+  ScriptingConstants: Constants,
   ScriptingMemory: ScriptingMemory,
-  HookUtils: HookUtils,
+  ScriptingProvider: ScriptingProvider_1,
   LogicHookConstants: LogicHookConsts,
   Lib: {
-    tryLoadPlugin: plugins.tryLoadPlugin,
-    SimpleRestContainer: SimpleRestContainer_1
-  },
-  InboundProxy: proxy,
-  BotiumMockRichMessageTypes: BotiumMockRichMessageTypes
+    SimpleRestContainer: SimpleRestContainer_1,
+    tryLoadPlugin: plugins.tryLoadPlugin
+  }
 };
 var botiumCore_1 = botiumCore.BotDriver;
-var botiumCore_2 = botiumCore.ScriptingProvider;
-var botiumCore_3 = botiumCore.ScriptingConstants;
-var botiumCore_4 = botiumCore.Capabilities;
-var botiumCore_5 = botiumCore.Defaults;
-var botiumCore_6 = botiumCore.Enums;
+var botiumCore_2 = botiumCore.Capabilities;
+var botiumCore_3 = botiumCore.Defaults;
+var botiumCore_4 = botiumCore.Enums;
+var botiumCore_5 = botiumCore.Events;
+var botiumCore_6 = botiumCore.Plugins;
 var botiumCore_7 = botiumCore.Source;
-var botiumCore_8 = botiumCore.Events;
-var botiumCore_9 = botiumCore.Plugins;
-var botiumCore_10 = botiumCore.BotiumError;
-var botiumCore_11 = botiumCore.ScriptingMemory;
-var botiumCore_12 = botiumCore.HookUtils;
-var botiumCore_13 = botiumCore.LogicHookConstants;
-var botiumCore_14 = botiumCore.Lib;
-var botiumCore_15 = botiumCore.InboundProxy;
-var botiumCore_16 = botiumCore.BotiumMockRichMessageTypes;
+var botiumCore_8 = botiumCore.InboundProxy;
+var botiumCore_9 = botiumCore.HookUtils;
+var botiumCore_10 = botiumCore.TranscriptUtils;
+var botiumCore_11 = botiumCore.BotiumMockRichMessageTypes;
+var botiumCore_12 = botiumCore.BotiumError;
+var botiumCore_13 = botiumCore.ScriptingConstants;
+var botiumCore_14 = botiumCore.ScriptingMemory;
+var botiumCore_15 = botiumCore.ScriptingProvider;
+var botiumCore_16 = botiumCore.LogicHookConstants;
+var botiumCore_17 = botiumCore.Lib;
 
-export { botiumCore_1 as BotDriver, botiumCore_10 as BotiumError, botiumCore_16 as BotiumMockRichMessageTypes, botiumCore_4 as Capabilities, botiumCore_5 as Defaults, botiumCore_6 as Enums, botiumCore_8 as Events, botiumCore_12 as HookUtils, botiumCore_15 as InboundProxy, botiumCore_14 as Lib, botiumCore_13 as LogicHookConstants, botiumCore_9 as Plugins, botiumCore_3 as ScriptingConstants, botiumCore_11 as ScriptingMemory, botiumCore_2 as ScriptingProvider, botiumCore_7 as Source, botiumCore as default };
+export { botiumCore_1 as BotDriver, botiumCore_12 as BotiumError, botiumCore_11 as BotiumMockRichMessageTypes, botiumCore_2 as Capabilities, botiumCore_3 as Defaults, botiumCore_4 as Enums, botiumCore_5 as Events, botiumCore_9 as HookUtils, botiumCore_8 as InboundProxy, botiumCore_17 as Lib, botiumCore_16 as LogicHookConstants, botiumCore_6 as Plugins, botiumCore_13 as ScriptingConstants, botiumCore_14 as ScriptingMemory, botiumCore_15 as ScriptingProvider, botiumCore_7 as Source, botiumCore_10 as TranscriptUtils, botiumCore as default };
 //# sourceMappingURL=botium-es.js.map