@tiledesk/tiledesk-tybot-connector 0.5.0 → 2.0.0

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -1,8 +1,9 @@
 let axios = require('axios');
 let https = require("https");
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskJSONEval } = require('../../TiledeskJSONEval');
+const winston = require('../../utils/winston');
 
 class DirWebRequest {
   constructor(context) {
@@ -16,12 +17,13 @@ class DirWebRequest {
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute WebRequest directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive:", JSON.stringify(directive));
+      winston.warn("DirWebRequest Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -31,7 +33,7 @@ class DirWebRequest {
   }
 
   async go(action, callback) {
-    if (this.log) {console.log("webRequest action:", JSON.stringify(action));}
+    winston.debug("(DirWebRequest) Action: ", action);
     let requestVariables = null;
     if (this.tdcache) {
       requestVariables = 
@@ -46,7 +48,6 @@ class DirWebRequest {
     if (action.headersString) {
       let headersDict = action.headersString
       for (const [key, value] of Object.entries(headersDict)) {
-        if (this.log) {console.log("header:", key, "value:", value)}
         let filled_value = filler.fill(value, requestVariables);
         headers[key] = filled_value;
       }
@@ -58,30 +59,29 @@ class DirWebRequest {
         json = JSON.parse(jsonBody);
       }
       catch(err) {
-        console.error("Error parsing webRequest jsonBody:", jsonBody);
+        winston.debug("(DirWebRequest) Error parsing webRequest jsonBody: ", jsonBody);
       }
     }
     
-    if (this.log) {console.log("webRequest URL", url);}
+    winston.verbose("(DirWebRequest) webRequest URL " + url);
     const HTTPREQUEST = {
       url: url,
       headers: headers,
       json: json,
       method: action.method
     };
-    if (this.log) {console.log("webRequest HTTPREQUEST", HTTPREQUEST);}
+    winston.debug("(DirWebRequest) HttpRequest ", HTTPREQUEST);
     this.myrequest(
       HTTPREQUEST, async (err, resbody) => {
-        if (this.log) {console.log("webRequest resbody:", resbody);}
+        winston.debug("(DirWebRequest) resbody: ", resbody);
         if (err) {
-          if (this.log) {console.error("webRequest error:", err);}
+          winston.error("(DirWebRequest)  error:", err);
           if (callback) {
             callback();
           }
         }
         else if (callback) {
           if (action.assignTo && this.context.tdcache && resbody) { // DEPRECATED
-            if (this.log) {console.log("(webRequest) this.requestId:", this.context.requestId);}
             let attributes =
               await TiledeskChatbot.allParametersStatic(
                 this.context.tdcache, this.context.requestId);
@@ -89,18 +89,8 @@ class DirWebRequest {
             let attributeValue;
             const filler = new Filler();
             attributeValue = filler.fill(resbody, attributes);
-            if (this.log) {console.log("(webRequest) Attributes:", JSON.stringify(attributes));}
             await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignTo, attributeValue);
-            if (this.log) {
-              console.log("(webRequest) Assigned:", action.assignTo, "=", attributeValue);
-              const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-              for (const [key, value] of Object.entries(all_parameters)) {
-                const value_type = typeof value;
-                if (this.log) {console.log("(webRequest) request parameter:", key, "value:", value, "type:", value_type)}
-              }
-            }
           } else if (action.assignments && this.context.tdcache && resbody) {
-            if (this.log) {console.log("(webRequest) action.assignments for request:", this.context.requestId);}
             let json_body;
             if (typeof resbody === "string") {
               json_body = {
@@ -110,35 +100,21 @@ class DirWebRequest {
             else {
               json_body = resbody
             }
-            if (this.log) {console.log("(webRequest) action.assignments json_body:", json_body);}
-            let attributes =
-              await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-              if (this.log) {console.log("(webRequest) action.assignments attributes:", attributes);}
+            let attributes = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
             const assignments = action.assignments;
-            if (this.log) {console.log("(webRequest) assignments:", assignments);}
             for (const [attr_name, attr_eval_expression] of Object.entries(assignments)) {
-              if (this.log) {console.log("", attr_name, attr_eval_expression);}
               let attributeValue;
               try {
                 attributeValue = TiledeskJSONEval.eval(json_body, attr_eval_expression);
-                if (this.log) {console.log("(webRequest) Assigning to:", attr_name, "value:", attributeValue);}
               }
               catch(err) {
-                console.error("Error:", err);
+                winston.error("(DirWebRequest) Error:", err);
               }
               try {
                 await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, attr_name, attributeValue);
               }
               catch(err) {
-                console.error("Error:", err);
-              }
-            }
-            if (this.log) {
-              console.log("(webRequest) All attributes:");
-              const all_parameters = await TiledeskChatbot.allParametersStatic(this.context.tdcache, this.context.requestId);
-              for (const [key, value] of Object.entries(all_parameters)) {
-                const value_type = typeof value;
-                if (this.log) {console.log("(webRequest) request attribute:", key, "value:", value, "type:", value_type)}
+                winston.error("(DirWebRequest) Error: ", err);
               }
             }
           }
@@ -149,10 +125,6 @@ class DirWebRequest {
   }
 
   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,
@@ -162,9 +134,6 @@ class DirWebRequest {
     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,
@@ -173,10 +142,6 @@ class DirWebRequest {
     }
     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 (res && res.status == 200 && res.data) {
         if (callback) {
           callback(null, res.data);
@@ -189,7 +154,7 @@ class DirWebRequest {
       }
     })
     .catch( (error) => {
-      console.error("(DirWebRequest) Axios error: ", JSON.stringify(error));
+      winston.error("(DirWebRequest) Axios error: ", error.response.data);
       if (callback) {
         callback(error, null);
       }

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -1,8 +1,9 @@
 let axios = require('axios');
 let https = require("https");
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { DirIntent } = require('./DirIntent');
+const winston = require('../../utils/winston');
 
 class DirWebRequestV2 {
 
@@ -19,12 +20,13 @@ class DirWebRequestV2 {
   }
 
   execute(directive, callback) {
+    winston.verbose("Execute WebRequestV2 directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive:", JSON.stringify(directive));
+      winston.warn("DirWebRequestV2 Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -36,9 +38,9 @@ class DirWebRequestV2 {
   }
 
   async go(action, callback) {
-    if (this.log) { console.log("DirWebRequest action:", JSON.stringify(action)); }
+    winston.debug("DirWebRequestV2 action:", action);
     if (!this.tdcache) {
-      console.error("Error: DirWebRequest tdcache is mandatory");
+      winston.error("Error: DirWebRequestV2 tdcache is mandatory");
       callback();
       return;
     }
@@ -48,12 +50,10 @@ class DirWebRequestV2 {
     let trueIntentAttributes = action.trueIntentAttributes;
     let falseIntentAttributes = action.falseIntentAttributes;
 
-    if (this.log) {
-      console.log("DirWebRequest trueIntent", trueIntent)
-      console.log("DirWebRequest falseIntent", falseIntent)
-      console.log("DirWebRequest trueIntentAttributes", trueIntentAttributes)
-      console.log("DirWebRequest falseIntentAttributes", falseIntentAttributes)
-    }
+    winston.debug("DirWebRequestV2  trueIntent " + trueIntent)
+    winston.debug("DirWebRequestV2  falseIntent " + falseIntent)
+    winston.debug("DirWebRequestV2  trueIntentAttributes " + trueIntentAttributes)
+    winston.debug("DirWebRequestV2  falseIntentAttributes " + falseIntentAttributes)
 
     let requestAttributes = null;
     requestAttributes =
@@ -88,7 +88,7 @@ class DirWebRequestV2 {
 
     let timeout = this.#webrequest_timeout(action, 20000, 1, 300000);
 
-    if (this.log) {console.log("webRequest URL", url);}
+    winston.debug("DirWebRequestV2 webRequest URL " + url);
 
     const HTTPREQUEST = {
       url: url,
@@ -97,22 +97,19 @@ class DirWebRequestV2 {
       method: action.method,
       timeout: timeout
     };
-    if (this.log) { console.log("webRequest HTTPREQUEST", HTTPREQUEST); }
+    winston.debug("DirWebRequestV2 HttpRequest: ", HTTPREQUEST);
     
     this.#myrequest(
       HTTPREQUEST, async (err, res) => {
-        if (this.log && err) {
-          console.log("webRequest error:", err);
-        }
-        if (this.log) { console.log("DirWebRequest res:", res); }
+
         let resbody = res.data;
         let status = res.status;
         let error = res.error;
         await this.#assignAttributes(action, resbody, status, error)
-        if (this.log) { console.log("webRequest resbody:", resbody); }
+        winston.debug("DirWebRequestV2 resbody:", resbody);
         
         if (err) {
-          if (this.log) { console.error("webRequest error:", err); }
+          winston.log("webRequest error: ", err);
           if (callback) {
             if (falseIntent) {
               await this.#executeCondition(false, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes);
@@ -177,7 +174,7 @@ class DirWebRequestV2 {
           resolve(json);
         }
         catch (err) {
-          if (this.log) { console.error("Error parsing webRequest jsonBody:", jsonBody, err) };
+          winston.error("DirWebRequestV2 Error parsing webRequest jsonBody: " + JSON.stringify(jsonBody) + "\nError: " + JSON.stringify(err));
           reject("Error parsing jsonBody");
         }
       }
@@ -210,7 +207,7 @@ class DirWebRequestV2 {
           }
           resolve(json);
         } catch (err) {
-          if (this.log) { console.error("Error parsing webRequest formData:", formData, err) };
+          winston.error("DirWebRequestV2 Error parsing webRequest formData: " + JSON.stringify(formData) + "\nError: " + JSON.stringify(err)); 
           reject("Error parsing formData");
         }
       }
@@ -238,7 +235,7 @@ class DirWebRequestV2 {
         });
       }
       else {
-        if (this.log) { console.log("No trueIntentDirective specified"); }
+        winston.debug("DirWebRequestV2 No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -253,7 +250,7 @@ class DirWebRequestV2 {
         });
       }
       else {
-        if (this.log) { console.log("No falseIntentDirective specified"); }
+        winston.debug("DirWebRequestV2 No falseIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -262,53 +259,22 @@ class DirWebRequestV2 {
   }
 
   async #assignAttributes(action, resbody, status, error) {
-    if (this.log) {
-      console.log("assignAttributes resbody:", resbody)
-      console.log("assignAttributes error:", error)
-      console.log("assignAttributes status:", status)
-      console.log("assignAttributes action:", action)
-    }
+
     if (this.context.tdcache) {
       if (action.assignResultTo && resbody) {
-        if (this.log) { console.log("assign assignResultTo:", resbody); }
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignResultTo, resbody);
       }
       if (action.assignErrorTo && error) {
-        if (this.log) { console.log("assign assignResultTo:", error); }
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignErrorTo, error);
       }
       if (action.assignStatusTo && status) {
-        if (this.log) { console.log("assign assignStatusTo:", status); }
         await TiledeskChatbot.addParameterStatic(this.context.tdcache, this.context.requestId, action.assignStatusTo, status);
       }
-      // 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("(webRequest) request parameter:", key, "value:", value, "type:", typeof value) }
-        }
-      }
     }
   }
 
   #myrequest(options, callback) {
     try {
-      if (this.log) {
-        console.log("API URL:", options.url);
-        //console.log("** Options:", JSON.stringify(options));
-        // Stringify "options". FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
-        let cache = [];
-        let str_Options = JSON.stringify(options, function (key, value) { // try to use a separate function
-          if (typeof value === 'object' && value != null) {
-            if (cache.indexOf(value) !== -1) {
-              return;
-            }
-            cache.push(value);
-          }
-          return value;
-        });
-        console.log("** Options:", str_Options);
-      }
       let axios_options = {
         url: options.url,
         method: options.method,
@@ -322,9 +288,6 @@ class DirWebRequestV2 {
       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,
@@ -334,20 +297,12 @@ class DirWebRequestV2 {
 
       axios(axios_options)
         .then((res) => {
-          if (this.log) {
-            console.log("Success Response:", res);
-            console.log("Response for url:", options.url);
-            console.log("Response headers:\n", JSON.stringify(res.headers));
-          }
           if (callback) {
             callback(null, res);
           }
         })
         .catch((err) => {
           if (this.log) {
-            if (err.response) {
-              console.log("Error Response data:", err.response.data);
-            }
             // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - START
             let cache = [];
             let error_log = JSON.stringify(err, function (key, value) { // try to use a separate function
@@ -359,9 +314,8 @@ class DirWebRequestV2 {
               }
               return value;
             });
-            console.error("(DirWebRequestv2) An error occurred: ", error_log);
+            winston.error("(DirWebRequestv2) An error occurred: ", error_log);
             // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
-            // console.error("An error occurred:", JSON.stringify(err));
           }
           if (callback) {
             let status = 1000;
@@ -398,7 +352,7 @@ class DirWebRequestV2 {
         });
     }
     catch (error) {
-      console.error("Error:", error);
+      winston.error("DirWebRequestV2 Error:", error);
     }
   }
 
@@ -407,20 +361,11 @@ class DirWebRequestV2 {
     if (!action.settings) {
       return timeout;
     }
-    // console.log("default timeout:", timeout);
-    // console.log("action.settings:", action.settings);
-    // console.log("action.settings.timeout:", action.settings.timeout);
-    // console.log("typeof action.settings.timeout:", typeof action.settings.timeout);
-    // console.log("action.settings.timeout > min", action.settings.timeout > min)
-    // console.log("action.settings.timeout < max", action.settings.timeout < max)  
-
     if (action.settings.timeout) {
       if ((typeof action.settings.timeout === "number") && action.settings.timeout > min && action.settings.timeout < max) {
         timeout = Math.round(action.settings.timeout)
-        // console.log("new timeout:", timeout);
       }
     }
-    // console.log("returning timeout:", timeout);
     return timeout
   }
 

package/tiledeskChatbotPlugs/directives/DirWebRequestV2_old.js

@@ -1,7 +1,7 @@
 let axios = require('axios');
 let https = require("https");
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { DirIntent } = require('./DirIntent');
 
 class DirWebRequestV2 {

package/tiledeskChatbotPlugs/directives/DirWebResponse.js

@@ -1,6 +1,6 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 let axios = require('axios');
 
 class DirWebResponse {
@@ -18,12 +18,13 @@ class DirWebResponse {
   }
 
   execute(directive, callback) {
+    winston.debug("Execute WebResponse directive: ", directive);
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive (no action provided):", directive);
+      winston.debug("DirWebResponse Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -34,22 +35,20 @@ class DirWebResponse {
   }
 
   async go(action, callback) {
-    if (this.log) {
-      console.log("(DirWebResponse) action:", action);
-    }
+    winston.debug("DirWebResponse action: ", action);
     
     let requestAttributes = null;
+    let status = null;
     if (this.tdcache) {
       requestAttributes = 
       await TiledeskChatbot.allParametersStatic(this.tdcache, this.requestId);
       const filler = new Filler();
 
       try {
-        let status = action.status;
-        status = filler.fill(status, requestAttributes);
+        status = filler.fill(action.status, requestAttributes);
       }
       catch(e) {
-        console.error(e)
+        winston.error("DirWebResponse Error: ", e)
       }
       
     }
@@ -64,12 +63,10 @@ class DirWebResponse {
     
     try {
       this.tdcache.publish(topic, JSON.stringify(webResponse));
-      if (this.log) {
-        console.log("(DirWebResponse) Published webresponse to topic:", topic);
-      }
+      winston.verbose("DirWebResponse Published webresponse to topic: " + topic);
     }
     catch(e) {
-      console.error(e)
+      winston.error("DirWebResponse Error: ", e)
     }
 
     callback();
@@ -87,7 +84,7 @@ class DirWebResponse {
             resolve(json);
           }
           catch (err) {
-            if (this.log) { console.error("Error parsing webRequest jsonBody:", jsonBody, err) };
+            winston.error("Error parsing webRequest jsonBody: " + JSON.stringify(jsonBody) + "\nError: " + JSON.stringify(err));
             reject("Error parsing jsonBody");
           }
         }

package/tiledeskChatbotPlugs/directives/DirWhatsappByAttribute.js

@@ -1,5 +1,7 @@
 const axios = require("axios").default;
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const httpUtils = require("../../utils/HttpUtils");
+const winston = require('../../utils/winston');
 
 let whatsapp_api_url;
 
@@ -15,13 +17,13 @@ class DirWhatsappByAttribute {
   }
 
   execute(directive, callback) {
-    console.log("\n\nwhatsapp by attribtues action (execute) - directive: ", directive);
+    winston.verbose("Execute WhatsappByAttribute directive");
     let action;
     if (directive.action) {
       action = directive.action;
     }
     else {
-      console.error("Incorrect directive: ", JSON.stringify(directive));
+      winston.warn("DirWhatsappByAttribute Incorrect directive: ", directive);
       callback();
       return;
     }
@@ -31,10 +33,7 @@ class DirWhatsappByAttribute {
   }
 
   async go(action, callback) {
-
-    if (this.log) {
-      console.log("whatsapp by attributes action: ", JSON.stringify(action))
-    }
+    winston.debug("(DirWhatsappByAttribute) Action: ", action);
 
     const whatsapp_api_url_pre = process.env.WHATSAPP_ENDPOINT;
 
@@ -43,20 +42,20 @@ class DirWhatsappByAttribute {
     } else {
       whatsapp_api_url = this.API_ENDPOINT + "/modules/whatsapp/api"
     }
-    console.log("DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
+    winston.debug("(DirWhatsappByAttribute) whatsapp_api_url: " + whatsapp_api_url);
 
     if (!action.attributeName) {
-      console.error("DirWhatsappByAttribute attributeName is mandatory")
+      winston.error("(DirWhatsappByAttribute) attributeName is mandatory")
       callback();
       return;
     }
-    if (this.log) { console.log("DirWhatsappByAttribute attributeName: ", action.attributeName )};
+    winston.debug("(DirWhatsappByAttribute) attributeName: " + action.attributeName )
 
     const attribute_value = await TiledeskChatbot.getParameterStatic(this.context.tdcache, this.context.requestId, action.attributeName)
-    if (this.log) { console.log("attribute_value:", JSON.stringify(attribute_value)); }
+    winston.debug("(DirWhatsappByAttribute) attribute_value:", attribute_value);
 
     if (attribute_value == null) {
-      console.error("DirWhatsappByAttribute attribute_value is undefined");
+      winston.error("(DirWhatsappByAttribute)  attribute_value is undefined");
       callback();
       return;
     }
@@ -73,7 +72,7 @@ class DirWhatsappByAttribute {
     }
 
     return new Promise((resolve, reject) => {
-      DirWhatsappByAttribute.myrequest(
+      httpUtils.request(
         HTTPREQUEST,
         function (err, resbody) {
           if (err) {
@@ -86,41 +85,13 @@ class DirWhatsappByAttribute {
             if (callback) {
               callback(null, resbody);
             }
-            console.log("(tybot) broadcast sent: ", resbody);
+            winston.debug("(DirWhatsappByAttribute) broadcast sent: ", resbody);
             resolve(resbody);
           }
         }, true);
     })
 
   }
-
-  // HTTP REQUEST
-  static async myrequest(options, callback, log) {
-    console.log("my request execution")
-    return await axios({
-      url: options.url,
-      method: options.method,
-      data: options.json,
-      params: options.params,
-      headers: options.headers
-    }).then((res) => {
-      if (res && res.status == 200 && res.data) {
-        if (callback) {
-          callback(null, res.data);
-        }
-      }
-      else {
-        if (callback) {
-          callback(TiledeskClient.getErr({ message: "Response status not 200" }, options, res), null, null);
-        }
-      }
-    }).catch((err) => {
-      console.error("(tybot request) An error occured: ", err);
-      if (callback) {
-        callback(err, null, null);
-      }
-    })
-  }
 }
 
 module.exports = { DirWhatsappByAttribute }

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -74,13 +74,10 @@ class Directives {
   // static CONDITION = "condition"; // DEPRECATED
 
   static actionToDirective(action) {
-    // console.log("actionToDirective:", action);
     let directive = {
       name: action["_tdActionType"],
       action: action
     }
-    // delete directive.action["_tdActionType"];
-    // console.log("Directive out:", directive);
     return directive;
   }
 }