@tiledesk/tiledesk-tybot-connector 0.4.1 → 0.5.0-rc1

package/models/TiledeskChatbotUtil.js

@@ -349,6 +349,105 @@ class TiledeskChatbotUtil {
         return all_buttons;
     }
 
+    static replaceJSONButtons(message, flow_attributes) {
+        let all_buttons = [];
+        if (message.attributes && message.attributes.commands) {
+            let commands = message.attributes.commands;
+            if (commands.length > 0) {
+                for (let i = 0; i < commands.length; i++) {
+                    let command = commands[i];
+                    if (command.type === 'message' && command.message) {
+                        if (command.message.attributes && command.message.attributes.attachment && command.message.attributes.attachment.json_buttons){
+                            // console.log("command with buttons ok:")
+                            let json_buttons_string = command.message.attributes.attachment.json_buttons;
+                            let json_buttons = null;
+                            let final_buttons = [];
+                            try {
+                                // 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));
+                                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) );
+                                        }
+                                    });
+                                }
+
+                                // "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)
+                            }
+                            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));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return all_buttons;
+    }
+
     static buttonByText(text, buttons) {
         if (buttons === null || text === null) {
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.4.1",
+  "version": "0.5.0-rc1",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {
@@ -15,6 +15,7 @@
     "@tiledesk/tiledesk-chatbot-client": "^0.5.30",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.39",
     "@tiledesk/tiledesk-client": "^0.10.13",
+    "@tiledesk/tiledesk-multi-worker": "^0.2.1-rc2",
     "accept-language-parser": "^1.5.0",
     "axios": "^1.7.7",
     "body-parser": "^1.19.0",

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -774,6 +774,19 @@ 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/DirAssistant.js

@@ -596,7 +596,6 @@ class DirAssistant {
           });
           console.error("(DirAssistant) 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;

package/tiledeskChatbotPlugs/directives/DirGptTask_OLD.js

@@ -423,7 +423,6 @@ class DirGptTask {
         }
       })
       .catch((error) => {
-        // console.error("An error occurred:", JSON.stringify(error.data));
         if (callback) {
           callback(error, null);
         }

package/tiledeskChatbotPlugs/directives/DirIntent.js

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

package/tiledeskChatbotPlugs/directives/DirMake.js

@@ -243,9 +243,8 @@ class DirMake {
             }
             return value;
           });
-          console.error("An error occurred: ", error_log);
+          console.error("(DirMake) 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;
@@ -278,54 +277,6 @@ class DirMake {
       });
   }
 
