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

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -17,7 +17,7 @@ class DirReply {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
-    this.log = context.log;
+    this.supportRequest = this.context.supportRequest;
     this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest.draft });
 
     this.API_ENDPOINT = context.API_ENDPOINT;
@@ -25,8 +25,7 @@ class DirReply {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 
@@ -44,10 +43,10 @@ class DirReply {
       callback();
       return;
     }
-    this.logger.info("1 Execute action reply for " + directive.action.text)
+    this.logger.info("Executing Action Reply ", directive.action)
 
     this.go(action, () => {
-      this.logger.info("6 End of action reply " + directive.action.text + " -> callback")
+      this.logger.info("Action Reply terminated")
       callback();
     });
   }
@@ -68,15 +67,16 @@ class DirReply {
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
-      this.logger.info("2 Sending reply " + message.text);
 
       if (message.metadata) {
         winston.debug("DirReply filling message 'metadata':", message.metadata);
         if (message.metadata.src) {
           message.metadata.src = filler.fill(message.metadata.src, requestAttributes);
+          this.logger.debug("Filled metadata.src with ", message.metadata.src);
         }
         if (message.metadata.name) {
           message.metadata.name = filler.fill(message.metadata.name, requestAttributes);
+          this.logger.debug("Filled metadata.name with ", message.metadata.name);
         }
       }
       winston.debug("DirReply filling commands'. Message:", message);
@@ -89,7 +89,7 @@ class DirReply {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
+              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes);
               winston.debug("DirReply command filled: " + command.message.text);
             }
             if (command.type === 'settings' && command.settings) {
@@ -143,15 +143,6 @@ class DirReply {
     }
 
     let cleanMessage = message;
-    this.logger.info("3 Sending reply (text) " + cleanMessage.text);
-    this.logger.info("4 Sending reply with clean message " + JSON.stringify(cleanMessage));
-    // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
-    // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
-    //   console.log("invalid message", cleanMessage);
-    //   callback(); // cancel reply operation
-    //   return;
-    // }
-    
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     winston.debug("DirReply reply with clean message: ", cleanMessage);
 
@@ -162,10 +153,8 @@ class DirReply {
       (err) => {
         if (err) {
           winston.error("DirReply Error sending reply: ", err);
-          this.logger.error("Error sending reply: " + err);
         }
         winston.verbose("DirReply reply message sent")
-        this.logger.info("5 Reply message sent");
         const delay = TiledeskChatbotUtil.totalMessageWait(cleanMessage);
         if (delay > 0 && delay <= 30000) { // prevent long delays
           setTimeout(() => {

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -20,7 +20,6 @@ class DirReplyV2 {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
-    this.log = context.log;
     this.intentDir = new DirIntent(context);
     this.chatbot = context.chatbot;
     this.reply = context.reply;
@@ -31,8 +30,7 @@ class DirReplyV2 {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 
@@ -61,11 +59,10 @@ class DirReplyV2 {
     const message = action;
 
     let current; // debug only
-    if (this.log) {
-      if (message.attributes.commands[1].message.text) {
-        current = message.attributes.commands[1].message.text
-      }
+    if (message.attributes.commands[1].message.text) {
+      current = message.attributes.commands[1].message.text
     }
+    
     let must_stop = false;
     // fill
     let requestAttributes = null;
@@ -74,11 +71,9 @@ class DirReplyV2 {
       await TiledeskChatbot.allParametersStatic(
         this.tdcache, this.requestId
       );
-      if (this.log) {
-        for (const [key, value] of Object.entries(requestAttributes)) {
-          const value_type = typeof value;
-        }
-      }
+      // for (const [key, value] of Object.entries(requestAttributes)) {
+      //   const value_type = typeof value;
+      // }
 
       TiledeskChatbotUtil.replaceJSONButtons(message, requestAttributes);
 
@@ -197,7 +192,7 @@ class DirReplyV2 {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
+              TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes);
             }
           }
         }

package/tiledeskChatbotPlugs/directives/DirSendEmail.js

@@ -15,15 +15,13 @@ class DirSendEmail {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;    
 
     this.API_ENDPOINT = context.API_ENDPOINT;
     this.tdClient = new TiledeskClient({
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirSendWhatsapp.js

@@ -19,7 +19,6 @@ class DirSendWhatsapp {
     this.requestId = this.context.requestId;
     this.intentDir = new DirIntent(context);
     this.API_ENDPOINT = this.context.API_ENDPOINT;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirSetAttribute.js

@@ -77,7 +77,6 @@ class DirSetAttribute {
             throw new Error('context object is mandatory.');
         }
         this.context = context;
-        this.log = context.log;
     }
 
     execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirSetAttributeV2.js

@@ -79,7 +79,6 @@ class DirSetAttributeV2 {
         }
         this.context = context;
         this.tdcache = context.tdcache;
-        this.log = context.log;
     }
 
     execute(directive, callback) {
@@ -199,9 +198,7 @@ class DirSetAttributeV2 {
         httpUtils.request(
             HTTPREQUEST, async (err, resbody) => {
                 if (err) {
-                    if (this.log) {
-                        winston.error("(DirSetAttributeV2) persistOnTiledesk() error: ", err);
-                    }
+                    winston.error("(DirSetAttributeV2) persistOnTiledesk() error: ", err);
                 } else {
                     winston.debug("(DirSetAttributeV2) Attributes saved: ", resbody);
                 }

package/tiledeskChatbotPlugs/directives/DirSetConversationTags.js

@@ -9,7 +9,6 @@ class DirSetConversationTags {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
-    this.log = context.log;
     this.requestId = context.requestId;
 
     this.API_ENDPOINT = context.API_ENDPOINT;
@@ -17,8 +16,7 @@ class DirSetConversationTags {
       projectId: this.context.projectId,
       token: this.context.token,
       APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
+      APIKEY: "___"
     });
   }
 

package/tiledeskChatbotPlugs/directives/DirUnlockIntent.js

@@ -11,7 +11,6 @@ class DirUnlockIntent {
       throw new Error('tdcache (TdCache) object is mandatory.');
     }
     this.tdcache = context.tdcache;
-    this.log = context.log;
   }
 
   async execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirWait.js

@@ -12,7 +12,6 @@ class DirWait {
     this.chatbot = context.chatbot;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -13,7 +13,6 @@ class DirWebRequest {
     this.context = context;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -16,7 +16,6 @@ class DirWebRequestV2 {
     this.requestId = context.requestId;
     this.chatbot = context.chatbot;
     this.intentDir = new DirIntent(context);
-    this.log = context.log;
   }
 
   execute(directive, callback) {
@@ -302,21 +301,7 @@ 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
-          }
+          // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
           if (callback) {
             let status = 1000;
             let cache = [];

package/tiledeskChatbotPlugs/directives/DirWebResponse.js

@@ -15,7 +15,6 @@ class DirWebResponse {
     this.requestId = context.requestId;
     this.token = context.token;
     this.tdcache = context.tdcache;
-    this.log = context.log;
   }
 
   execute(directive, callback) {
@@ -96,42 +95,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

@@ -13,7 +13,6 @@ class DirWhatsappByAttribute {
     }
     this.context = context;
     this.API_ENDPOINT = context.API_ENDPOINT;
-    this.log = context.log;
   }
 
   execute(directive, callback) {

package/tiledeskChatbotPlugs/directives/Directives.js

@@ -58,6 +58,7 @@ class Directives {
   static MOVE_TO_UNASSIGNED = "move_to_unassigned";
   static CONNECT_BLOCK = "connect_block";
   static ADD_TAGS = 'add_tags'
+  static WEBHOOK = 'webhook';
   static WEB_RESPONSE = "web_response";
 
   // static WHEN_ONLINE_MOVE_TO_AGENT = "whenonlinemovetoagent"; // DEPRECATED?

package/utils/TiledeskChatbotUtil.js

@@ -252,24 +252,24 @@ class TiledeskChatbotUtil {
         }
     }
 
-    static fillCommandAttachments(command, variables, log) {
-        if (log) { winston.debug("(TiledeskChatbotUtils) Filling command button: ", command) }
+    static fillCommandAttachments(command, variables) {
+        winston.debug("(TiledeskChatbotUtils) Filling command button: ", command)
         if (command.message && command.message.attributes && command.message.attributes.attachment && command.message.attributes.attachment.buttons && command.message.attributes.attachment.buttons.length > 0) {
             let buttons = command.message.attributes.attachment.buttons;
             const filler = new Filler();
             buttons.forEach(button => {
                 if (button.link) {
                     button.link = filler.fill(button.link, variables);
-                    if (log) { winston.debug("(TiledeskChatbotUtils) button.link filled: " + button.link) }
+                    winston.debug("(TiledeskChatbotUtils) button.link filled: " + button.link)
                 }
                 if (button.value) {
                     button.value = filler.fill(button.value, variables);
-                    if (log) { winston.debug("(TiledeskChatbotUtils) button.value filled: " + button.value) }
+                    winston.debug("(TiledeskChatbotUtils) button.value filled: " + button.value)
                 }
             });
         }
         else {
-            if (log) { winston.debug("(TiledeskChatbotUtils) No attachments to fill in command") }
+            winston.debug("(TiledeskChatbotUtils) No attachments to fill in command")
         }
     }
 
@@ -319,55 +319,31 @@ class TiledeskChatbotUtil {
                                     json_buttons.forEach(button => {
                                         if (button.value && button.type === "action" && button.action) {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "text") {
                                             button.show_echo = true;
-                                            // console.log("pushing:", button)
                                             final_buttons.push(button);
                                         }
                                         else if (button.value && button.type === "url" && button.link) {
                                             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. Skipping")
+                                winston.verbose("Invalid json_buttons. Skipping...")
                             }
                         }
                     }
@@ -520,7 +496,7 @@ class TiledeskChatbotUtil {
     static async updateRequestAttributes(chatbot, chatbotToken, message, projectId, requestId) {
         // update request context
         try {
-            if (chatbot.log) { winston.debug("Updating request variables. Message:", message); }
+            winston.debug("Updating request variables. Message:", message);
             const messageId = message._id;
             const chat_url = `https://panel.tiledesk.com/v3/dashboard/#/project/${projectId}/wsrequest/${requestId}/messages`
 
@@ -591,12 +567,12 @@ class TiledeskChatbotUtil {
             }
             
             if (message && message.request && message.request.lead) {
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Lead found with email: " + message.request.lead.email + " and lead.fullname " + message.request.lead.fullname); }
+                winston.debug("(TiledeskChatbotUtil) Lead found with email: " + message.request.lead.email + " and lead.fullname " + message.request.lead.fullname);
                 let currentLeadEmail = await chatbot.getParameter(TiledeskChatbotConst.REQ_LEAD_EMAIL_KEY);
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail); }
+                winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail);
                 if (message.request.lead.email && !currentLeadEmail) {
                     // worth saving
-                    if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) worth saving email"); }
+                    winston.debug("(TiledeskChatbotUtil) worth saving email");
                     try {
                         await chatbot.addParameter(TiledeskChatbotConst.REQ_LEAD_EMAIL_KEY, message.request.lead.email);
                     }
@@ -605,10 +581,10 @@ class TiledeskChatbotUtil {
                     }
                 }
                 let currentLeadName = await chatbot.getParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY);
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail); }
+                winston.debug("(TiledeskChatbotUtil) You lead email from attributes: " + currentLeadEmail);
                 if (message.request.lead.fullname && !currentLeadName) {
                     // worth saving
-                    if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) worth saving email"); }
+                    winston.debug("(TiledeskChatbotUtil) worth saving email");
                     try {
                         await chatbot.addParameter(TiledeskChatbotConst.REQ_LEAD_USERFULLNAME_KEY, message.request.lead.fullname);
                     }
@@ -685,10 +661,10 @@ class TiledeskChatbotUtil {
                     message.attributes = {}
                 }
                 message.attributes.payload = { ...message.attributes.payload, ...message.request.attributes.payload }
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Forced Set message.attributes.payload ", message.attributes.payload); }
+                winston.debug("(TiledeskChatbotUtil) Forced Set message.attributes.payload ", message.attributes.payload); 
             }
             if (message.attributes) {
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Ok message.attributes ", message.attributes); }
+                winston.debug("(TiledeskChatbotUtil) Ok message.attributes ", message.attributes);
 
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_ID_KEY, message.attributes.requester_id);
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_END_USER_IP_ADDRESS_KEY, message.attributes.ipAddress);
@@ -722,12 +698,12 @@ class TiledeskChatbotUtil {
             
             
             const _bot = chatbot.bot; // aka FaqKB
-            if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Adding Globals to context: ", _bot); }
+            winston.debug("(TiledeskChatbotUtil) Adding Globals to context: ", _bot); 
             
             if (_bot.attributes && _bot.attributes.globals) {
-                if (chatbot.log) { winston.error("(TiledeskChatbotUtil) Got Globals: ", _bot.attributes.globals); }
+                winston.error("(TiledeskChatbotUtil) Got Globals: ", _bot.attributes.globals);
                 _bot.attributes.globals.forEach(async (global_var) => {
-                    if (chatbot.log) { winston.error("(TiledeskChatbotUtil) Adding global: " + global_var.key + " value: " + global_var.value); }
+                    winston.error("(TiledeskChatbotUtil) Adding global: " + global_var.key + " value: " + global_var.value);
                     await chatbot.addParameter(global_var.key, global_var.value);
                 });
             }
@@ -740,20 +716,6 @@ class TiledeskChatbotUtil {
             //     }
             // );
             
-            if (chatbot.log) {
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) requestId: " + requestId); }
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Key: " + TiledeskChatbotConst.REQ_PROJECT_ID_KEY); }
-
-                let proj_ = await chatbot.getParameter(TiledeskChatbotConst.REQ_PROJECT_ID_KEY);
-                if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) request parameter proj_: " + proj_); }
-
-                const all_parameters = await chatbot.allParameters();
-                for (const [key, value] of Object.entries(all_parameters)) {
-                    const value_type = typeof value;
-                    if (chatbot.log) { winston.debug("(TiledeskChatbotUtil) Request Attribute: " + key + " value: " + value + " type: " + value_type); }
-                    
-                }
-            }
         } catch(error) {
             winston.error("(TiledeskChatbotUtil) updateRequestAttributes Error: ", error);
             process.exit(1)