@tiledesk/tiledesk-tybot-connector 0.5.0-rc2 → 0.5.1-rc1

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.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');
 const winston = require('../../utils/winston');
 
@@ -38,10 +38,9 @@ class DirWebRequestV2 {
   }
 
   async go(action, callback) {
-    winston.debug("(DirWebRequestV2) Action: ", 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;
     }
@@ -51,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 =
@@ -91,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,
@@ -100,19 +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) { 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 {
-        winston.debug("(DirWebRequestV2) No trueIntentDirective specified");
+        winston.debug("DirWebRequestV2 No trueIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -253,7 +250,7 @@ class DirWebRequestV2 {
         });
       }
       else {
-        winston.debug("(DirWebRequestV2) No falseIntentDirective specified");
+        winston.debug("DirWebRequestV2 No falseIntentDirective specified");
         if (callback) {
           callback();
         }
@@ -305,6 +302,21 @@ class DirWebRequestV2 {
           }
         })
         .catch((err) => {
+          if (this.log) {
+            // 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
+              if (typeof value === 'object' && value != null) {
+                if (cache.indexOf(value) !== -1) {
+                  return;
+                }
+                cache.push(value);
+              }
+              return value;
+            });
+            winston.error("(DirWebRequestv2) An error occurred: ", error_log);
+            // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
+          }
           if (callback) {
             let status = 1000;
             let cache = [];
@@ -340,7 +352,7 @@ class DirWebRequestV2 {
         });
     }
     catch (error) {
-      winston.error("Error: ", error);
+      winston.error("DirWebRequestV2 Error:", error);
     }
   }
 
