botium-core 1.11.15 → 1.12.2

package/dist/botium-es.js

@@ -23,7 +23,7 @@ import isJson$1 from 'is-json';
 import esprima from 'esprima';
 import markdownIt from 'markdown-it';
 import xlsx from 'xlsx';
-import sync from 'csv-parse/lib/sync';
+import sync from 'csv-parse/sync';
 import yaml from 'yaml';
 import child_process from 'child_process';
 import socket from 'socket.io-client';
@@ -36,12 +36,12 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.11.15";
+var version$1 = "1.12.2";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
 var engines = {
-	node: ">=10.0.0"
+	node: ">=14.0.0"
 };
 var scripts = {
 	postinstall: "node ./report.js",
@@ -68,23 +68,23 @@ var bugs = {
 };
 var homepage = "https://www.botium.ai";
 var dependencies = {
-	"@babel/runtime": "^7.16.0",
-	async: "^3.2.2",
-	"body-parser": "^1.19.0",
+	"@babel/runtime": "^7.16.7",
+	async: "^3.2.3",
+	"body-parser": "^1.19.1",
 	boolean: "^3.1.4",
 	bottleneck: "^2.19.5",
-	"csv-parse": "^4.16.3",
-	debug: "^4.3.2",
+	"csv-parse": "^5.0.4",
+	debug: "^4.3.3",
 	esprima: "^4.0.1",
-	express: "^4.17.1",
+	express: "^4.17.2",
 	globby: "11.0.4",
-	ioredis: "^4.28.0",
+	ioredis: "^4.28.3",
 	"is-class": "^0.0.9",
 	"is-json": "^2.0.1",
 	jsonpath: "^1.1.1",
 	lodash: "^4.17.21",
-	"markdown-it": "^12.2.0",
-	"mime-types": "^2.1.33",
+	"markdown-it": "^12.3.2",
+	"mime-types": "^2.1.34",
 	mkdirp: "^1.0.4",
 	moment: "^2.29.1",
 	mustache: "^4.2.0",
@@ -94,40 +94,40 @@ var dependencies = {
 	request: "^2.88.2",
 	rimraf: "^3.0.2",
 	"sanitize-filename": "^1.6.3",
-	slugify: "^1.6.1",
-	"socket.io": "^4.3.1",
-	"socket.io-client": "^4.3.2",
+	slugify: "^1.6.5",
+	"socket.io": "^4.4.1",
+	"socket.io-client": "^4.4.1",
 	"socketio-auth": "^0.1.1",
 	"swagger-jsdoc": "^6.1.0",
-	"swagger-ui-express": "^4.1.6",
+	"swagger-ui-express": "^4.3.0",
 	uuid: "^8.3.2",
 	vm2: "^3.9.5",
 	"write-yaml": "^1.0.0",
-	xlsx: "^0.17.3",
+	xlsx: "^0.17.5",
 	xregexp: "^5.1.0",
 	yaml: "^1.10.2"
 };
 var devDependencies = {
-	"@babel/core": "^7.16.0",
-	"@babel/node": "^7.16.0",
-	"@babel/plugin-transform-runtime": "^7.16.0",
-	"@babel/preset-env": "^7.16.0",
+	"@babel/core": "^7.16.12",
+	"@babel/node": "^7.16.8",
+	"@babel/plugin-transform-runtime": "^7.16.10",
+	"@babel/preset-env": "^7.16.11",
 	chai: "^4.3.4",
 	"chai-as-promised": "^7.1.1",
 	"cross-env": "^7.0.3",
-	eslint: "^8.1.0",
+	eslint: "^8.7.0",
 	"eslint-config-standard": "^16.0.3",
-	"eslint-plugin-import": "^2.25.2",
+	"eslint-plugin-import": "^2.25.4",
 	"eslint-plugin-node": "^11.1.0",
-	"eslint-plugin-promise": "^5.1.1",
+	"eslint-plugin-promise": "^6.0.0",
 	"eslint-plugin-standard": "^4.1.0",
 	"license-checker": "^25.0.1",
 	"license-compatibility-checker": "^0.3.5",
-	mocha: "^9.1.3",
-	nock: "^13.1.4",
-	"npm-check-updates": "^12.0.0",
+	mocha: "^9.2.0",
+	nock: "^13.2.2",
+	"npm-check-updates": "^12.2.1",
 	nyc: "^15.1.0",
-	rollup: "^2.59.0",
+	rollup: "^2.66.0",
 	"rollup-plugin-babel": "^4.4.0",
 	"rollup-plugin-commonjs": "^10.1.0",
 	"rollup-plugin-json": "^4.0.0",
@@ -282,6 +282,7 @@ var Capabilities = {
   SCRIPTING_NORMALIZE_TEXT: 'SCRIPTING_NORMALIZE_TEXT',
   SCRIPTING_ENABLE_MEMORY: 'SCRIPTING_ENABLE_MEMORY',
   SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS: 'SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS',
+  SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS: 'SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS',
   SCRIPTING_FORCE_BOT_CONSUMED: 'SCRIPTING_FORCE_BOT_CONSUMED',
   // regexp, regexpIgnoreCase, wildcard, wildcardIgnoreCase, wildcardExact, wildcardExactIgnoreCase, include, includeIgnoreCase, equals, equalsIgnoreCase
   SCRIPTING_MATCHING_MODE: 'SCRIPTING_MATCHING_MODE',
@@ -297,6 +298,8 @@ var Capabilities = {
   SCRIPTING_MEMORYEXPANSION_KEEP_ORIG: 'SCRIPTING_MEMORYEXPANSION_KEEP_ORIG',
   // word, non_whitespace, joker
   SCRIPTING_MEMORY_MATCHING_MODE: 'SCRIPTING_MEMORY_MATCHING_MODE',
+  // varnames, testcasenames
+  SCRIPTING_MEMORY_COLUMN_MODE: 'SCRIPTING_MEMORY_COLUMN_MODE',
   // Botium Lifecycle Hooks
   CUSTOMHOOK_ONBUILD: 'CUSTOMHOOK_ONBUILD',
   CUSTOMHOOK_ONSTART: 'CUSTOMHOOK_ONSTART',
@@ -311,6 +314,7 @@ var Capabilities = {
   // API Calls Rate Limiting
   RATELIMIT_USERSAYS_MAXCONCURRENT: 'RATELIMIT_USERSAYS_MAXCONCURRENT',
   RATELIMIT_USERSAYS_MINTIME: 'RATELIMIT_USERSAYS_MINTIME',
+  RATELIMIT_BOTTLENECK_FN: 'RATELIMIT_BOTTLENECK_FN',
   SECURITY_ALLOW_UNSAFE: 'SECURITY_ALLOW_UNSAFE',
   PRECOMPILERS: 'PRECOMPILERS'
 };
@@ -422,6 +426,7 @@ Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER;
 Capabilities.SCRIPTING_NORMALIZE_TEXT;
 Capabilities.SCRIPTING_ENABLE_MEMORY;
 Capabilities.SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS;
+Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS;
 Capabilities.SCRIPTING_FORCE_BOT_CONSUMED;
 Capabilities.SCRIPTING_MATCHING_MODE;
 Capabilities.SCRIPTING_UTTEXPANSION_MODE;
@@ -432,6 +437,7 @@ Capabilities.SCRIPTING_UTTEXPANSION_NAMING_MODE;
 Capabilities.SCRIPTING_UTTEXPANSION_NAMING_UTTERANCE_MAX;
 Capabilities.SCRIPTING_MEMORYEXPANSION_KEEP_ORIG;
 Capabilities.SCRIPTING_MEMORY_MATCHING_MODE;
+Capabilities.SCRIPTING_MEMORY_COLUMN_MODE;
 Capabilities.CUSTOMHOOK_ONBUILD;
 Capabilities.CUSTOMHOOK_ONSTART;
 Capabilities.CUSTOMHOOK_ONUSERSAYS;
@@ -443,6 +449,7 @@ Capabilities.LOGIC_HOOKS;
 Capabilities.USER_INPUTS;
 Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT;
 Capabilities.RATELIMIT_USERSAYS_MINTIME;
+Capabilities.RATELIMIT_BOTTLENECK_FN;
 Capabilities.SECURITY_ALLOW_UNSAFE;
 Capabilities.PRECOMPILERS;
 
@@ -510,6 +517,7 @@ var Defaults$1 = {
     [Capabilities.SCRIPTING_UTTEXPANSION_NAMING_MODE]: 'justLineTag',
     [Capabilities.SCRIPTING_UTTEXPANSION_NAMING_UTTERANCE_MAX]: '16',
     [Capabilities.SCRIPTING_MEMORYEXPANSION_KEEP_ORIG]: false,
+    [Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS]: false,
     [Capabilities.SCRIPTING_FORCE_BOT_CONSUMED]: false,
     [Capabilities.ASSERTERS]: [],
     [Capabilities.LOGIC_HOOKS]: [],
@@ -831,7 +839,7 @@ function getCjsExportFromNamespace (n) {
 	return n && n['default'] || n;
 }
 
-const BotiumError$6 = class BotiumError extends Error {
+const BotiumError$7 = class BotiumError extends Error {
   /**
    *
    * @param message
@@ -856,6 +864,27 @@ const BotiumError$6 = class BotiumError extends Error {
     this.context.message = message.message || message;
   }
 
+  isAsserterError() {
+    if (this.context) {
+      const errArr = lodash.isArray(this.context) ? this.context : [this.context];
+      const hasNotAsserterError = errArr.findIndex(errDetail => {
+        if (errDetail.type === 'list') {
+          if (errDetail.errors) {
+            return errDetail.errors.findIndex(e => e.type !== 'asserter') >= 0;
+          } else {
+            return true;
+          }
+        } else {
+          return errDetail.type !== 'asserter';
+        }
+      }) >= 0;
+      if (hasNotAsserterError) return false;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   prettify(includeJson) {
     const lines = [];
 
@@ -917,10 +946,10 @@ const _getChildErrorsFromContext = context => {
 };
 
 const botiumErrorFromErr$2 = (message, err) => {
-  if (err instanceof BotiumError$6) {
-    return new BotiumError$6(message, err.context, true);
+  if (err instanceof BotiumError$7) {
+    return new BotiumError$7(message, err.context, true);
   } else {
-    return new BotiumError$6(message, {
+    return new BotiumError$7(message, {
       err
     }, true);
   }
@@ -935,7 +964,7 @@ const botiumErrorFromList$2 = (errors, {
   let children = [];
 
   for (const error of errors) {
-    if (error instanceof BotiumError$6) {
+    if (error instanceof BotiumError$7) {
       const childErrors = flat && _getChildErrorsFromContext(error.context);
 
       if (childErrors && childErrors.length) {
@@ -948,7 +977,7 @@ const botiumErrorFromList$2 = (errors, {
     }
   }
 
-  const result = new BotiumError$6(message, {
+  const result = new BotiumError$7(message, {
     errors: children,
     type,
     source
@@ -957,7 +986,7 @@ const botiumErrorFromList$2 = (errors, {
 };
 
 var BotiumError_1 = {
-  BotiumError: BotiumError$6,
+  BotiumError: BotiumError$7,
   botiumErrorFromErr: botiumErrorFromErr$2,
   botiumErrorFromList: botiumErrorFromList$2
 };
@@ -1138,7 +1167,7 @@ const {
 } = vm2;
 const debug$k = debug$l('botium-core-asserterUtils');
 const {
-  BotiumError: BotiumError$5
+  BotiumError: BotiumError$6
 } = BotiumError_1;
 const {
   DEFAULT_ASSERTERS,
@@ -1289,7 +1318,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
 
     const _checkUnsafe = () => {
       if (!this.caps[Capabilities.SECURITY_ALLOW_UNSAFE]) {
-        throw new BotiumError$5('Security Error. Using unsafe component is not allowed', {
+        throw new BotiumError$6('Security Error. Using unsafe component is not allowed', {
           type: 'security',
           subtype: 'allow unsafe',
           source: path.basename(__filename),
@@ -1433,6 +1462,11 @@ var LogicHookUtils_1 = class LogicHookUtils {
             ref,
             ...this.buildScriptContext
           }, this.caps, args);
+        } else if (lodash.isFunction(CheckClass.PluginClass)) {
+          return CheckClass.PluginClass({
+            ref,
+            ...this.buildScriptContext
+          }, this.caps, args);
         } else {
           throw new Error(`${src} class or function expected`);
         }
@@ -1688,6 +1722,18 @@ var BotiumMockMessage_1 = class BotiumMockMessage {
 
 };
 
+var Enums = {
+  E_SCRIPTING_MEMORY_COLUMN_MODE: {
+    VARNAMES: 'varnames',
+    TESTCASENAMES: 'testcasenames'
+  }
+};
+Enums.E_SCRIPTING_MEMORY_COLUMN_MODE;
+
+const {
+  E_SCRIPTING_MEMORY_COLUMN_MODE: E_SCRIPTING_MEMORY_COLUMN_MODE$1
+} = Enums;
+
 const normalizeText$1 = (str, doCleanup) => {
   if (str && lodash.isArray(str)) {
     str = str.join(' ');
@@ -2216,6 +2262,71 @@ const convoStepToLines$2 = step => {
   return lines.map(l => l.trim());
 };
 
+const linesToScriptingMemories$2 = (lines, columnMode = null) => {
+  const guessScriptingMemoryColumnMode = lines => {
+    if (lines && lines.length > 1) {
+      if (lines[1].trim().startsWith('$')) return E_SCRIPTING_MEMORY_COLUMN_MODE$1.TESTCASENAMES;
+    }
+
+    return E_SCRIPTING_MEMORY_COLUMN_MODE$1.VARNAMES;
+  };
+
+  columnMode = columnMode || guessScriptingMemoryColumnMode(lines);
+  const scriptingMemories = [];
+
+  if (columnMode === E_SCRIPTING_MEMORY_COLUMN_MODE$1.TESTCASENAMES) {
+    const caseNames = lines[0].split('|').map(name => name.trim()).slice(1);
+    const varNames = [];
+    const varValues = [];
+
+    for (let row = 1; row < lines.length; row++) {
+      if (!lines[row] || lines[row].length === 0) continue;
+      const rawRow = lines[row].split('|').map(name => name.trim());
+      varNames.push(rawRow[0]);
+      varValues.push(rawRow.slice(1));
+    }
+
+    for (let caseIndex = 0; caseIndex < caseNames.length; caseIndex++) {
+      const caseName = caseNames[caseIndex];
+      const values = varNames.reduce((agg, varName, varIndex) => {
+        agg[varName] = varValues[varIndex][caseIndex] || null;
+        return agg;
+      }, {});
+      const scriptingMemory = {
+        header: {
+          name: caseName
+        },
+        values: values
+      };
+      scriptingMemories.push(scriptingMemory);
+    }
+  } else {
+    const varNames = lines[0].split('|').map(name => name.trim()).slice(1);
+
+    for (let row = 1; row < lines.length; row++) {
+      if (!lines[row] || lines[row].length === 0) continue;
+      const rawRow = lines[row].split('|').map(name => name.trim());
+      const caseName = rawRow[0];
+      const values = rawRow.slice(1);
+      const varValues = {};
+
+      for (let varIndex = 0; varIndex < varNames.length; varIndex++) {
+        varValues[varNames[varIndex]] = values[varIndex];
+      }
+
+      const scriptingMemory = {
+        header: {
+          name: caseName
+        },
+        values: varValues
+      };
+      scriptingMemories.push(scriptingMemory);
+    }
+  }
+
+  return scriptingMemories;
+};
+
 var helper = {
   normalizeText: normalizeText$1,
   splitStringInNonEmptyLines: splitStringInNonEmptyLines$1,
@@ -2228,7 +2339,8 @@ var helper = {
   convoStepToObject: convoStepToObject$1,
   validSenders: validSenders$3,
   validateSender: validateSender$1,
-  validateConvo: validateConvo$2
+  validateConvo: validateConvo$2,
+  linesToScriptingMemories: linesToScriptingMemories$2
 };
 
 const debug$j = debug$l('botium-core-ScriptingMemory');
@@ -2243,7 +2355,7 @@ const {
   toString: toString$2
 } = helper;
 const {
-  BotiumError: BotiumError$4
+  BotiumError: BotiumError$5
 } = BotiumError_1; // If they got parameter, then it will be a string always.
 // the receiver can decide what to do with it,
 // convert to int,
@@ -2412,7 +2524,7 @@ const SCRIPTING_FUNCTIONS$1 = lodash.mapValues(SCRIPTING_FUNCTIONS_RAW, (funcOrS
   return {
     handler: (caps, ...rest) => {
       if (!caps[Capabilities.SECURITY_ALLOW_UNSAFE] && funcOrStruct.unsafe) {
-        throw new BotiumError$4(`Security Error. Using unsafe scripting memory function ${name} is not allowed`, {
+        throw new BotiumError$5(`Security Error. Using unsafe scripting memory function ${name} is not allowed`, {
           type: 'security',
           subtype: 'allow unsafe',
           source: path.basename(__filename),
@@ -2561,7 +2673,7 @@ ScriptingMemory.SCRIPTING_FUNCTIONS;
 
 const debug$i = debug$l('botium-core-Convo');
 const {
-  BotiumError: BotiumError$3,
+  BotiumError: BotiumError$4,
   botiumErrorFromErr: botiumErrorFromErr$1,
   botiumErrorFromList: botiumErrorFromList$1
 } = BotiumError_1;
@@ -2601,7 +2713,9 @@ class ConvoStepAssert {
   }
 
   toString() {
-    return (this.optional ? '?' : '') + (this.not ? '!' : '') + this.name + '(' + (this.args ? this.args.join(',') : 'no args') + ')';
+    return (this.optional ? '?' : '') + (this.not ? '!' : '') + this.name + '(' + (this.args ? this.args.map(a => lodash.truncate(a, {
+      length: 200
+    })).join(',') : 'no args') + ')';
   }
 
 }
@@ -2613,7 +2727,9 @@ class ConvoStepLogicHook {
   }
 
   toString() {
-    return this.name + '(' + (this.args ? this.args.join(',') : 'no args') + ')';
+    return this.name + '(' + (this.args ? this.args.map(a => lodash.truncate(a, {
+      length: 200
+    })).join(',') : 'no args') + ')';
   }
 
 }
@@ -2625,7 +2741,9 @@ class ConvoStepUserInput {
   }
 
   toString() {
-    return this.name + '(' + (this.args ? this.args.join(',') : 'no args') + ')';
+    return this.name + '(' + (this.args ? this.args.map(a => lodash.truncate(a, {
+      length: 200
+    })).join(',') : 'no args') + ')';
   }
 
 }
@@ -3090,7 +3208,7 @@ class Convo$6 {
             }
 
             if (!botMsg || !botMsg.messageText && !botMsg.media && !botMsg.buttons && !botMsg.cards && !botMsg.sourceData && !botMsg.nlp) {
-              const failErr = new BotiumError$3(`${this.header.name}/${convoStep.stepTag}: bot says nothing`);
+              const failErr = new BotiumError$4(`${this.header.name}/${convoStep.stepTag}: bot says nothing`);
               debug$i(failErr);
 
               try {
@@ -3193,7 +3311,7 @@ class Convo$6 {
                 this.scriptingEvents.fail && this.scriptingEvents.fail(failErr, lastMeConvoStep);
               } catch (failErr) {}
 
-              if (container.caps[Capabilities.SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS] && err instanceof BotiumError$3) {
+              if (container.caps[Capabilities.SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS] && err instanceof BotiumError$4) {
                 assertErrors.push(err);
               } else {
                 throw failErr;
@@ -3210,7 +3328,7 @@ class Convo$6 {
               }
             }
           } else {
-            const failErr = new BotiumError$3(`${this.header.name}/${convoStep.stepTag}: invalid sender - ${util.inspect(convoStep.sender)}`);
+            const failErr = new BotiumError$4(`${this.header.name}/${convoStep.stepTag}: invalid sender - ${util.inspect(convoStep.sender)}`);
             debug$i(failErr);
 
             try {
@@ -3221,7 +3339,7 @@ class Convo$6 {
           }
         } catch (err) {
           if (lastMeConvoStep) {
-            if (err instanceof BotiumError$3 && err.context) {
+            if (err instanceof BotiumError$4 && err.context) {
               err.context.input = new ConvoStep$1(lastMeConvoStep);
               err.context.transcript = [...transcriptSteps, { ...transcriptStep
               }];
@@ -3233,7 +3351,14 @@ class Convo$6 {
           }
 
           transcriptStep.err = err;
-          throw err;
+
+          if (err instanceof BotiumError$4 && container.caps[Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS]) {
+            if (!err.isAsserterError()) {
+              throw err;
+            }
+          } else {
+            throw err;
+          }
         } finally {
           if (convoStep.sender !== 'begin' && convoStep.sender !== 'end' && !skipTranscriptStep) {
             transcriptStep.scriptingMemory = Object.assign({}, scriptingMemory);
@@ -3248,6 +3373,14 @@ class Convo$6 {
       transcript.steps = transcriptSteps.filter(s => s);
       transcript.scriptingMemory = scriptingMemory;
       transcript.convoEnd = new Date();
+
+      if (container.caps[Capabilities.SCRIPTING_ENABLE_SKIP_ASSERT_ERRORS]) {
+        const transcriptStepErrs = transcript.steps.filter(s => s.err).map(s => s.err);
+
+        if (transcriptStepErrs && transcriptStepErrs.length > 0) {
+          transcript.err = botiumErrorFromList$1([transcriptStepErrs, transcript.err].filter(e => e), {});
+        }
+      }
     }
   }
 
@@ -3256,11 +3389,11 @@ class Convo$6 {
 
     if (lodash.isArray(expected)) {
       if (!lodash.isArray(result)) {
-        throw new BotiumError$3(`${this.header.name}/${convoStep.stepTag}: bot response expected array, got "${result}"`);
+        throw new BotiumError$4(`${this.header.name}/${convoStep.stepTag}: bot response expected array, got "${result}"`);
       }
 
       if (expected.length !== result.length) {
-        throw new BotiumError$3(`${this.header.name}/${convoStep.stepTag}: bot response expected array length ${expected.length}, got ${result.length}`);
+        throw new BotiumError$4(`${this.header.name}/${convoStep.stepTag}: bot response expected array length ${expected.length}, got ${result.length}`);
       }
 
       for (let i = 0; i < expected.length; i++) {
@@ -3271,7 +3404,7 @@ class Convo$6 {
         if (Object.prototype.hasOwnProperty.call(result, key)) {
           this._compareObject(container, scriptingMemory, convoStep, result[key], expected[key]);
         } else {
-          throw new BotiumError$3(`${this.header.name}/${convoStep.stepTag}: bot response "${result}" missing expected property: ${key}`);
+          throw new BotiumError$4(`${this.header.name}/${convoStep.stepTag}: bot response "${result}" missing expected property: ${key}`);
         }
       });
     } else {
@@ -3399,17 +3532,17 @@ class Convo$6 {
           const alreadyThereAt = parentPConvos.indexOf(includeLogicHook);
 
           if (alreadyThereAt >= 0) {
-            throw new BotiumError$3(`Partial convos are included circular. "${includeLogicHook}" is referenced by "/${parentPConvos.slice(0, alreadyThereAt).join('/')}" and by "/${parentPConvos.join('/')}" `);
+            throw new BotiumError$4(`Partial convos are included circular. "${includeLogicHook}" is referenced by "/${parentPConvos.slice(0, alreadyThereAt).join('/')}" and by "/${parentPConvos.join('/')}" `);
           }
 
           if (!partialConvos || Object.keys(partialConvos).length === 0) {
-            throw new BotiumError$3(`Cant find partial convo with name ${includeLogicHook} (There are no partial convos)`);
+            throw new BotiumError$4(`Cant find partial convo with name ${includeLogicHook} (There are no partial convos)`);
           }
 
           const partialConvo = partialConvos[includeLogicHook];
 
           if (!partialConvo) {
-            throw new BotiumError$3(`Cant find partial convo with name ${includeLogicHook} (available partial convos: ${Object.keys(partialConvos).join(',')})`);
+            throw new BotiumError$4(`Cant find partial convo with name ${includeLogicHook} (available partial convos: ${Object.keys(partialConvos).join(',')})`);
           }
 
           _getEffectiveConversationRecursive(partialConvo.conversation, [...parentPConvos, includeLogicHook], result, true);
@@ -3791,7 +3924,7 @@ const {
 } = vm2;
 const debug$h = debug$l('botium-core-HookUtils');
 const {
-  BotiumError: BotiumError$2
+  BotiumError: BotiumError$3
 } = BotiumError_1;
 
 const executeHook$2 = async (caps, hook, args) => {
@@ -3863,7 +3996,7 @@ const getHook$3 = (caps, data) => {
 
     if (resultWithRequire) {
       if (!allowUnsafe) {
-        throw new BotiumError$2('Security Error. Using unsafe custom hook with require is not allowed', {
+        throw new BotiumError$3('Security Error. Using unsafe custom hook with require is not allowed', {
           type: 'security',
           subtype: 'allow unsafe',
           source: path.basename(__filename),
@@ -4318,6 +4451,9 @@ var Utterance_1 = class Utterance {
 };
 
 const debug$d = debug$l('botium-core-CompilerXlsx');
+const {
+  E_SCRIPTING_MEMORY_COLUMN_MODE
+} = Enums;
 const {
   Convo: Convo$5
 } = Convo_1;
@@ -4630,49 +4766,120 @@ var CompilerXlsx_1 = class CompilerXlsx extends CompilerBase_1 {
       }
 
       if (scriptType === Constants.SCRIPTING_TYPE_SCRIPTING_MEMORY) {
-        const variableNames = [];
-        let colindexTemp = colindex + 1;
-
-        while (true) {
-          const variableNameCell = this.colnames[colindexTemp] + rowindex;
+        const guessScriptingMemoryColumnMode = () => {
+          const line1Cell = this.colnames[colindex] + (rowindex + 1);
 
-          if (sheet[variableNameCell] && sheet[variableNameCell].v) {
-            variableNames.push(sheet[variableNameCell].v);
-          } else {
-            break;
+          if (sheet[line1Cell] && sheet[line1Cell].v) {
+            if (sheet[line1Cell].v.startsWith('$')) return E_SCRIPTING_MEMORY_COLUMN_MODE.TESTCASENAMES;
           }
 
-          colindexTemp++;
-        }
+          return E_SCRIPTING_MEMORY_COLUMN_MODE.VARNAMES;
+        };
 
-        rowindex += 1;
+        const columnMode = this.caps[Capabilities.SCRIPTING_MEMORY_COLUMN_MODE] || guessScriptingMemoryColumnMode();
 
-        while (true) {
-          const caseNameCell = this.colnames[colindex] + rowindex;
+        if (columnMode === E_SCRIPTING_MEMORY_COLUMN_MODE.TESTCASENAMES) {
+          const caseNames = [];
+          let colindexTemp = colindex + 1;
 
-          if (sheet[caseNameCell] && sheet[caseNameCell].v) {
-            const caseName = sheet[caseNameCell].v;
-            const values = {};
+          while (true) {
+            const caseNameCell = this.colnames[colindexTemp] + rowindex;
 
-            for (let i = 0; i < variableNames.length; i++) {
-              const variableValueCell = this.colnames[colindex + 1 + i] + rowindex;
+            if (sheet[caseNameCell] && sheet[caseNameCell].v) {
+              caseNames.push(sheet[caseNameCell].v);
+            } else {
+              break;
+            }
 
-              if (sheet[variableValueCell] && sheet[variableValueCell].v) {
-                values[variableNames[i]] = sheet[variableValueCell].v.toString();
-              } else {
-                values[variableNames[i]] = null;
+            colindexTemp++;
+          }
+
+          const varNames = [];
+          const varValues = [];
+          rowindex += 1;
+
+          while (true) {
+            const varNameCell = this.colnames[colindex] + rowindex;
+
+            if (sheet[varNameCell] && sheet[varNameCell].v) {
+              varNames.push(sheet[varNameCell].v);
+              const values = [];
+
+              for (let i = 0; i < caseNames.length; i++) {
+                const variableValueCell = this.colnames[colindex + 1 + i] + rowindex;
+
+                if (sheet[variableValueCell] && sheet[variableValueCell].v) {
+                  values.push(sheet[variableValueCell].v.toString());
+                } else {
+                  values.push(null);
+                }
               }
+
+              varValues.push(values);
+              rowindex += 1;
+            } else {
+              break;
             }
+          }
 
-            rowindex += 1;
+          for (let caseIndex = 0; caseIndex < caseNames.length; caseIndex++) {
+            const caseName = caseNames[caseIndex];
+            const values = varNames.reduce((agg, varName, varIndex) => {
+              agg[varName] = varValues[varIndex][caseIndex] || null;
+              return agg;
+            }, {});
             scriptResults.push({
               header: {
                 name: caseName
               },
               values: values
             });
-          } else {
-            break;
+          }
+        } else {
+          const variableNames = [];
+          let colindexTemp = colindex + 1;
+
+          while (true) {
+            const variableNameCell = this.colnames[colindexTemp] + rowindex;
+
+            if (sheet[variableNameCell] && sheet[variableNameCell].v) {
+              variableNames.push(sheet[variableNameCell].v);
+            } else {
+              break;
+            }
+
+            colindexTemp++;
+          }
+
+          rowindex += 1;
+
+          while (true) {
+            const caseNameCell = this.colnames[colindex] + rowindex;
+
+            if (sheet[caseNameCell] && sheet[caseNameCell].v) {
+              const caseName = sheet[caseNameCell].v;
+              const values = {};
+
+              for (let i = 0; i < variableNames.length; i++) {
+                const variableValueCell = this.colnames[colindex + 1 + i] + rowindex;
+
+                if (sheet[variableValueCell] && sheet[variableValueCell].v) {
+                  values[variableNames[i]] = sheet[variableValueCell].v.toString();
+                } else {
+                  values[variableNames[i]] = null;
+                }
+              }
+
+              rowindex += 1;
+              scriptResults.push({
+                header: {
+                  name: caseName
+                },
+                values: values
+              });
+            } else {
+              break;
+            }
           }
         }
       }
@@ -4832,7 +5039,8 @@ const {
   linesToConvoStep: linesToConvoStep$3,
   convoStepToLines,
   validateConvo,
-  validSenders: validSenders$2
+  validSenders: validSenders$2,
+  linesToScriptingMemories: linesToScriptingMemories$1
 } = helper;
 var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   constructor(context, caps = {}) {
@@ -4963,30 +5171,12 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
 
   _compileScriptingMemory(lines) {
     if (lines && lines.length > 1) {
-      const names = lines[0].split('|').map(name => name.trim()).slice(1);
-      const scriptingMemories = [];
-
-      for (let row = 1; row < lines.length; row++) {
-        if (!lines[row] || lines[row].length === 0) continue;
-        const rawRow = lines[row].split('|').map(name => name.trim());
-        const caseName = rawRow[0];
-        const values = rawRow.slice(1);
-        const json = {};
+      const scriptingMemories = linesToScriptingMemories$1(lines, this.caps[Capabilities.SCRIPTING_MEMORY_COLUMN_MODE]);
 
-        for (let col = 0; col < names.length; col++) {
-          json[names[col]] = values[col];
-        }
-
-        const scriptingMemory = {
-          header: {
-            name: caseName
-          },
-          values: json
-        };
-        scriptingMemories.push(scriptingMemory);
+      if (scriptingMemories && scriptingMemories.length > 0) {
+        this.context.AddScriptingMemories(scriptingMemories);
       }
 
-      this.context.AddScriptingMemories(scriptingMemories);
       return scriptingMemories;
     }
   }
@@ -5030,6 +5220,9 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
 
 };
 
+const {
+  parse
+} = sync;
 const debug$c = debug$l('botium-core-CompilerCsv');
 const {
   Convo: Convo$3
@@ -5102,7 +5295,7 @@ var CompilerCsv_1 = class CompilerCsv extends CompilerBase_1 {
     let rows;
 
     try {
-      rows = sync(scriptData, {
+      rows = parse(scriptData, {
         delimiter,
         escape: this.caps[Capabilities.SCRIPTING_CSV_ESCAPE],
         quote: this.caps[Capabilities.SCRIPTING_CSV_QUOTE],
@@ -5241,7 +5434,8 @@ const {
 } = Convo_1;
 const {
   linesToConvoStep: linesToConvoStep$1,
-  validSenders: validSenders$1
+  validSenders: validSenders$1,
+  linesToScriptingMemories
 } = helper;
 var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
   constructor(context, caps = {}) {
@@ -5350,29 +5544,12 @@ var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
     if (lines && lines.length > 0) {
       if (lodash.isString(lines[0])) {
         if (lines.length > 1) {
-          const names = lines[0].split('|').map(name => name.trim()).slice(1);
-          const scriptingMemories = [];
+          const scriptingMemories = linesToScriptingMemories(lines, this.caps[Capabilities.SCRIPTING_MEMORY_COLUMN_MODE]);
 
-          for (let row = 1; row < lines.length; row++) {
-            const rawRow = lines[row].split('|').map(name => name.trim());
-            const caseName = rawRow[0];
-            const values = rawRow.slice(1);
-            const json = {};
-
-            for (let col = 0; col < names.length; col++) {
-              json[names[col]] = values[col];
-            }
-
-            const scriptingMemory = {
-              header: {
-                name: caseName
-              },
-              values: json
-            };
-            scriptingMemories.push(scriptingMemory);
+          if (scriptingMemories && scriptingMemories.length > 0) {
+            this.context.AddScriptingMemories(scriptingMemories);
           }
 
-          this.context.AddScriptingMemories(scriptingMemories);
           return scriptingMemories;
         }
       } else {
@@ -5565,7 +5742,7 @@ const {
   ConvoStep
 } = Convo_1;
 const {
-  BotiumError: BotiumError$1,
+  BotiumError: BotiumError$2,
   botiumErrorFromList,
   botiumErrorFromErr
 } = BotiumError_1;
@@ -5845,7 +6022,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
           message += ' expected to match ';
           message += tomatch && tomatch.length > 1 ? 'one of ' : '';
           message += `${tomatch.map(e => e ? '"' + e + '"' : '<any response>').join(', ')}`;
-          throw new BotiumError$1(message, {
+          throw new BotiumError$2(message, {
             type: 'asserter',
             source: 'TextMatchAsserter',
             context: {
@@ -5875,7 +6052,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
           message += ' expected NOT to match ';
           message += nottomatch && nottomatch.length > 1 ? 'one of ' : '';
           message += `${nottomatch.map(e => e ? '"' + e + '"' : '<any response>').join(', ')}`;
-          throw new BotiumError$1(message, {
+          throw new BotiumError$2(message, {
             type: 'asserter',
             source: 'TextMatchAsserter',
             context: {
@@ -5922,7 +6099,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
         if (asserter[notAsserterType]) {
           return p(this.retryHelperAsserter, () => asserter[notAsserterType](params));
         } else {
-          return pnot(this.retryHelperAsserter, () => asserter[asserterType](params), new BotiumError$1(`${convoStep.stepTag}: Expected asserter ${asserter.name || asserterSpec.name} with args "${params.args}" to fail`, {
+          return pnot(this.retryHelperAsserter, () => asserter[asserterType](params), new BotiumError$2(`${convoStep.stepTag}: Expected asserter ${asserter.name || asserterSpec.name} with args "${params.args}" to fail`, {
             type: 'asserter',
             source: asserter.name || asserterSpec.name,
             params: {
@@ -6356,7 +6533,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
     });
 
     if (aggregatedNoNames.length) {
-      throw new BotiumError$1('Scripting Memory Definition(s) without name', {
+      throw new BotiumError$2('Scripting Memory Definition(s) without name', {
         type: 'Scripting Memory',
         subtype: 'Scripting Memory without name',
         source: 'ScriptingProvider',
@@ -6372,7 +6549,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
     });
 
     if (aggregatedNoVariables.length) {
-      throw new BotiumError$1(`Scripting Memory Definition(s) ${aggregatedNoVariables.map(e => e.header.name).join(', ')} without variable`, {
+      throw new BotiumError$2(`Scripting Memory Definition(s) ${aggregatedNoVariables.map(e => e.header.name).join(', ')} without variable`, {
         type: 'Scripting Memory',
         subtype: 'Scripting Memory without variable',
         source: 'ScriptingProvider',
@@ -6388,7 +6565,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
     });
 
     if (aggregatedNoVariableNames.length) {
-      throw new BotiumError$1(`Scripting Memory Definition(s) ${aggregatedNoVariableNames.map(e => e.header.name).join(', ')} without variable name`, {
+      throw new BotiumError$2(`Scripting Memory Definition(s) ${aggregatedNoVariableNames.map(e => e.header.name).join(', ')} without variable name`, {
         type: 'Scripting Memory',
         subtype: 'Scripting Memory without variable name',
         source: 'ScriptingProvider',
@@ -6420,7 +6597,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
     }
 
     if (aggregatedDuplicates.length) {
-      throw new BotiumError$1(`Scripting Memory Definition name(s) "${lodash.uniq(aggregatedDuplicates.map(d => d.scriptingMemory.header.name)).join(', ')}" are not unique`, {
+      throw new BotiumError$2(`Scripting Memory Definition name(s) "${lodash.uniq(aggregatedDuplicates.map(d => d.scriptingMemory.header.name)).join(', ')}" are not unique`, {
         type: 'Scripting Memory',
         subtype: 'Scripting Memory name collision',
         source: 'ScriptingProvider',
@@ -6457,7 +6634,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
     }
 
     if (aggregatedIntersections.length) {
-      throw new BotiumError$1(`Scripting Memory Definitions "${aggregatedIntersections.map(i => i.scriptingMemory.header.name).join(', ')}" are invalid because variable name collision"`, {
+      throw new BotiumError$2(`Scripting Memory Definitions "${aggregatedIntersections.map(i => i.scriptingMemory.header.name).join(', ')}" are invalid because variable name collision"`, {
         type: 'Scripting Memory',
         subtype: 'Scripting Memory variable name collision',
         source: 'ScriptingProvider',
@@ -6546,6 +6723,8 @@ var ScriptingProvider_1 = class ScriptingProvider {
 
     debug$9(`ExpandScriptingMemoryToConvos - ${convosExpandedAll.length} convo expanded, added to convos (${this.convos.length}). Result ${convosExpandedAll.length + this.convos.length} convo`);
     this.convos = this.convos.concat(convosExpandedAll);
+
+    this._sortConvos();
   }
 
   ExpandUtterancesToConvos({
@@ -6585,6 +6764,9 @@ var ScriptingProvider_1 = class ScriptingProvider {
         },
         conversation: [{
           sender: 'me',
+          logicHooks: [{
+            name: 'SKIP_BOT_UNCONSUMED'
+          }],
           messageText: utt.name,
           stepTag: 'Step 1 - tell utterance'
         }, useNameAsIntent ? {
@@ -6900,7 +7082,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
       }
     } else if (scriptingMemories) {
       if (!scriptingMemories.header || !scriptingMemories.header.name) {
-        throw new BotiumError$1('Scripting Memory Definition has no name', {
+        throw new BotiumError$2('Scripting Memory Definition has no name', {
           type: 'Compiler',
           subtype: 'Scripting memory without name',
           source: 'ScriptingProvider',
@@ -6911,7 +7093,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
       }
 
       if (!scriptingMemories.values || !Object.keys(scriptingMemories.values).length) {
-        throw new BotiumError$1('Scripting Memory Definition has no variables', {
+        throw new BotiumError$2('Scripting Memory Definition has no variables', {
           type: 'Compiler',
           subtype: 'Scripting memory without variable',
           source: 'ScriptingProvider',
@@ -6922,7 +7104,7 @@ var ScriptingProvider_1 = class ScriptingProvider {
       }
 
       if (scriptingMemories.values && !lodash.isUndefined(scriptingMemories.values[''])) {
-        throw new BotiumError$1('Scripting Memory Definition variable has no name', {
+        throw new BotiumError$2('Scripting Memory Definition variable has no name', {
           type: 'Compiler',
           subtype: 'Scripting memory without variable name',
           source: 'ScriptingProvider',
@@ -7357,7 +7539,7 @@ var BaseContainer_1 = class BaseContainer {
     this.tempDirectory = tempDirectory;
     this.cleanupTasks = [];
     this.queues = {};
-    this.userSaysLimiter = null;
+    this.bottleneck = null;
   }
 
   Validate() {
@@ -7367,18 +7549,33 @@ var BaseContainer_1 = class BaseContainer {
     this.onBotResponseHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONBOTRESPONSE]);
     this.onStopHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONSTOP]);
     this.onCleanHook = getHook$1(this.caps, this.caps[Capabilities.CUSTOMHOOK_ONCLEAN]);
-    return Promise.resolve();
-  }
 
-  Build() {
-    if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT] || this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) {
+    if (this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN]) {
+      if (lodash.isFunction(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN])) {
+        this.bottleneck = this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN];
+        debug$7('Validate: Applying userSays rate limits from capability');
+      } else {
+        const limiter = new bottleneck(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN]);
+
+        this.bottleneck = fn => limiter.schedule(fn);
+
+        debug$7(`Validate: Applying userSays rate limits ${util.inspect(this.caps[Capabilities.RATELIMIT_BOTTLENECK_FN])}`);
+      }
+    } else if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT] || this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) {
       const opts = {};
       if (this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT]) opts.maxConcurrent = this.caps[Capabilities.RATELIMIT_USERSAYS_MAXCONCURRENT];
       if (this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME]) opts.minTime = this.caps[Capabilities.RATELIMIT_USERSAYS_MINTIME];
-      this.userSaysLimiter = new bottleneck(opts);
-      debug$7(`Build: Applying userSays rate limits ${util.inspect(opts)}`);
+      const limiter = new bottleneck(opts);
+
+      this.bottleneck = fn => limiter.schedule(fn);
+
+      debug$7(`Validate: Applying userSays rate limits ${util.inspect(opts)}`);
     }
 
+    return Promise.resolve();
+  }
+
+  Build() {
     return new Promise((resolve, reject) => {
       this._RunCustomHook('onBuild', this.onBuildHook).then(() => resolve(this)).catch(err => reject(err));
     });
@@ -7404,8 +7601,8 @@ var BaseContainer_1 = class BaseContainer {
       meMsg
     }).then(() => this.UserSaysImpl(meMsg));
 
-    if (this.userSaysLimiter) {
-      return this.userSaysLimiter.schedule(run);
+    if (this.bottleneck) {
+      return this.bottleneck(run);
     } else {
       return run();
     }
@@ -7884,16 +8081,23 @@ const {
 const {
   escapeJSONString
 } = Utils;
+const {
+  BotiumError: BotiumError$1
+} = BotiumError_1;
 
 mustache.escape = s => s;
 
 var SimpleRestContainer_1 = class SimpleRestContainer {
   constructor({
     queueBotSays,
-    caps
+    caps,
+    bottleneck
   }) {
     this.queueBotSays = queueBotSays;
     this.caps = Object.assign({}, Defaults, caps);
+
+    this.bottleneck = bottleneck || (fn => fn());
+
     this.processInbound = false;
     this.redisTopic = this.caps[Capabilities.SIMPLEREST_REDIS_TOPIC] || 'SIMPLEREST_INBOUND_SUBSCRIPTION';
 
@@ -8268,6 +8472,22 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
         } else {
           if (response.statusCode >= 400) {
             debug$4(`got error response: ${response.statusCode}/${response.statusMessage}`);
+
+            if (debug$4.enabled && body) {
+              debug$4(Utils.shortenJsonString(body));
+            }
+
+            if (body) {
+              const jsonBody = Utils.toJsonWeak(body);
+              const errKey = Object.keys(jsonBody).find(k => k.startsWith('err') || k.startsWith('fail'));
+
+              if (errKey) {
+                return reject(new BotiumError$1(`got error response: ${response.statusCode}/${response.statusMessage} - ${jsonBody[errKey]}`, {
+                  message: Utils.shortenJsonString(body)
+                }));
+              }
+            }
+
             return reject(new Error(`got error response: ${response.statusCode}/${response.statusMessage}`));
           }
 
@@ -8365,6 +8585,16 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
       }
     }
 
+    if (msg.ADD_FORM_PARAM && Object.keys(msg.ADD_FORM_PARAM).length > 0) {
+      requestOptions.form = {};
+
+      for (const formKey of Object.keys(msg.ADD_FORM_PARAM)) {
+        const formValue = this._getMustachedVal(lodash.isString(msg.ADD_FORM_PARAM[formKey]) ? msg.ADD_FORM_PARAM[formKey] : JSON.stringify(msg.ADD_FORM_PARAM[formKey]), false);
+
+        requestOptions.form[formKey] = formValue;
+      }
+    }
+
     if (msg.ADD_HEADER && Object.keys(msg.ADD_HEADER).length > 0) {
       requestOptions.headers = requestOptions.headers || {};
 
@@ -8406,7 +8636,7 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
         err,
         response,
         body
-      } = await new Promise(resolve => {
+      } = await this.bottleneck(() => new Promise(resolve => {
         request(pingConfig, (err, response, body) => {
           resolve({
             err,
@@ -8414,16 +8644,26 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
             body
           });
         });
-      });
+      }));
 
       if (err) {
         debug$4(`_waitForUrlResponse error on url check ${pingConfig.uri}: ${err}`);
         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);
       } else {
-        debug$4(`_waitForUrlResponse success on url check ${pingConfig.uri}`);
+        debug$4(`_waitForUrlResponse success on url check ${pingConfig.uri}: ${response.statusCode}/${response.statusMessage}`);
+
+        if (debug$4.enabled && body) {
+          debug$4(Utils.shortenJsonString(body));
+        }
+
         return body;
       }
     }
@@ -8647,6 +8887,10 @@ var SimpleRestContainer_1 = class SimpleRestContainer {
         } else {
           if (response.statusCode >= 400) {
             debug$4(`_runPolling: got error response: ${response.statusCode}/${response.statusMessage}, request: ${JSON.stringify(pollConfig)}`);
+
+            if (debug$4.enabled && body) {
+              debug$4(Utils.shortenJsonString(body));
+            }
           } else if (body) {
             debug$4(`_runPolling: got response code: ${response.statusCode}, body: ${Utils.shortenJsonString(body)}`);
 
@@ -8924,6 +9168,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     this.pluginInstance = tryLoadPlugin(this.caps[Capabilities.CONTAINERMODE], this.caps[Capabilities.PLUGINMODULEPATH], {
       container: this,
       queueBotSays: msg => this._QueueBotSays(msg),
+      bottleneck: this.bottleneck,
       eventEmitter: this.eventEmitter,
       caps: this.caps,
       sources: this.sources,
@@ -9621,6 +9866,7 @@ var botiumCore = {
   ScriptingConstants: Constants,
   Capabilities: Capabilities,
   Defaults: Defaults$1,
+  Enums: Enums,
   Source: Source,
   Events: Events,
   Plugins: Plugins,
@@ -9640,16 +9886,17 @@ var botiumCore_2 = botiumCore.ScriptingProvider;
 var botiumCore_3 = botiumCore.ScriptingConstants;
 var botiumCore_4 = botiumCore.Capabilities;
 var botiumCore_5 = botiumCore.Defaults;
-var botiumCore_6 = botiumCore.Source;
-var botiumCore_7 = botiumCore.Events;
-var botiumCore_8 = botiumCore.Plugins;
-var botiumCore_9 = botiumCore.BotiumError;
-var botiumCore_10 = botiumCore.ScriptingMemory;
-var botiumCore_11 = botiumCore.HookUtils;
-var botiumCore_12 = botiumCore.LogicHookConstants;
-var botiumCore_13 = botiumCore.Lib;
-var botiumCore_14 = botiumCore.InboundProxy;
-var botiumCore_15 = botiumCore.BotiumMockRichMessageTypes;
-
-export { botiumCore_1 as BotDriver, botiumCore_9 as BotiumError, botiumCore_15 as BotiumMockRichMessageTypes, botiumCore_4 as Capabilities, botiumCore_5 as Defaults, botiumCore_7 as Events, botiumCore_11 as HookUtils, botiumCore_14 as InboundProxy, botiumCore_13 as Lib, botiumCore_12 as LogicHookConstants, botiumCore_8 as Plugins, botiumCore_3 as ScriptingConstants, botiumCore_10 as ScriptingMemory, botiumCore_2 as ScriptingProvider, botiumCore_6 as Source, botiumCore as default };
+var botiumCore_6 = botiumCore.Enums;
+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;
+
+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 };
 //# sourceMappingURL=botium-es.js.map