botium-core 1.14.5 → 1.14.7

package/dist/botium-es.js

@@ -35,7 +35,7 @@ import express from 'express';
 import bodyParser from 'body-parser';
 
 var name = "botium-core";
-var version$1 = "1.14.5";
+var version$1 = "1.14.7";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module = "dist/botium-es.js";
@@ -53,7 +53,7 @@ var scripts = {
 	link: "npm link botium-connector-dialogflow botium-connector-webdriverio botium-connector-directline3 botium-connector-watson botium-connector-alexa-smapi botium-connector-echo",
 	test: "cross-env NODE_PATH=\"./test/plugins/plugindir/fromfolder:./test/plugins/plugindir/fromfile:./test/security/resources\" mocha \"./test/**/*.spec.js\"",
 	"coverage:report": "nyc report --reporter=lcov npm test",
-	"update-dependencies": "npm-check-updates --reject globby,rollup -u --timeout 120000"
+	"update-dependencies": "npm-check-updates --reject chai,globby,rollup -u --timeout 120000"
 };
 var repository = {
 	type: "git",
@@ -66,7 +66,7 @@ var bugs = {
 };
 var homepage = "https://www.botium.ai";
 var dependencies = {
-	"@babel/runtime": "^7.23.5",
+	"@babel/runtime": "^7.23.9",
 	async: "^3.2.5",
 	"body-parser": "^1.20.2",
 	boolean: "^3.2.0",
@@ -83,8 +83,8 @@ var dependencies = {
 	"markdown-it": "^14.0.0",
 	"mime-types": "^2.1.35",
 	mkdirp: "^3.0.1",
-	moment: "^2.29.4",
-	"moment-timezone": "^0.5.43",
+	moment: "^2.30.1",
+	"moment-timezone": "^0.5.45",
 	mustache: "^4.2.0",
 	"promise-retry": "^2.0.1",
 	"promise.allsettled": "^1.0.7",
@@ -93,8 +93,8 @@ var dependencies = {
 	rimraf: "^5.0.5",
 	"sanitize-filename": "^1.6.3",
 	slugify: "^1.6.6",
-	"socket.io": "^4.7.2",
-	"socket.io-client": "^4.7.2",
+	"socket.io": "^4.7.4",
+	"socket.io-client": "^4.7.4",
 	"socketio-auth": "^0.1.1",
 	"swagger-jsdoc": "^6.2.8",
 	"swagger-ui-express": "^5.0.0",
@@ -106,23 +106,23 @@ var dependencies = {
 	yaml: "^2.3.4"
 };
 var devDependencies = {
-	"@babel/core": "^7.23.5",
-	"@babel/node": "^7.22.19",
-	"@babel/plugin-transform-runtime": "^7.23.4",
-	"@babel/preset-env": "^7.23.5",
-	chai: "^4.3.10",
+	"@babel/core": "^7.23.9",
+	"@babel/node": "^7.23.9",
+	"@babel/plugin-transform-runtime": "^7.23.9",
+	"@babel/preset-env": "^7.23.9",
+	chai: "4.3.10",
 	"chai-as-promised": "^7.1.1",
 	"cross-env": "^7.0.3",
-	eslint: "^8.55.0",
+	eslint: "^8.56.0",
 	"eslint-config-standard": "^17.1.0",
-	"eslint-plugin-import": "^2.29.0",
+	"eslint-plugin-import": "^2.29.1",
 	"eslint-plugin-mocha": "^10.2.0",
-	"eslint-plugin-n": "^16.4.0",
+	"eslint-plugin-n": "^16.6.2",
 	"eslint-plugin-promise": "^6.1.1",
 	"eslint-plugin-standard": "^4.1.0",
-	mocha: "^10.2.0",
-	nock: "^13.4.0",
-	"npm-check-updates": "^16.14.11",
+	mocha: "^10.3.0",
+	nock: "^13.5.1",
+	"npm-check-updates": "^16.14.15",
 	nyc: "^15.1.0",
 	rollup: "2.79.1",
 	"rollup-plugin-babel": "^4.4.0",
@@ -552,7 +552,6 @@ var Defaults$1 = {
     [Capabilities.SIMPLEREST_INBOUND_UPDATE_CONTEXT]: true,
     [Capabilities.SIMPLEREST_CONTEXT_MERGE_OR_REPLACE]: 'MERGE',
     [Capabilities.SIMPLEREST_COOKIE_REPLICATION]: true,
-    [Capabilities.SCRIPTING_TXT_EOL]: '\n',
     [Capabilities.SCRIPTING_XLSX_EOL_WRITE]: '\r\n',
     [Capabilities.SCRIPTING_XLSX_HASHEADERS]: true,
     [Capabilities.SCRIPTING_CSV_SKIP_HEADER]: true,
@@ -1605,7 +1604,7 @@ const _formatAppendArgs = args => {
 const _parseArgs = str => {
   return str && str.length > 0 && str.replace(/\\\|/g, '###ESCAPESPLIT###').split('|').map(s => s.replace(/###ESCAPESPLIT###/g, '|').trim()) || [];
 };
-const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false) => {
+const linesToConvoStep$5 = (lines, sender, context, eol = '\n', singleLineMode = false) => {
   if (!validateSender$1(sender)) throw new Error(`Failed to parse conversation. Section "${sender}" unknown.`);
   const convoStep = {
     asserters: [],
@@ -3591,8 +3590,10 @@ var RetryHelper_1 = class RetryHelper {
       debug$j(`Retry for ${section} is enabled. Settings: ${JSON.stringify(this.retrySettings)} Patterns: ${JSON.stringify(this.retryErrorPatterns.map(r => r.toString()))}`);
     }
   }
-  shouldRetry(err) {
+  shouldRetry(err, currentRetryCount) {
     if (!err) return false;
+    if (!this.retrySettings.retries) return false;
+    if (this.retrySettings.retries < currentRetryCount) return false;
     if (this.retryErrorPatterns.length === 0) return true;
     const errString = util.inspect(err);
     for (const re of this.retryErrorPatterns) {
@@ -4835,16 +4836,16 @@ const {
 var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
+    this.eolRead = caps[Capabilities.SCRIPTING_TXT_EOL] || /\r\n|\r|\n/;
+    this.eolWrite = caps[Capabilities.SCRIPTING_TXT_EOL] && !lodash.isRegExp(caps[Capabilities.SCRIPTING_TXT_EOL]) ? caps[Capabilities.SCRIPTING_TXT_EOL] : '\n';
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   GetHeaders(scriptBuffer) {
     let scriptData = scriptBuffer;
     if (Buffer.isBuffer(scriptBuffer)) scriptData = scriptData.toString();
-    const lines = scriptData.split(this.eol);
+    const lines = scriptData.split(this.eolRead);
     const header = {};
     if (lines && !lines[0].startsWith('#')) {
       header.name = lines[0];
@@ -4854,7 +4855,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
   Compile(scriptBuffer, scriptType = Constants.SCRIPTING_TYPE_CONVO) {
     let scriptData = scriptBuffer;
     if (Buffer.isBuffer(scriptBuffer)) scriptData = scriptData.toString();
-    const lines = scriptData.split(this.eol);
+    const lines = scriptData.split(this.eolRead);
     if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
       return this._compileConvo(lines, false);
     } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
@@ -4879,7 +4880,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
     let convoStepLineIndex = null;
     const parseMsg = lines => {
       lines = lines || [];
-      return linesToConvoStep$3(lines, convoStepSender, this.context, this.eol);
+      return linesToConvoStep$3(lines, convoStepSender, this.context);
     };
     const pushPrev = () => {
       if (convoStepSender && currentLines) {
@@ -4893,7 +4894,7 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
       } else if (!convoStepSender && currentLines) {
         convo.header.name = currentLines[0];
         if (currentLines.length > 1) {
-          convo.header.description = currentLines.slice(1).join(this.eol);
+          convo.header.description = currentLines.slice(1).join(this.eolWrite);
         }
       }
     };
@@ -4957,20 +4958,20 @@ var CompilerTxt_1 = class CompilerTxt extends CompilerBase_1 {
     }
     let script = '';
     if (convo.header.name) {
-      script += convo.header.name + this.eol;
+      script += convo.header.name + this.eolWrite;
     }
     if (convo.header.description) {
-      script += convo.header.description + this.eol;
+      script += convo.header.description + this.eolWrite;
     }
     convo.conversation.forEach(step => {
-      script += this.eol;
+      script += this.eolWrite;
       script += '#' + step.sender;
       if (step.channel && step.channel !== 'default') {
         script += ' ' + step.channel;
       }
-      script += this.eol;
+      script += this.eolWrite;
       const stepLines = convoStepToLines(step);
-      if (stepLines && stepLines.length > 0) script += stepLines.join(this.eol) + this.eol;
+      if (stepLines && stepLines.length > 0) script += stepLines.join(this.eolWrite) + this.eolWrite;
     });
     return script;
   }
@@ -5202,11 +5203,9 @@ const {
 var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   GetHeaders(scriptBuffer) {
     debug$b('GetHeaders is not implemented!');
@@ -5247,7 +5246,7 @@ var CompilerObjectBase_1 = class CompilerObjectBase extends CompilerBase_1 {
         conversation.push(Object.assign({
           sender: convoStepSender,
           stepTag: 'Line ' + lineTag
-        }, linesToConvoStep$1(convoStepObject, convoStepSender, this.context, this.eol)));
+        }, linesToConvoStep$1(convoStepObject, convoStepSender, this.context)));
       }
       const convo = {
         header: {
@@ -5349,11 +5348,9 @@ const {
 var CompilerMarkdown_1 = class CompilerMarkdown extends CompilerBase_1 {
   constructor(context, caps = {}) {
     super(context, caps);
-    this.eol = caps[Capabilities.SCRIPTING_TXT_EOL];
   }
   Validate() {
     super.Validate();
-    this._AssertCapabilityExists(Capabilities.SCRIPTING_TXT_EOL);
   }
   Compile(scriptBuffer, scriptType = Constants.SCRIPTING_TYPE_CONVO) {
     if (Buffer.isBuffer(scriptBuffer)) scriptBuffer = scriptBuffer.toString();
@@ -5415,7 +5412,7 @@ var CompilerMarkdown_1 = class CompilerMarkdown extends CompilerBase_1 {
               conversation.push(Object.assign({
                 sender,
                 stepTag: 'Line ' + (step.map[0] + 1)
-              }, linesToConvoStep(step.children.map(child => child.content + (child.children && child.children.length > 0 ? ' ' + child.children.map(child => child.content).join('|') : '')), sender, this.context, this.eol)));
+              }, linesToConvoStep(step.children.map(child => child.content + (child.children && child.children.length > 0 ? ' ' + child.children.map(child => child.content).join('|') : '')), sender, this.context)));
             } else {
               debug$a(`Expected sender ${validSenders.map(s => `'${s}'`).join(' or ')} but found ${sender}`);
             }
@@ -5477,7 +5474,7 @@ const p = (retryHelper, fn) => {
   if (retryHelper) {
     return promiseRetry((retry, number) => {
       return promise().catch(err => {
-        if (retryHelper.shouldRetry(err)) {
+        if (retryHelper.shouldRetry(err, number)) {
           debug$9(`Asserter trial #${number} failed, retry activated`);
           retry(err);
         } else {
@@ -5502,7 +5499,7 @@ const pnot = (retryHelper, fn, errTemplate) => {
   if (retryHelper) {
     return promiseRetry((retry, number) => {
       return promise().catch(() => {
-        if (retryHelper.shouldRetry(errTemplate)) {
+        if (retryHelper.shouldRetry(errTemplate, number)) {
           debug$9(`Asserter trial #${number} failed, !retry activated`);
           retry(errTemplate);
         } else {
@@ -8955,7 +8952,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     try {
       return super.Build().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Build ? this.pluginInstance.Build() || Promise.resolve() : Promise.resolve()).catch(err => {
-          if (this.retryHelperBuild.shouldRetry(err)) {
+          if (this.retryHelperBuild.shouldRetry(err, number)) {
             debug$2(`Build trial #${number} failed, retry activated`);
             retry(err);
           } else {
@@ -8972,7 +8969,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     try {
       return super.Start().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Start ? this.pluginInstance.Start() || Promise.resolve() : Promise.resolve()).catch(err => {
-          if (this.retryHelperStart.shouldRetry(err)) {
+          if (this.retryHelperStart.shouldRetry(err, number)) {
             debug$2(`Start trial #${number} failed, retry activated`);
             retry(err);
           } else {
@@ -8995,7 +8992,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     try {
       return promiseRetry((retry, number) => {
         return (this.pluginInstance.UserSays(mockMsg) || Promise.resolve()).catch(err => {
-          if (this.retryHelperUserSays.shouldRetry(err)) {
+          if (this.retryHelperUserSays.shouldRetry(err, number)) {
             debug$2(`UserSays trial #${number} failed, retry activated`);
             retry(err);
           } else {
@@ -9015,7 +9012,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     try {
       return super.Stop().then(() => promiseRetry((retry, number) => {
         return (this.pluginInstance.Stop ? this.pluginInstance.Stop() || Promise.resolve() : Promise.resolve()).catch(err => {
-          if (this.retryHelperStop.shouldRetry(err)) {
+          if (this.retryHelperStop.shouldRetry(err, number)) {
             debug$2(`Stop trial #${number} failed, retry activated`);
             retry(err);
           } else {
@@ -9039,7 +9036,7 @@ var PluginConnectorContainer_1 = class PluginConnectorContainer extends BaseCont
     try {
       return promiseRetry((retry, number) => {
         return (this.pluginInstance.Clean ? this.pluginInstance.Clean() || Promise.resolve() : Promise.resolve()).catch(err => {
-          if (this.retryHelperClean.shouldRetry(err)) {
+          if (this.retryHelperClean.shouldRetry(err, number)) {
             debug$2(`Clean trial #${number} failed, retry activated`);
             retry(err);
           } else {