@@ -349,8 +361,6 @@ class DirWebRequestV2 {
     if (!action.settings) {
       return timeout;
     }
-   
-    
     if (action.settings.timeout) {
       if ((typeof action.settings.timeout === "number") && action.settings.timeout > min && action.settings.timeout < max) {
         timeout = Math.round(action.settings.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,7 @@
 const { Filler } = require('../Filler');
-const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
-const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
+const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
+const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
+const winston = require('../../utils/winston');
 let axios = require('axios');
 
 class DirWebResponse {
@@ -18,12 +19,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,29 +36,26 @@ class DirWebResponse {
   }
 
   async go(action, callback) {
-    if (this.log) {
-      console.log("(DirWebResponse) action:", action);
+    winston.debug("DirWebResponse action: ", action);
+    
+    if (!this.tdcache) {
+      winston.error("DirWebResponse Error: tdcache is mandatory");
+      callback();
+      return;
     }
     
     let requestAttributes = 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);
-      }
-      catch(e) {
-        console.error(e)
-      }
-      
-    }
-
+    requestAttributes = 
+      await TiledeskChatbot.allParametersStatic(
+        this.tdcache, this.requestId
+        );
+    
+    const filler = new Filler();
+    const filled_status = filler.fill(action.status, requestAttributes);
     const json = await this.getJsonFromAction(action, filler, requestAttributes)
+
     let webResponse = {
-      status: status,
+      status: filled_status,
       payload: json
     }
 
@@ -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");
           }
         }
@@ -99,42 +96,4 @@ class DirWebResponse {
 
 }
 
-
-
-/**
- * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
- * /${TILEBOT_ROUTE}/ext/${botId}
- *
- * @param {Object} webResponse. The webhook response to send back
- * @param {Object} projectId. The projectId
- * @param {string} botId. Tiledesk botId
- * @param {string} token. User token
- */
-// function sendResponse(webResponse, projectId, botId, callback) {
-//   const url = `${WEBHOOK_URL}/${projectId}/${botId}`;
-//   const HTTPREQUEST = {
-//     url: url,
-//     headers: {
-//       'Content-Type': 'application/json'
-//     },
-//     json: webResponse,
-//     method: 'POST'
-//   };
-//   myrequest(
-//     HTTPREQUEST,
-//     function (err, resbody) {
-//       if (err) {
-//         if (callback) {
-//           callback(err);
-//         }
-//       }
-//       else {
-//         if (callback) {
-//           callback(null, resbody);
-//         }
-//       }
-//     }, false
-//   );
-// }
-
 module.exports = { DirWebResponse };

package/tiledeskChatbotPlugs/directives/DirWhatsappByAttribute.js

@@ -1,5 +1,6 @@
 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;
@@ -71,7 +72,7 @@ class DirWhatsappByAttribute {
     }
 
     return new Promise((resolve, reject) => {
-      DirWhatsappByAttribute.myrequest(
+      httpUtils.request(
         HTTPREQUEST,
         function (err, resbody) {
           if (err) {
@@ -91,33 +92,6 @@ class DirWhatsappByAttribute {
     })
 
   }
-
-  // HTTP REQUEST
-  static async myrequest(options, callback, log) {
-    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) => {
-      winston.error("(DirWhatsappByAttribute) An error occured: ", err);
-      if (callback) {
-        callback(err, null, null);
-      }
-    })
-  }
 }
 
 module.exports = { DirWhatsappByAttribute }

package/utils/HttpUtils.js

@@ -0,0 +1,128 @@
+let axios = require('axios');
+let https = require("https");
+const winston = require('./winston');
+
+class HttpUtils {
+
+  constructor() { }
+
+  request(options, callback) {
+    let axios_options = {
+      url: options.url,
+      method: options.method,
+      params: options.params,
+      headers: options.headers
+    }
+    if (options.json !== null) {
+      axios_options.data = options.json
+    }
+    if (options.url.startsWith("https:")) {
+      const httpsAgent = new https.Agent({
+        rejectUnauthorized: false,
+      });
+      axios_options.httpsAgent = httpsAgent;
+    }
+    axios(axios_options)
+      .then((res) => {
+        if (res && res.status == 200 && res.data) {
+          if (callback) {
+            callback(null, res.data);
+          }
+        }
+        else {
+          if (callback) {
+            callback(new Error("Response status is not 200"), null);
+          }
+        }
+      })
+      .catch((error) => {
+        if (error.response.data) {
+          if (typeof error.response.data === 'string') {
+            winston.error("Axios error response data: " + error.response.data);
+          } else {
+            winston.error("Axios error response data: ", error.response.data);
+          }
+        } else if (error.response) {
+          winston.error("Axios error response: ", error.response);
+        } else {
+          winston.error("Axios error: ", error);
+        }
+        if (callback) {
+          callback(error, null);
+        }
+      });
+  }
+
+  // static myrequest(options, callback, log) {
+  //     winston.verbose("** API URL: " + options.url);
+  //     winston.debug("** Options: ", options);
+  //     let axios_settings = {
+  //       url: options.url,
+  //       method: options.method,
+  //       data: options.json,
+  //       params: options.params,
+  //       headers: options.headers
+  //     }
+
+  //     if (options.url.startsWith("https:") && options.httpsOptions) {
+  //       const httpsAgent = new https.Agent(options.httpsOptions);
+  //       axios_settings.httpsAgent = httpsAgent;
+  //     }
+  //     else if (options.url.startsWith("https:") && !options.httpsOptions) {
+  //       // HTTPS default is rejectUnauthorized: false
+  //       const httpsAgent = new https.Agent({
+  //         rejectUnauthorized: false,
+  //       });
+  //       axios_settings.httpsAgent = httpsAgent;
+  //     }
+
+  //     axios(axios_settings)
+  //     .then(function (res) {
+  //       winston.debug("Response for url: " + options.url);
+  //       winston.debug("Response headers: ", res.headers);
+
+  //       if (res && res.status == 200 && res.data) {
+  //         if (callback) {
+  //           callback(null, res.data);
+  //         }
+  //       }
+  //       else {
+
+  //         if (callback) {
+  //           callback(Utils.getErr({message: "Response status not 200"}, options, res), null, null);
+  //         }
+  //       }
+  //     })
+  //     .catch(function (error) {
+  //       winston.error("Request Error: ", error); 
+  //       if (callback) {
+  //         callback(error, null, null);
+  //       }
+  //     });
+  // }
+
+  static getErr(err, request, response) {
+    let res_err = {}
+    res_err.http_err = err;
+    res_err.http_request = request;
+    res_err.http_response = response;
+    return res_err;
+  }
+
+  fixToken(token) {
+    if (token.startsWith('JWT ')) {
+      return token;
+    }
+    else {
+      return 'JWT ' + token;
+    }
+  }
+
+
+
+
+}
+
+const httpUtils = new HttpUtils();
+
+module.exports = httpUtils;

package/{models → utils}/TiledeskChatbotUtil.js

@@ -1,12 +1,12 @@
 const { TiledeskExpression } = require('../TiledeskExpression');
 const { Filler } = require('../tiledeskChatbotPlugs/Filler');
-const { TiledeskChatbotConst } = require('./TiledeskChatbotConst');
-const { TiledeskChatbot } = require('./TiledeskChatbot.js');
+const { TiledeskChatbotConst } = require('../engine/TiledeskChatbotConst');
+const { TiledeskChatbot } = require('../engine/TiledeskChatbot.js');
 let parser = require('accept-language-parser');
 const { Directives } = require('../tiledeskChatbotPlugs/directives/Directives.js');
 require('dotenv').config();
 let axios = require('axios');
-const winston = require('../utils/winston');
+const winston = require('./winston');
 
 class TiledeskChatbotUtil {
 
@@ -313,79 +313,37 @@ class TiledeskChatbotUtil {
                                 // fill buttons
                                 const filler = new Filler();
                                 json_buttons_string = filler.fill(json_buttons_string, flow_attributes);
-                                console.log("json_buttons_string:", json_buttons_string);
-                                console.log("type json_buttons_string:", typeof json_buttons_string);
-                                try {
-                                    json_buttons = JSON.parse(json_buttons_string);
-                                    console.log("json_buttons (parsed): ", json_buttons);
-                                } catch(err) {
-                                    console.error("Error parsing json_buttons_string: ", err)
-                                }
-                                
-                                console.log("after try type json_buttons: ", typeof json_buttons, json_buttons);
-                                console.log("Array.isArray(json_buttons): ", Array.isArray(json_buttons));
+                                // console.log("json_buttons_string:", json_buttons_string);
+                                json_buttons = JSON.parse(json_buttons_string);
                                 if (Array.isArray(json_buttons)) {
-                                    console.log("json_buttons is array");
                                     json_buttons.forEach(button => {
-                                        console.log("analyze button:", button);
-                                        console.log("button.value:", typeof button.value, button.value);
-                                        console.log("button.type:", typeof button.type, button.type);
-                                        console.log("button.action:", typeof button.action, button.action);
-                                        console.log("final_buttons:", final_buttons);
                                         if (button.value && button.type === "action" && button.action) {
-                                            console.log("Case 1");
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "text") {
-                                            console.log("Case 2");
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "url" && button.link) {
-                                            console.log("Case 3");
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else {
-                                            console.log("Invalid button. Skipping:", JSON.stringify(button) );
+                                            winston.verbose("Invalid button. Skipping:", button);
                                         }
                                     });
                                 }
-
-                                // "buttons": [
-                                //                 {
-                                //                     "type": "action",
-                                //                     "value": "Button1", // obbligatorio sempre
-                                //                     "action": "#bb347206-d639-4926-94c9-e94930623dce", // mandatory
-                                //                     "show_echo": true, // lo inserisco sempre
-                                //                     "alias": "button1 alias"
-                                //                 },
-                                //                 {
-                                //                     "type": "text",
-                                //                     "value": "Button2 text", // obbligatorio sempre
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 },
-                                //                 {
-                                //                     "type": "url",
-                                //                     "value": "Button3 link", // obbligatorio sempre
-                                //                     "link": "http://", // obbligatorio
-                                //                     "show_echo": true // lo inserisco sempre
-                                //                 }
-                                //             ]
                             }
                             catch(error) {
-                                console.error("Invalid json_buttons:", error)
+                                winston.warn("Invalid json_buttons:", error)
                             }
                             if (final_buttons && final_buttons.length > 0) {
                                 command.message.attributes.attachment.buttons = final_buttons;
                                 delete command.message.attributes.attachment.json_buttons;
                             }
                             else {
-                                console.log("Invalid json buttons. Skipped:", JSON.stringify(final_buttons));
+                                winston.verbose("Invalid json_buttons. Skipping...")
                             }
                         }
                     }

package/TiledeskServices/utils.js

@@ -1,99 +0,0 @@
-let axios = require('axios');
-let https = require("https");
-
-class Utils {
-    constructor(){}
-
-
-    static myrequest(options, callback, log) {
-        if (log) {
-          console.log("** API URL:", options.url);
-          console.log("** Options:", JSON.stringify(options));
-        }
-        let axios_settings = {
-          url: options.url,
-          method: options.method,
-          data: options.json,
-          params: options.params,
-          headers: options.headers
-        }
-        // console.log("options.url.startsWith(https:)", options.url.startsWith("https:"))
-        // console.log("this.httpsOptions", this.httpsOptions)
-        
-        if (options.url.startsWith("https:") && options.httpsOptions) {
-          // console.log("Tiledesk Client v 0.9.x: url.startsWith https: && httpsOptions");
-          const httpsAgent = new https.Agent(options.httpsOptions);
-          axios_settings.httpsAgent = httpsAgent;
-        }
-        else if (options.url.startsWith("https:") && !options.httpsOptions) {
-          // HTTPS default is rejectUnauthorized: false
-          // console.log("Tiledesk Client v 0.9.x: url.startsWith https: && NOT httpsOptions");
-          const httpsAgent = new https.Agent({
-            rejectUnauthorized: false,
-          });
-          axios_settings.httpsAgent = httpsAgent;
-        }
-
-
-        
-        // console.log("Using axios settings:", axios_settings)
-        // axios(
-        //   {
-        //     url: options.url,
-        //     method: options.method,
-        //     data: options.json,
-        //     params: options.params,
-        //     httpsAgent: httpsAgent,
-        //     headers: options.headers
-        //   })
-        axios(axios_settings)
-        .then(function (res) {
-          if (log) {
-            console.log("Response for url:", options.url);
-            console.log("Response headers:\n", JSON.stringify(res.headers));
-            // console.log("******** Response for url:", res);
-          }
-          
-          if (res && res.status == 200 && res.data) {
-            if (callback) {
-              callback(null, res.data);
-            }
-          }
-          else {
-            
-            if (callback) {
-              callback(Utils.getErr({message: "Response status not 200"}, options, res), null, null);
-            }
-          }
-        })
-        .catch(function (error) {
-          // console.error(error); 
-          if (callback) {
-            callback(error, null, null);
-          }
-        });
-    }
-
-    static getErr(err, request, response) {
-        let res_err = {}
-        res_err.http_err = err;
-        res_err.http_request = request;
-        res_err.http_response = response;
-        return res_err;
-    }
-
-    static fixToken(token) {
-        if (token.startsWith('JWT ')) {
-            return token;
-        }
-        else {
-            return 'JWT ' + token;
-        }
-    }
-
-
-
-
-}
-
-module.exports = Utils