@tiledesk/tiledesk-tybot-connector 2.0.8-rc1 → 2.0.8-rc2

package/ExtApi.js

@@ -10,12 +10,6 @@ class ExtApi {
       throw new Error("options.TILEBOT_ENDPOINT is mandatory");
       //this.extEndpoint = `${options.TILEBOT_ENDPOINT}/;
     }
-    if (options.log) {
-      this.log = options.log;
-    }
-    else {
-      this.log = false;
-    }
     this.TILEBOT_ENDPOINT = options.TILEBOT_ENDPOINT;
   }
 
@@ -63,8 +57,7 @@ class ExtApi {
             callback(null, resbody);
           }
         }
-      }, this.log
-    );
+      });
   }
 
 }

package/ExtUtil.js

@@ -8,20 +8,19 @@ const { FillParamsChatbotPlug } = require('./tiledeskChatbotPlugs/FillParamsChat
 
 // PROD
 /*const { MessagePipeline } =  require('@tiledesk/tiledesk-chatbot-plugs/MessagePipeline');
-const { DirectivesChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/DirectivesChatbotPlug');
 const { SplitsChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/SplitsChatbotPlug');
 const { MarkbotChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/MarkbotChatbotPlug');
 const { WebhookChatbotPlug } = require('@tiledesk/tiledesk-chatbot-plugs/WebhookChatbotPlug');*/
 
 class ExtUtil {
 
-  static async execPipelineExt(request, static_bot_answer, directivesPlug, tdcache, log) {
+  static async execPipelineExt(request, static_bot_answer, directivesPlug, tdcache) {
     const messagePipeline = new MessagePipeline(static_bot_answer, null);
     messagePipeline.addPlug(directivesPlug);
-    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache, log)); // in original message
-    messagePipeline.addPlug(new SplitsChatbotPlug(log));
-    messagePipeline.addPlug(new MarkbotChatbotPlug(log));
-    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache, log)); // in splits
+    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache)); // in original message
+    messagePipeline.addPlug(new SplitsChatbotPlug());
+    messagePipeline.addPlug(new MarkbotChatbotPlug());
+    messagePipeline.addPlug(new FillParamsChatbotPlug(request, tdcache)); // in splits
     const bot_answer = await messagePipeline.exec();
     return bot_answer;
   }

package/engine/IntentForm.js

@@ -11,7 +11,6 @@ class IntentForm {
     this.form = options.form;
     this.CURRENT_FIELD_INDEX_KEY = "tilebot:requests:" + this.requestId + ":currentFieldIndex"
     this.CURRENT_FORM_KEY = "tilebot:requests:" + this.requestId + ":currentForm"
-    this.log = options.log;
     this.requestParameters = options.requestParameters;
   }
 

package/engine/IntentsMachineFactory.js

