@tiledesk/tiledesk-tybot-connector 0.4.2 → 0.5.0-rc2

package/tiledeskChatbotPlugs/directives/DirJSONCondition.js

@@ -1,6 +1,7 @@
 const { DirIntent } = require('./DirIntent');
 const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskExpression } = require('../../TiledeskExpression');
+const winston = require('../../utils/winston');
 
 class DirJSONCondition {
 
@@ -16,12 +17,13 @@ class DirJSONCondition {
   }
 
   execute(directive, callback) {
-    // console.log("Condition...")
+    winston.verbose("Execute JSONCondition directive");
     let action;
     if (directive.action) {
       action = directive.action
     }
     else {
+      winston.warn("DirJSONCondition Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -32,14 +34,15 @@ class DirJSONCondition {
   }
 
   async go(action, callback) {
-    // const groups = action.jsonCondition.groups;
+    winston.debug("(DirJSONCondition) Action: ", action);
+
     const groups = action.groups; // NEXT
     const trueIntent = action.trueIntent;
     const falseIntent = action.falseIntent;
     const trueIntentAttributes = action.trueIntentAttributes;
     const falseIntentAttributes = action.falseIntentAttributes;
     let stopOnConditionMet = true; //action.stopOnConditionMet;
-    if (this.log) {console.log("groups:", JSON.stringify(groups));}
+
     if (trueIntent && trueIntent.trim() === "") {
       trueIntent = null;
     }
@@ -47,15 +50,16 @@ class DirJSONCondition {
       falseIntent = null;
     }
     if (!trueIntent && !falseIntent) {
-      if (this.log) {console.log("Invalid jsonCondition, no intents specified");}
+      winston.warn("(DirJSONCondition) Invalid jsonCondition, no intents specified");
       callback();
       return;
     }
     else if (groups === null) {
-      if (this.log) {console.log("Invalid jsonCondition, no groups.");}
+      winston.warn("(DirJSONCondition) Invalid jsonCondition, no groups.");
       callback();
       return;
     }
+
     let trueIntentDirective = null;
     if (trueIntent) {
       trueIntentDirective = DirIntent.intentDirectiveFor(trueIntent, trueIntentAttributes);
@@ -70,26 +74,24 @@ class DirJSONCondition {
       await TiledeskChatbot.allParametersStatic(
         this.context.tdcache, this.context.requestId
       );
-      if (this.log) {console.log("Variables:", JSON.stringify(variables))}
     }
     else {
-      console.error("(DirJSONCondition) No this.context.tdcache");
+      winston.error("(DirJSONCondition) No this.context.tdcache")
     }
     // const result = await this.evaluateCondition(scriptCondition, variables);
     let result;
     const expression = TiledeskExpression.JSONGroupsToExpression(groups, variables);
-    // console.log("full json condition expression:", expression);
+
     result = new TiledeskExpression().evaluateStaticExpression(expression, variables);
-    if (this.log) {console.log("executed condition:", expression, "result:", result);}
+    winston.debug("(DirJSONCondition) executed condition: ", expression);
     if (result === true) {
       if (trueIntentDirective) {
         this.intentDir.execute(trueIntentDirective, () => {
-          // console.log("result === true. stopOnConditionMet?", stopOnConditionMet);
           callback(stopOnConditionMet);
         });
       }
       else {
-        if (this.log) {console.log("No trueIntentDirective specified");}
+        winston.debug("(DirJSONCondition) No trueIntentDirective specified");
         callback();
         return;
       }
@@ -100,12 +102,11 @@ class DirJSONCondition {
       }
       if (falseIntentDirective) {
         this.intentDir.execute(falseIntentDirective, () => {
-          // console.log("result === false. stopOnConditionMet?", stopOnConditionMet);
           callback(stopOnConditionMet);
         });
       }
       else {
-        if (this.log) {console.log("No falseIntentDirective specified");}
+        winston.debug("(DirJSONCondition) No falseIntentDirective specified");
         callback();
         return;
       }

package/tiledeskChatbotPlugs/directives/DirLockIntent.js

@@ -1,4 +1,5 @@
 const ms = require('minimist-string');
+const winston = require('../../utils/winston');
 
 class DirLockIntent {
 
@@ -15,23 +16,19 @@ class DirLockIntent {
   }
 
   async execute(directive, callback) {
-    if (this.log) {console.log("Locking intent:", JSON.stringify(directive));}
+    winston.verbose("Execute LockIntent directive");
     let action;
     if (directive.action) {
-      // console.log("got intent action:", JSON.stringify(directive.action));
       action = directive.action;
     }
     else if (directive.parameter && directive.parameter.trim() !== "") {
       const params = this.parseParams(directive.parameter);
       action = {
-        // body: {
-        intentName: params.intentName // directive.parameter.trim()
-          // variableName: params.variableName
-        // }
+        intentName: params.intentName 
       }
     }
     else {
-      console.error("Incorrect directive:", directive);
+      winston.warn("DirLockIntent Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -49,11 +46,11 @@ class DirLockIntent {
   }
 
   async go(action, callback) {
-    // let intent_name = action.body.intentName;
+    winston.debug("(DirLockIntent) Action: ", action);
     let intent_name = action.intentName;
     // let variable_name = action.body.variableName;
     await DirLockIntent.lockIntent(this.tdcache, this.context.requestId, intent_name); //, variable_name);
-    if (this.log) {console.log("Locked intent:", action.intentName);}
+    winston.debug("(DirLockIntent) Locked intent:", action.intentName);
     if (callback) {
       callback();
     }
@@ -64,14 +61,12 @@ class DirLockIntent {
       await tdcache.set("tilebot:requests:"  + requestId + ":locked", intent_name);
     }
     else {
-      console.error("lockIntent recoverable error, one of requestId:", requestId, "intent_name:", intent_name, "is not valid");
+      winston.error("(DirLockIntent) lockIntent recoverable error, one of requestId: " + requestId + " intent_name: " + intent_name + " is not valid");
     }
     
     // if (variable_name) {
-    //   console.log("locking intent with variable:", variable_name);
     //   await this.tdcache.set("tilebot:requests:"  + requestId + ":lockedValue", variable_name);
     // }
-    // console.log("locked. Intent name:", intent_name, "intent variable:", variable_name);
   }
   
   parseParams(directive_parameter) {

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -4,6 +4,7 @@ const { Filler } = require("../Filler");
 const { DirIntent } = require("./DirIntent");
 let https = require("https");
 require('dotenv').config();
+const winston = require('../../utils/winston');
 
 class DirMake {
 
@@ -19,13 +20,13 @@ class DirMake {
   }
 
   execute(directive, callback) {
-    if (this.log) { console.log("DirMake directive: ", directive); }
+    winston.verbose("Execute Make directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("DirMake Incorrect directive: ", JSON.stringify(directive));
+      winston.warn("DirMake Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -35,9 +36,9 @@ class DirMake {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("DirMake action:", JSON.stringify(action)); }
+    winston.debug("(DirMake) Action: ", action);
     if (!this.tdcache) {
-      console.error("Error: DirMake tdcache is mandatory");
+      winston.error("(DirMake) Error: tdcache is mandatory");
       callback();
       return;
     }
@@ -47,13 +48,6 @@ class DirMake {
     let trueIntentAttributes = action.trueIntentAttributes;
     let falseIntentAttributes = action.falseIntentAttributes;
 
-    if (this.log) {
-      console.log("DirMake trueIntent", trueIntent)
-      console.log("DirMake falseIntent", falseIntent)
-      console.log("DirMake trueIntentAttributes", trueIntentAttributes)
-      console.log("DirMake falseIntentAttributes", falseIntentAttributes)
-    }
-
     // default values?
     let status = null;
     let error = null;
@@ -67,13 +61,10 @@ class DirMake {
     let webhook_url = action.url;
     let bodyParameters = action.bodyParameters;
 
-    if (this.log) {
-      console.log("DirMake webhook_url: ", webhook_url);
-      console.log("DirMake bodyParameters: ", JSON.stringify(bodyParameters));
-    }
+    winston.debug("(DirMake) webhook_url: " + webhook_url);
 
     if (!bodyParameters) {
-      console.error("Error: DirMake bodyParameters is undefined");
+      winston.error("(DirMake) Error: bodyParameters is undefined");
       error = "Missing body parameters";
       await this.#assignAttributes(action, status, error);
       if (falseIntent) {
@@ -86,7 +77,7 @@ class DirMake {
     }
 
     if (!webhook_url || webhook_url === '') {
-      if (this.log) {console.error("DirMake ERROR - webhook_url is undefined or null or empty string:")};
+      winston.error("(DirMake) Error: webhook_url is undefined or null or empty string:")
       let status = 422;   
       let error = 'Missing make webhook url';
       await this.#assignAttributes(action, status, error);
@@ -111,14 +102,12 @@ class DirMake {
     } else {
       url = action.url;
     }
-    if (this.log) { console.log("DirMake MakeEndpoint URL: ", url); }
 
     const filler = new Filler();
     for (const [key, value] of Object.entries(bodyParameters)) {
       let filled_value = filler.fill(value, requestVariables);
       bodyParameters[key] = filled_value;
     }
-    if (this.log) { console.log('DirMake bodyParameters filler: ', bodyParameters) }
 
     const MAKE_HTTPREQUEST = {
       url: url,
@@ -128,12 +117,12 @@ class DirMake {
       json: bodyParameters,
       method: "POST"
     }
-    if (this.log) { console.log("DirMake MAKE_HTTPREQUEST", MAKE_HTTPREQUEST); }
+    winston.debug("(DirMake) Make HttpRequest ", MAKE_HTTPREQUEST);
     this.#myrequest(
       MAKE_HTTPREQUEST, async (err, res) => {
         if (err) {
           if (callback) {
-            console.error("(httprequest) DirMake err:", err);
+            winston.error("(DirMake) err: ", err);
             // let status = 404;
             // let error = 'Make url not found';
             status = res.status;
@@ -148,9 +137,8 @@ class DirMake {
             return;
           }
         } else if (callback) {
-          if (this.log) { console.log("(httprequest) DirMake resbody ", res); }
-          // let status = 200;
-          // let error = null;
+          winston.debug("(DirMake)  resbody ", res);
+
           status = res.status;
           error = null;
           if (res.error) {
@@ -171,11 +159,10 @@ class DirMake {
   }
 
   async #assignAttributes(action, status, error) {
-    if (this.log) {
-      console.log("DirMake assignAttributes action:", action)
-      console.log("DirMake assignAttributes status:", status)
-      console.log("DirMake assignAttributes error:", error)
-    }
+    winston.debug("(DirMake) assignAttributes action: ", action)
+    winston.debug("(DirMake) assignAttributes status: " + status)
+    winston.debug("(DirMake) assignAttributes error: ", error)
+
     if (this.context.tdcache) {
       if (action.assignStatusTo) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignStatusTo, status);
@@ -183,23 +170,11 @@ class DirMake {
       if (action.assignErrorTo) {
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignErrorTo, error);
       }
-
-      // Debug log
-      if (this.log) {
-        const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-        for (const [key, value] of Object.entries(all_parameters)) {
-          if (this.log) { console.log("DirMake request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
     }
   }
 
   // Advanced #myrequest function
   #myrequest(options, callback) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(options));
-    }
     let axios_options = {
       url: options.url,
       method: options.method,
@@ -210,9 +185,6 @@ class DirMake {
     if (options.json !== null) {
       axios_options.data = options.json
     }
-    if (this.log) {
-      console.log("axios_options:", JSON.stringify(axios_options));
-    }
     if (options.url.startsWith("https:")) {
       const httpsAgent = new https.Agent({
         rejectUnauthorized: false,
@@ -221,10 +193,6 @@ class DirMake {
     }
     axios(axios_options)
       .then((res) => {
-        if (this.log) {
-          console.log("Response for url:", options.url);
-          console.log("Response headers:\n", JSON.stringify(res.headers));
-        }
         if (callback) {
           callback(null, res);
         }
@@ -243,8 +211,8 @@ class DirMake {
             }
             return value;
           });
-          console.error("(DirMake) An error occurred: ", error_log);
-          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
+          winston.error("(DirMake) An error occurred: ", error_log);
+          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END;
         }
         if (callback) {
           let status = 1000;
@@ -295,7 +263,7 @@ class DirMake {
         });
       }
       else {
-        if (this.log) { console.log("No trueIntentDirective specified"); }
+        winston.debug("(DirMake) No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -310,7 +278,7 @@ class DirMake {
         });
       }
       else {
-        if (this.log) { console.log("No falseIntentDirective specified"); }
+        winston.debug("(DirMake) No falseIntentDirective specified");
         if (callback) {
           callback();
         }

package/tiledeskChatbotPlugs/directives/DirMessage.js

@@ -1,5 +1,8 @@
-const { ExtApi } = require('../../ExtApi.js');
 const { Directives } = require('./Directives.js');
+const { TiledeskClient } = require("@tiledesk/tiledesk-client");
+const { TiledeskChatbot } = require("../../models/TiledeskChatbot");
+const { Filler } = require("../Filler");
+const winston = require('../../utils/winston');
 
 class DirMessage {
 
@@ -8,20 +11,28 @@ class DirMessage {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
-    this.API_ENDPOINT = context.API_ENDPOINT,
-    this.TILEBOT_ENDPOINT = context.TILEBOT_ENDPOINT;
+    this.API_ENDPOINT = context.API_ENDPOINT
     this.projectId = context.projectId;
     this.requestId = context.requestId;
+    this.tdcache = this.context.tdcache;
     this.token = context.token;
     this.log = this.context.log;
     this.supportRequest = this.context.supportRequest
+
+    this.tdClient = new TiledeskClient({
+      projectId: this.context.projectId,
+      token: this.context.token,
+      APIURL: this.API_ENDPOINT,
+      APIKEY: "___",
+      log: this.log
+    });
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute Message directive");
     let action;
     if (directive.action) {
       action = directive.action;
-      if (this.log) {console.log("got action:", JSON.stringify(action));}
       if (!action.attributes) {
         action.attributes = {}
       }
@@ -44,7 +55,6 @@ class DirMessage {
       //     action.body.message.type = "text";
       //   }
       // }
-      // console.log("final message action:", JSON.stringify(action));
     }
     // DEPRECATED
     else if (directive.parameter) {
@@ -68,7 +78,7 @@ class DirMessage {
       // }
     }
     else {
-      console.error("Incorrect directive:", directive);
+      winston.warn("DirMessage Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -82,10 +92,10 @@ class DirMessage {
     });
   }
 
-  go(action, callback) {
-    // const message = action.body.message;
+  async go(action, callback) {
+    winston.debug("(DirMessage) Action: ", action);
     const message = action;
-    if (this.log) {console.log("Message to extEndpoint:", JSON.stringify(message))};
+    winston.debug("(DirMessage) Message to extEndpoint:", message);
 
     if(!action.isInfo && this.supportRequest && !this.supportRequest.draft){
       callback();
@@ -98,25 +108,27 @@ class DirMessage {
     //     return;
     //   }
     // }
-
-    const apiext = new ExtApi({
-      TILEBOT_ENDPOINT: this.TILEBOT_ENDPOINT,
-      log: false
-    });
     if (message.text) {
       message.text = message.text.replace(/\\n/g, "\n");
+
+      let requestVariables = null;
+      requestVariables = await TiledeskChatbot.allParametersStatic(this.tdcache, this.requestId)
+
+      const filler = new Filler();
+      message.text = filler.fill(message.text, requestVariables);
     }
-    // message.text = "Ciao1\n\nCIao2"
-    // console.log("sendSupportMessageExt from dirmessage", message);
-    apiext.sendSupportMessageExt(
-      message,
-      this.projectId,
+
+    this.tdClient.sendSupportMessage(
       this.requestId,
-      this.token,
-      () => {
-        if (this.log) {console.log("Ext message sent.");}
+      message,
+      (err) => {
+        if (err) {
+          winston.err("(DirMessage) Error sending reply: ", err);
+        }
+        winston.debug("(DirMessage) Reply message sent: ", message);
         callback();
     });
+
   }
 
   // static firstMessageInfoFromCommands(commands) {
@@ -124,12 +136,8 @@ class DirMessage {
   //   let text = "New message";
   //   for (let i = 0; i < commands.length; i++) {
   //     const command = commands[i];
-  //     console.log("cheking command", command)
   //     if (command.type === "message") {
-  //       console.log("command.type: message!")
-  //       console.log("command.message.type!", command.message.type)
-  //       console.log("command.message.text!", command.message.text)
-        
+      
   //       if (command.message.type) {
   //         type = command.message.type;
   //       }
@@ -143,7 +151,6 @@ class DirMessage {
   //     type: type,
   //     text: text
   //   }
-  //   // console.log("message_info:", message_info);
   //   return message_info;
   // }
 

package/tiledeskChatbotPlugs/directives/DirMessageToBot.js

@@ -1,6 +1,7 @@
 let axios = require('axios');
 let https = require("https");
 const { v4: uuidv4 } = require('uuid');
+const winston = require('../../utils/winston')
 
 class DirMessageToBot {
 
@@ -17,14 +18,13 @@ class DirMessageToBot {
   }
 
   execute(directive, callback) {
-    // console.log("exec intent:", JSON.stringify(directive));
+    winston.verbose("Execute MessageToBot directive");
     let action;
     if (directive.action) {
-      // console.log("got intent action:", JSON.stringify(directive.action));
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive:", directive);
+      winston.warn("DirMessageToBot Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -34,20 +34,18 @@ class DirMessageToBot {
   }
 
   go(action, callback) {
-    // console.log("message action intent:", action);
+    winston.debug("(DirMessageToBot) Action: ", action);
+    
     const message = action.message;
-    // const projectId = this.supportRequest.id_project;
-    // const requestId = this.supportRequest.request_id;
     const botId = this.supportRequest.bot_id;
 
     let outgoing_message = {
       "payload": message,
       "token": this.token
     }
-    if (this.log) {console.log("sending message:", JSON.stringify(outgoing_message));}
+    winston.debug("(DirMessageToBot) sending message: ", outgoing_message);
     
     this.sendMessageToBot(this.TILEBOT_ENDPOINT, outgoing_message, botId, () => {
-      // console.log("(DirMessageToBot) sendMessageToBot() req_body sent");
       callback(true);
     });
   }
@@ -61,8 +59,9 @@ class DirMessageToBot {
    * @param {string} token. User token
    */
   sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
+     
     const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
-    // console.log("sendMessageToBot URL", url);
+    winston.verbose("sendMessageToBot URL" + url);
     const HTTPREQUEST = {
       url: url,
       headers: {
@@ -89,10 +88,6 @@ class DirMessageToBot {
   }
 
   myrequest(options, callback, log) {
-    if (this.log) {
-      console.log("API URL:", options.url);
-      console.log("** Options:", JSON.stringify(options));
-    }
     let axios_options = {
       url: options.url,
       method: options.method,
@@ -106,12 +101,7 @@ class DirMessageToBot {
       });
       axios_options.httpsAgent = httpsAgent;
     }
-    axios(axios_options)
-    .then((res) => {
-      if (this.log) {
-        console.log("Response for url:", options.url);
-        console.log("Response headers:\n", JSON.stringify(res.headers));
-      }
+    axios(axios_options).then((res) => {
       if (res && res.status == 200 && res.data) {
         if (callback) {
           callback(null, res.data);
@@ -124,7 +114,7 @@ class DirMessageToBot {
       }
     })
     .catch( (error) => {
-      console.error("(DirMessageToBot) Axios error: ", JSON.stringify(error));
+      winston.error("(DirMessageToBot) Axios error: ", error.response.data);
       if (callback) {
         callback(error, null, null);
       }

package/tiledeskChatbotPlugs/directives/DirMoveToAgent.js

@@ -3,6 +3,7 @@ const { Directives } = require('./Directives');
 const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
+const winston = require('../../utils/winston');
 
 class DirMoveToAgent {
 
@@ -27,6 +28,7 @@ class DirMoveToAgent {
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute MoveToAgent directive");
     directive.action = {};
     this.go(directive.action, () => {
       callback();
@@ -36,10 +38,10 @@ class DirMoveToAgent {
   async go(action, callback) {
     this.tdClient.moveToAgent(this.requestId, (err) => {
       if (err) {
-        console.error("Error moving to agent:", err);
+        winston.error("DirMoveToAgent) Error moving to agent: ", err);
       }
       else {
-        // console.log("Successfully moved to agent");
+        // Successfully moved to agent
       }
       callback();
     });

package/tiledeskChatbotPlugs/directives/DirMoveToUnassigned.js

@@ -3,6 +3,7 @@ const { Directives } = require('./Directives');
 const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskChatbotConst } = require('../../models/TiledeskChatbotConst');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
+const winston = require('../../utils/winston');
 
 class DirMoveToUnassigned {
 
@@ -25,6 +26,7 @@ class DirMoveToUnassigned {
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute MoveToUnassigned directive");
     directive.action = {};
     this.go(directive.action, () => {
       callback();
@@ -34,10 +36,10 @@ class DirMoveToUnassigned {
   async go(action, callback) {
     this.moveToUnassigned(this.requestId, (err) => {
       if (err) {
-        console.error("Error moving to unassigned:", err);
+        winston.error("(DirMoveToUnassigned) Error moving to unassigned: ", err);
       }
       else {
-        // console.log("Successfully moved to unassigned");
+        // Successfully moved to unassigned
       }
       callback();
     });