-  // #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,
-  //     params: options.params,
-  //     headers: options.headers
-  //   }
-  //   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,
-  //     });
-  //     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));
-  //       }
-  //       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 (this.log) { console.error("An error occurred:", JSON.stringify(error.message)) };
-  //       if (callback) {
-  //         callback(error, null);
-  //       }
-  //     });
-  // }
-
   async #executeCondition(result, trueIntent, trueIntentAttributes, falseIntent, falseIntentAttributes, callback) {
     let trueIntentDirective = null;
     if (trueIntent) {

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -3,6 +3,7 @@ const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
 let axios = require('axios');
 const { TiledeskClient } = require('@tiledesk/tiledesk-client');
+const { Logger } = require('../../Logger');
 
 class DirReply {
 
@@ -16,6 +17,8 @@ class DirReply {
     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;
     this.tdClient = new TiledeskClient({
@@ -38,16 +41,21 @@ class DirReply {
     }
     else {
       console.error("Incorrect directive (no action provided):", directive);
+      this.logger.error("Incorrect directive (no action provided):", directive);
       callback();
       return;
     }
+    this.logger.info("Executing Action Reply ", directive.action)
+
     this.go(action, () => {
+      this.logger.info("Action Reply terminated")
       callback();
     });
   }
 
   async go(action, callback) {
     const message = action;
+
     // fill
     let requestAttributes = null;
     if (this.tdcache) {
@@ -55,22 +63,22 @@ class DirReply {
       await TiledeskChatbot.allParametersStatic(
         this.tdcache, this.requestId
       );
-      if (this.log) {
-        for (const [key, value] of Object.entries(requestAttributes)) {
-          const value_type = typeof value;
-          // if (this.log) {console.log("(DirReply) request parameter:", key, "value:", value, "type:", value_type)}
-        }
-      }
+
+      TiledeskChatbotUtil.replaceJSONButtons(message, requestAttributes);
+
       const filler = new Filler();
       // fill text attribute
       message.text = filler.fill(message.text, requestAttributes);
+
       if (message.metadata) {
         if (this.log) {console.log("filling message 'metadata':", JSON.stringify(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);
         }
       }
       if (this.log) {console.log("filling commands'. Message:", JSON.stringify(message));}
@@ -84,6 +92,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);
+              this.logger.debug("Filled message.text with ", command.message.text)
               TiledeskChatbotUtil.fillCommandAttachments(command, requestAttributes, this.log);
               if (this.log) {console.log("command filled:", command.message.text);}
             }
@@ -133,12 +142,14 @@ class DirReply {
           }
           catch(err) {
             console.error("An error occurred while JSON.parse(). Parsed value:" + value + " in allParametersStatic(). Error:", err);
+            this.logger.error("An error occurred while JSON.parse(). Parsed value:" + value + " in allParametersStatic(). Error:", err);
           }
         }
       }
     }
     // send!
     let cleanMessage = message;
+    this.logger.info("Sending reply with text ", cleanMessage.text);
     // cleanMessage = TiledeskChatbotUtil.removeEmptyReplyCommands(message);
     // if (!TiledeskChatbotUtil.isValidReply(cleanMessage)) {
     //   console.log("invalid message", cleanMessage);
@@ -156,8 +167,10 @@ class DirReply {
       (err) => {
         if (err) {
           console.error("Error sending reply:", err);
+          this.logger.error("Error sending reply ", err.response.data);
         }
         if (this.log) {console.log("Reply message sent:", JSON.stringify(cleanMessage));}
+        this.logger.info("Reply message sent!", cleanMessage.text);
         const delay = TiledeskChatbotUtil.totalMessageWait(cleanMessage);
         // console.log("got total delay:", delay)
         if (delay > 0 && delay <= 30000) { // prevent long delays

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -79,6 +79,8 @@ class DirReplyV2 {
         }
       }
 
+      TiledeskChatbotUtil.replaceJSONButtons(message, requestAttributes);
+
       try {
         // lock/unlock + no-match
         // get buttons if available

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -359,7 +359,7 @@ class DirWebRequestV2 {
               }
               return value;
             });
-            console.error("An error occurred: ", error_log);
+            console.error("(DirWebRequestv2) An error occurred: ", error_log);
             // FIX THE STRINGIFY OF CIRCULAR STRUCTURE BUG - END
             // console.error("An error occurred:", JSON.stringify(err));
           }

package/tiledeskChatbotPlugs/directives/DirWebResponse.js

@@ -34,10 +34,10 @@ class DirWebResponse {
   }
 
   async go(action, callback) {
-    console.log("Web response...");
-    let payload = action.payload;
-    let status = action.status;
-
+    if (this.log) {
+      console.log("(DirWebResponse) action:", action);
+    }
+    
     let requestAttributes = null;
     if (this.tdcache) {
       requestAttributes = 
@@ -45,7 +45,7 @@ class DirWebResponse {
       const filler = new Filler();
 
       try {
-        payload = filler.fill(payload, requestAttributes);
+        let status = action.status;
         status = filler.fill(status, requestAttributes);
       }
       catch(e) {
@@ -54,16 +54,19 @@ class DirWebResponse {
       
     }
 
+    const json = await this.getJsonFromAction(action, filler, requestAttributes)
     let webResponse = {
       status: status,
-      payload: payload
+      payload: json
     }
 
     const topic = `/webhooks/${this.requestId}`;
     
     try {
       this.tdcache.publish(topic, JSON.stringify(webResponse));
-      console.log("Published webresponse:",  to_send, "to topic:", topic);
+      if (this.log) {
+        console.log("(DirWebResponse) Published webresponse to topic:", topic);
+      }
     }
     catch(e) {
       console.error(e)
@@ -72,8 +75,32 @@ class DirWebResponse {
     callback();
     
   }
+
+  async getJsonFromAction(action, filler, requestAttributes) {
+  
+      return new Promise( async (resolve, reject) => {
+  
+        if (action.payload && action.bodyType == "json") {
+          let jsonBody = filler.fill(action.payload, requestAttributes);
+          try {
+            let json = JSON.parse(jsonBody);
+            resolve(json);
+          }
+          catch (err) {
+            if (this.log) { console.error("Error parsing webRequest jsonBody:", jsonBody, err) };
+            reject("Error parsing jsonBody");
+          }
+        }
+        else {
+          resolve(null);
+        }
+      })
+  }
+
 }
 
+
+
 /**
  * A stub to send message to the "ext/botId" endpoint, hosted by tilebot on:
  * /${TILEBOT_ROUTE}/ext/${botId}

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?