@@ -4,7 +4,7 @@ const winston = require('../utils/winston.js')
 
 class IntentsMachineFactory {
 
-    static getMachine(bot, botId, projectId, log) {
+    static getMachine(bot, botId, projectId) {
       let machine;
       if (bot && bot.intentsEngine === "tiledesk-ai") {
         winston.verbose("(IntentsMachineFactory) bot.intentsEngine is tiledesk-ai");
@@ -15,7 +15,7 @@ class IntentsMachineFactory {
       }
       else if (bot) {
         winston.verbose("(IntentsMachineFactory) Setting MongodbIntentsMachine with bot:", JSON.stringify(bot));
-        machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
+        machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language});
       }
       else {
         winston.error("bot is null for: " + botId + " on projectId: " + projectId);
@@ -23,10 +23,10 @@ class IntentsMachineFactory {
       return machine;
     }
 
-    static getBackupMachine(bot, botId, projectId, log) {
+    static getBackupMachine(bot, botId, projectId) {
       let machine;
       winston.verbose("(IntentsMachineFactory) Setting MongodbIntentsMachine as Backup Intents Machine on bot:", JSON.stringify(bot));
-      machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language, log});
+      machine = new MongodbIntentsMachine({projectId: projectId, language: bot.language});
       return machine;
     }
   }

package/engine/MongodbBotsDataSource.js

@@ -9,7 +9,6 @@ class MongodbBotsDataSource {
       throw new Error("config.projectId is mandatory");
     }
     this.projectId = config.projectId;
-    this.log = config.log;
   }
   
   async getBotById(botId) {

package/engine/MongodbIntentsMachine.js

@@ -10,7 +10,6 @@ class MongodbIntentsMachine {
     }
     this.projectId = config.projectId;
     this.language = config.language;
-    this.log = config.log;
   }
 
   /**

package/engine/TiledeskChatbot.js

@@ -1,6 +1,5 @@
 // let Faq = require('./faq');
 // let Faq_kb = require('./faq_kb');
-// const { DirectivesChatbotPlug } = require('../tiledeskChatbotPlugs/DirectivesChatbotPlug');
 const { MessagePipeline } = require('../tiledeskChatbotPlugs/MessagePipeline');
 const { WebhookChatbotPlug } = require('../tiledeskChatbotPlugs/WebhookChatbotPlug');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
@@ -41,7 +40,6 @@ class TiledeskChatbot {
     this.projectId = config.projectId;
     this.MAX_STEPS = config.MAX_STEPS;
     this.MAX_EXECUTION_TIME = config.MAX_EXECUTION_TIME;
-    this.log = config.log;
   }
 
   async replyToMessage(message, callback) {
@@ -72,13 +70,13 @@ class TiledeskChatbot {
           winston.verbose("(TiledeskChatbot) Resetting current step by request message: " + message.text);
           await TiledeskChatbot.resetStep(this.tdcache, this.requestId);
           await TiledeskChatbot.resetStarted(this.tdcache, this.requestId);
-          if (this.log) {
-            if (this.tdcache) {
-              let currentStep = 
-              await TiledeskChatbot.currentStep(this.tdcache, this.requestId);
-              winston.verbose("(TiledeskChatbot) After reset currentStep:" + currentStep);
-            }
+
+          if (this.tdcache) {
+            let currentStep = 
+            await TiledeskChatbot.currentStep(this.tdcache, this.requestId);
+            winston.verbose("(TiledeskChatbot) After reset currentStep:" + currentStep);
           }
+          
         }
       } catch(error) {
         winston.error("(TiledeskChatbot) Error resetting locked intent: ", error);
@@ -93,8 +91,7 @@ class TiledeskChatbot {
         //   projectId: this.projectId,
         //   token: this.token,
         //   APIURL: this.APIURL,
-        //   APIKEY: this.APIKEY,
-        //   log: false
+        //   APIKEY: this.APIKEY
         // });
         // it only gets the locked_intent
         // const faq = await this.botsDataSource.getByIntentDisplayName(this.botId, locked_intent);
@@ -506,7 +503,7 @@ class TiledeskChatbot {
       TiledeskChatbot.requestCacheKey(requestId) + ":parameters", paramName);
   }
 
-  static async checkStep(_tdcache, requestId, max_steps, max_execution_time, log) {
+  static async checkStep(_tdcache, requestId, max_steps, max_execution_time) {
     winston.verbose("(TiledeskChatbot) Checking on MAX_STEPS: " + max_steps);
     // let go_on = true; // continue
     const parameter_key = TiledeskChatbot.requestCacheKey(requestId) + ":step";
@@ -579,7 +576,7 @@ class TiledeskChatbot {
     }
     const messagePipeline = new MessagePipeline(static_bot_answer, context);
     const webhookurl = bot.webhook_url;
-    messagePipeline.addPlug(new WebhookChatbotPlug(userMessage.request, webhookurl, this.token, this.log));
+    messagePipeline.addPlug(new WebhookChatbotPlug(userMessage.request, webhookurl, this.token));
     const bot_answer = await messagePipeline.exec();
     return bot_answer;
   }
@@ -592,8 +589,7 @@ class TiledeskChatbot {
         form: form,
         requestId: this.requestId,
         chatbot: this,
-        requestParameters: all_parameters,
-        log: this.log
+        requestParameters: all_parameters
       });
     let message = await intentForm.getMessage(userInputReply);
     return message;
@@ -610,8 +606,7 @@ class TiledeskChatbot {
       projectId: this.projectId,
       token: this.token,
       APIURL: this.APIURL,
-      APIKEY: this.APIKEY,
-      log: this.log
+      APIKEY: this.APIKEY
     });
     // const parameters_key = "tilebot:requests:" + requestId + ":parameters";
     const all_parameters = await this.allParameters();//this.tdcache.hgetall(parameters_key);

package/engine/TiledeskIntentsMachine.js

@@ -12,7 +12,6 @@ class TiledeskIntentsMachine {
     else {
       this.API_ENDPOINT = config.API_ENDPOINT;
     }
-    this.log = config.log;
   }
 
   /**
@@ -93,7 +92,7 @@ class TiledeskIntentsMachine {
     return tiledesk_intents;
   }
 
-  myrequest(options, callback, log) {
+  myrequest(options, callback) {
     axios(
       {
         url: options.url,

package/index.js

@@ -18,7 +18,6 @@ let axios = require('axios');
 router.use(bodyParser.json({limit: '50mb'}));
 router.use(bodyParser.urlencoded({ extended: true , limit: '50mb'}));
 
-let log = false;
 /** @type {TdCache} */
 let tdcache = null;
 let MAX_STEPS = 1000;
