@tiledesk/tiledesk-tybot-connector 0.5.1-rc1 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.5.1-rc1",
+  "version": "2.0.0",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -222,13 +222,14 @@ class DirectivesChatbotPlug {
       directive_name = directive.name.toLowerCase();
     }
     if (directive && directive.action) {
-      const action_id = directive.action["_tdActionId"];
-      const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
-      if ( locked_action_id && (locked_action_id !== action_id) ) {
-        let next_dir = await this.nextDirective(this.directives);
-        this.process(next_dir);
-        return;
-      }      
+        const action_id = directive.action["_tdActionId"];
+        const locked_action_id = await this.chatbot.currentLockedAction(this.supportRequest.request_id);
+        if ( locked_action_id && (locked_action_id !== action_id) ) {
+          let next_dir = await this.nextDirective(this.directives);
+          this.process(next_dir);
+          return;
+        }
+      
     }
     if (directive == null || (directive !== null && directive["name"] === undefined)) {
       winston.debug("(DirectivesChatbotPlug) stop process(). directive is (null?): ", directive);
@@ -700,19 +701,6 @@ class DirectivesChatbotPlug {
         }
       });
     }
-    else if (directive_name === Directives.WEBHOOK) {
-      // console.log(".....DirIntent")
-      new DirIntent(context).execute(directive, async (stop) => {
-        if (stop) {
-          if (context.log) { console.log("Stopping Actions on:", JSON.stringify(directive));}
-          this.theend();
-        }
-        else {
-          let next_dir = await this.nextDirective(this.directives);
-          this.process(next_dir);
-        }
-      });
-    }
     else if (directive_name === Directives.WEB_RESPONSE) {
       new DirWebResponse(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);

package/tiledeskChatbotPlugs/directives/DirIntent.js

@@ -62,12 +62,10 @@ class DirIntent {
         "recipient": requestId,
         "text": intent_command,
         "id_project": projectId,
-        "request": this.supportRequest,
-        // "request": {
-        //   "request_id": requestId,
-        //   "id_project": projectId
-        //   // "bot_id": botId
-        // }
+        "request": {
+          "request_id": requestId,
+          "id_project": projectId
+        }
       },
       "token": this.token
     }

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -3,8 +3,8 @@ const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
 let axios = require('axios');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
-const winston = require('../../utils/winston');
 const { Logger } = require('../../Logger');
+const winston = require('../../utils/winston')
 
 class DirReply {
 
@@ -18,7 +18,7 @@ class DirReply {
     this.token = context.token;
     this.tdcache = context.tdcache;
     this.log = context.log;
-    this.supportRequest = this.context.supportRequest;
+    console.log("is draft request: ", this.context.supportRequest.draft);
     this.logger = new Logger({ request_id: this.requestId, dev: this.context.supportRequest.draft });
 
     this.API_ENDPOINT = context.API_ENDPOINT;
@@ -45,10 +45,10 @@ class DirReply {
       callback();
       return;
     }
-    this.logger.info("Executing Action Reply ", directive.action)
+    this.logger.info("1 Execute action reply for " + directive.action.text)
 
     this.go(action, () => {
-      this.logger.info("Action Reply terminated")
+      this.logger.info("6 End of action reply " + directive.action.text + " -> callback")
       callback();
     });
   }
@@ -69,16 +69,15 @@ 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);
@@ -91,7 +90,6 @@ class DirReply {
             let command = commands[i];
             if (command.type === 'message' && command.message && command.message.text) {
               command.message.text = filler.fill(command.message.text, requestAttributes);
-              this.logger.debug("Filled message.text with ", command.message.text)
               TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               winston.debug("DirReply command filled: " + command.message.text);
             }
@@ -146,6 +144,15 @@ 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);
 
@@ -156,8 +163,10 @@ 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/DirWebResponse.js

@@ -1,7 +1,6 @@
 const { Filler } = require('../Filler');
 const { TiledeskChatbot } = require('../../engine/TiledeskChatbot');
 const { TiledeskChatbotUtil } = require('../../utils/TiledeskChatbotUtil');
-const winston = require('../../utils/winston');
 let axios = require('axios');
 
 class DirWebResponse {
@@ -38,24 +37,25 @@ class DirWebResponse {
   async go(action, callback) {
     winston.debug("DirWebResponse action: ", action);
     
-    if (!this.tdcache) {
-      winston.error("DirWebResponse Error: tdcache is mandatory");
-      callback();
-      return;
-    }
-    
     let requestAttributes = null;
-    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 status = null;
+    if (this.tdcache) {
+      requestAttributes = 
+      await TiledeskChatbot.allParametersStatic(this.tdcache, this.requestId);
+      const filler = new Filler();
 
+      try {
+        status = filler.fill(action.status, requestAttributes);
+      }
+      catch(e) {
+        winston.error("DirWebResponse Error: ", e)
+      }
+      
+    }
+
+    const json = await this.getJsonFromAction(action, filler, requestAttributes)
     let webResponse = {
-      status: filled_status,
+      status: status,
       payload: json
     }
 
@@ -96,4 +96,42 @@ 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/Directives.js

@@ -58,7 +58,6 @@ 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

@@ -319,31 +319,55 @@ 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 {
-                                            winston.verbose("Invalid button. Skipping:", button);
+                                            console.log("Invalid button. Skipping:", JSON.stringify(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) {
-                                winston.warn("Invalid json_buttons:", error)
+                                console.error("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 {
-                                winston.verbose("Invalid json_buttons. Skipping...")
+                                console.log("Invalid json_buttons. Skipping")
                             }
                         }
                     }