@@ -100,7 +99,7 @@ router.post('/ext/:botid', async (req, res) => {
 
   let botsDS;
   if (!staticBots) {
-    botsDS = new MongodbBotsDataSource({projectId: projectId, botId: botId, log: log});
+    botsDS = new MongodbBotsDataSource({projectId: projectId, botId: botId});
     winston.verbose("(tybotRoute) botsDS created with Mongo");
   }
   else {
@@ -119,8 +118,8 @@ router.post('/ext/:botid', async (req, res) => {
   let intentsMachine;
   let backupMachine;
   if (!staticBots) {
-    intentsMachine = IntentsMachineFactory.getMachine(bot, botId, projectId, log);
-    backupMachine = IntentsMachineFactory.getBackupMachine(bot, botId, projectId, log);
+    intentsMachine = IntentsMachineFactory.getMachine(bot, botId, projectId);
+    backupMachine = IntentsMachineFactory.getBackupMachine(bot, botId, projectId);
     winston.debug("(tybotRoute) Created backupMachine:", backupMachine)
   }
   else {
@@ -140,8 +139,7 @@ router.post('/ext/:botid', async (req, res) => {
     requestId: requestId,
     projectId: projectId,
     MAX_STEPS: MAX_STEPS,
-    MAX_EXECUTION_TIME: MAX_EXECUTION_TIME,
-    log: log
+    MAX_EXECUTION_TIME: MAX_EXECUTION_TIME
   });
   winston.verbose("(tybotRoute) Message text: " + message.text)
   
@@ -178,7 +176,6 @@ router.post('/ext/:botid', async (req, res) => {
           API_ENDPOINT: API_ENDPOINT,
           TILEBOT_ENDPOINT:TILEBOT_ENDPOINT,
           token: token,
-          log: log,
           // HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT,
           cache: tdcache
         }
@@ -203,8 +200,7 @@ router.post('/ext/:botid', async (req, res) => {
     reply.attributes.fillParams = true;
     
     const apiext = new ExtApi({
-      TILEBOT_ENDPOINT: TILEBOT_ENDPOINT,
-      log: false
+      TILEBOT_ENDPOINT: TILEBOT_ENDPOINT
     });
     apiext.sendSupportMessageExt(reply, projectId, requestId, token, () => {
       winston.verbose("(tybotRoute) sendSupportMessageExt reply sent: ", reply)
@@ -231,8 +227,7 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
     projectId: projectId,
     token: token,
     APIURL: API_ENDPOINT,
-    APIKEY: "___",
-    log: false
+    APIKEY: "___"
   });
 
   let request;
@@ -258,10 +253,10 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   winston.debug("(tybotRoute) API_ENDPOINT: " + API_ENDPOINT);
   winston.debug("(tybotRoute) request: " + TILEBOT_ENDPOINT);
 
-  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, API_ENDPOINT: API_ENDPOINT, TILEBOT_ENDPOINT: TILEBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
+  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, API_ENDPOINT: API_ENDPOINT, TILEBOT_ENDPOINT: TILEBOT_ENDPOINT, token: token, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
 
   const original_answer_text = answer.text;
-  const bot_answer = await ExtUtil.execPipelineExt(request, answer, directivesPlug, tdcache, log);
+  const bot_answer = await ExtUtil.execPipelineExt(request, answer, directivesPlug, tdcache);
   winston.debug("(tybotRoute) bot_answer: ", bot_answer);
 
   if (bot_answer) {
@@ -384,8 +379,7 @@ router.post('/echobot', (req, res) => {
     projectId: projectId,
     token: token,
     APIURL: API_ENDPOINT,
-    APIKEY: "___",
-    log: false
+    APIKEY: "___"
   });
 
   // instantly reply "success" to TILEDESK
@@ -418,8 +412,14 @@ router.post('/block/:project_id/:bot_id/:block_id', async (req, res) => {
   
   // invoke block
   // unique ID for each execution
-  const execution_id = uuidv4().replace(/-/g, '');
-  const request_id = "automation-request-" + project_id + "-" + execution_id;
+  let request_id;
+  if (body.preloaded_request_id) {
+    request_id = body.preloaded_request_id;
+  } else {
+    const execution_id = uuidv4().replace(/-/g, '');
+    request_id = "automation-request-" + project_id + "-" + execution_id;
+    
+  }
   const command = "/#" + block_id;
   let message = {
     payload: {
@@ -513,13 +513,7 @@ async function startApp(settings, completionCallback) {
     });
   }
   
-  if (!settings.log) {
-    log = false;
-  }
-  else {
-    log = true;
-  }
-  winston.info("(Tilebot) Log: " + log);
+  winston.info("(Tilebot) Log Level: " + process.env.LOG_LEVEL);
 
   if (process.env.CHATBOT_MAX_STEPS) {
     MAX_STEPS = Number(process.env.CHATBOT_MAX_STEPS);
@@ -598,7 +592,7 @@ async function checkRequest(request_id, id_project) {
   // WARNING! Move this function in models/TiledeskChatbotUtil.js
 }
 
-function myrequest(options, callback, log) {
+function myrequest(options, callback) {
   winston.verbose("(tybotRoute) myrequest API URL:" + options.url);
   winston.debug("(tybotRoute) myrequest Options:", options);