@tiledesk/tiledesk-whatsapp-connector 0.1.47 → 0.1.49

package/index.js

@@ -49,6 +49,7 @@ let APPS_API_URL = null;
 let REDIS_HOST = null;
 let REDIS_PORT = null;
 let REDIS_PASSWORD = null;
+let BASE_FILE_URL = null;
 
 // Handlebars register helpers
 handlebars.registerHelper('isEqual', (a, b) => {
@@ -434,7 +435,7 @@ router.get('/direct/tiledesk', async (req, res) => {
     text: "Ciao, benvenuto sull'ambiente di sviluppo di Tiledesk! Questo messaggio serve ad aprire una nuova conversazione. Ha funzionato?"
   } 
   */
-  
+
   let tiledeskChannelMessage = {
     text: "Sample text",
     attributes: {
@@ -448,7 +449,7 @@ router.get('/direct/tiledesk', async (req, res) => {
     }
   }
   const tlr = new TiledeskWhatsappTranslator();
-  const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+  const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL });
 
   let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
   winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage)
@@ -457,15 +458,92 @@ router.get('/direct/tiledesk', async (req, res) => {
     winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
   }).catch((err) => {
     winston.error("(wab) error send message: ", err);
-    return res.status(400).send({success: false, error: err});
+    return res.status(400).send({ success: false, error: err });
   })
 
   res.status(200).send("Message sent");
+
+})
+
+router.post('/tiledesk/broadcast', async (req, res) => {
+
+  winston.verbose("(wab) Message received from Tiledesk (Broadcast)");
+
+  let tiledeskChannelMessage = req.body.payload;
+  winston.verbose("(wab) tiledeskChannelMessage: ", tiledeskChannelMessage)
+  let project_id = req.body.payload.id_project;
+
+  let CONTENT_KEY = "whatsapp-" + project_id;
+  let settings = await db.get(CONTENT_KEY);
+
+  if (!settings) {
+    return res.status(400).send({ success: false, error: "WhatsApp is not installed for the project_id: " + project_id});
+  }
+
+  let receiver_list = req.body.receiver_list;
+  console.log("receiver_list: ", receiver_list);
+
+  let phone_number_id = req.body.phone_number_id;
+  console.log("phone_number_id: ", phone_number_id);
+
+  if (!tiledeskChannelMessage.attributes.attachment.template) {
+    return res.status(400).send({ success: false, error: "Message must contain a template."})
+  }
+
+  const tlr = new TiledeskWhatsappTranslator();
+  const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL });
+
+  let messages_sent = 0;
+  let errors = [];
+  let error_count = 0;
+
+  if (receiver_list) {
+    let i = 0;
+    async function execute(whatsapp_receiver) {
+
+      let customTiledeskJsonMessage = await tlr.sanitizeTiledeskMessage(tiledeskChannelMessage, whatsapp_receiver)
+      winston.info("customTiledeskJsonMessage: ", customTiledeskJsonMessage)
+
+      let whatsappJsonMessage = await tlr.toWhatsapp(customTiledeskJsonMessage, whatsapp_receiver.phone_number);
+      winston.verbose("(wab) message created for receiver: " + whatsapp_receiver.phone_number);
+      winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage);
+      console.log("(wab) whatsappJsonMessage", JSON.stringify(whatsappJsonMessage, null, 2));
+
+      //winston.debug("(wab) End of list")
+      //return res.sendStatus(200);
+
+      await twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
+        winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
+        messages_sent +=  1;
+        i += 1;
+        if (i < receiver_list.length) {
+          execute(receiver_list[i])
+        } else {
+          return res.status(200).send({ success: true, message: "Broadcast terminated", messages_sent: messages_sent, errors: errors});
+          winston.debug("(wab) End of list")
+        }
+      }).catch((err) => {
+        winston.error("(wab) error send message: " + err.response.data.error.message);
+        errors.push({receiver: whatsapp_receiver.phone_number,error: err.response.data.error.message});
+        i += 1;
+        if (i < receiver_list.length) {
+          execute(receiver_list[i])
+        } else {
+          winston.debug("(wab) End of list")
+          console.log("errors: ", JSON.stringify(errors, null, 2))
+          return res.status(200).send({ success: true, message: "Broadcast terminated", messages_sent: messages_sent, errors: errors});
+        }
+      })
+    }
+    execute(receiver_list[0]);
+  }
+
+  
   
 })
 
 router.post('/tiledesk', async (req, res) => {
-  
+
   winston.verbose("(wab) Message received from Tiledesk")
 
   var tiledeskChannelMessage = req.body.payload;
@@ -552,7 +630,7 @@ router.post('/tiledesk', async (req, res) => {
   const messageHandler = new MessageHandler({ tiledeskChannelMessage: tiledeskChannelMessage });
   const tlr = new TiledeskWhatsappTranslator();
 
-  
+
   if (commands) {
     let i = 0;
     async function execute(command) {
@@ -565,7 +643,7 @@ router.post('/tiledesk', async (req, res) => {
         winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage)
 
         if (whatsappJsonMessage) {
-          const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+          const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL });
           twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
             winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
             i += 1;
@@ -604,17 +682,17 @@ router.post('/tiledesk', async (req, res) => {
     winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage)
 
     if (whatsappJsonMessage) {
-      const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
+      const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL });
 
       twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
         winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
       }).catch((err) => {
-        res.status(400).send({success: false, error: "il template non esiste"});
+        res.status(400).send({ success: false, error: "il template non esiste" });
         winston.error("(wab) error send message: ", err);
       })
 
     } else {
-      res.status(400).send({success: false, error: "il template non esiste"});
+      res.status(400).send({ success: false, error: "il template non esiste" });
       winston.error("(wab) Whatsapp Json Message is undefined!")
     }
 
@@ -705,7 +783,7 @@ router.post("/webhook/:project_id", async (req, res) => {
 
         else if ((whatsappChannelMessage.type == 'image') || (whatsappChannelMessage.type == 'video') || (whatsappChannelMessage.type == 'document') || (whatsappChannelMessage.type == 'audio')) {
           let media;
-          const util = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL })
+          const util = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL })
 
           if (whatsappChannelMessage.type == 'image') {
             media = whatsappChannelMessage.image;
@@ -942,7 +1020,7 @@ router.get("/templates/:project_id", async (req, res) => {
     let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
     let templates = await tm.getTemplates();
 
-    
+
 
     readHTMLFile('/templates.html', (err, html) => {
       var template = handlebars.compile(html);
@@ -972,17 +1050,22 @@ router.get("/ext/templates/:project_id", async (req, res) => {
   let settings = await db.get(CONTENT_KEY);
 
   if (settings) {
-    let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
-    let templates = await tm.getTemplates();
 
-    if (templates) {
-      res.status(200).send(templates.data);
+    if (settings.business_account_id) {
+      let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
+      let templates = await tm.getTemplates();
+      if (templates) {
+        res.status(200).send(templates.data);
+      } else {
+        res.status(500).send({ success: false, code: '02', message: "A problem occurred while getting templates from WhatsApp" })
+      }
+      
     } else {
-      res.status(500).send({ success: false, code: '02', message: "a problem occurred while getting templates from whatsapp" })
+      res.status(500).send({ success: false, code: '03', message: "Missing parameter 'WhatsApp Business Account ID'. Please update your app."})
     }
 
   } else {
-    res.status(400).send({ success: false, code: '01', message: "whatsapp not installed for the project_id " + project_id })
+    res.status(400).send({ success: false, code: '01', message: "WhatsApp not installed for the project_id " + project_id })
   }
 
 })
@@ -1007,6 +1090,14 @@ async function startApp(settings, callback) {
     winston.info("(wab) API_URL: " + API_URL);
   }
 
+  if (!settings.BASE_FILE_URL) {
+    winston.error("(wab) BASE_FILE_URL is mandatory. Exit...");
+    return callback('Missing parameter: BASE_FILE_URL');
+  } else {
+    BASE_FILE_URL = settings.BASE_FILE_URL;
+    winston.info("(wab) BASE_FILE_URL: " + BASE_FILE_URL);
+  }
+
   if (!settings.BASE_URL) {
     winston.error("(wab) BASE_URL is mandatory. Exit...");
     return callback('Missing parameter: BASE_URL');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-whatsapp-connector",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {

package/template/detail.html

@@ -213,12 +213,21 @@
 
     <p style="font-size: 18px;"><b>What's new?</b></p>
 
+    <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
+      <div>
+        <p style="margin-bottom: 0px">Added support for WhatsApp voice messages</p>
+        <p style="margin-bottom: 0px">Bug fixes and minor improvements</p>
+        <!--<p>Bug fixes and performance improvements</p>-->
+      </div>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.49</b></p>
+    </div>
+
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
         <p style="margin-bottom: 0px">Added support for WhatsApp templates</p>
         <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.46</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.48</b></p>
     </div>
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">

package/tiledesk/TemplateManager.js

@@ -28,8 +28,6 @@ class TemplateManager {
   }
 
   async getTemplates() {
-    // business account id: 110354305066769
-    // business phone number id: 104777398965560
     return await axios({
       url: this.graph_url + this.business_account_id + "/message_templates?access_token=" + this.token,
       headers: {

package/tiledesk/TiledeskWhatsapp.js

@@ -31,9 +31,20 @@ class TiledeskWhatsapp {
     if (!config.GRAPH_URL) {
       throw new Error('config.GRAPH_URL is mandatory');
     }
+    
+    if (!config.API_URL) {
+      throw new Error('config.API_URL is mandatory');
+    }
+
+    if (!config.BASE_FILE_URL) {
+      throw new Error('config.BASE_FILE_URL is mandatory')
+    }
+
     // this.media = config.channelMedia;
     this.token = config.token;
     this.GRAPH_URL = config.GRAPH_URL
+    this.api_url = config.API_URL;
+    this.base_file_url = config.BASE_FILE_URL;
 
     this.log = false;
     if (config.log) {
@@ -115,7 +126,8 @@ class TiledeskWhatsapp {
   }
 
   async uploadMedia(path, type) {
-    let url = "https://tiledesk-server-pre.herokuapp.com/" + type + "/public";
+    let url = this.base_file_url + "/" + type + "/public/";
+    console.log("upload media url: ", url);
     winston.debug("(wab) [TiledeskWhatsapp] Uploading file...");
 
     const form = new FormData();
@@ -131,11 +143,14 @@ class TiledeskWhatsapp {
     return await axios.post(url, form, request_config).then((response) => {
         
       winston.debug("(wab) [TiledeskWhatsapp] upload response: ", response.data);
+      console.log("\n\nresponse.data: ", response.data)
       if (type == "images") {
-        let image_url = "https://tiledesk-server-pre.herokuapp.com/images/?path=" + response.data.filename;
+        //let image_url = "https://tiledesk-server-pre.herokuapp.com/images/?path=" + response.data.filename;
+        let image_url = this.base_file_url + "/images/?path=" + response.data.filename;
         return image_url;
       } else {
-        let file_url = "https://tiledesk-server-pre.herokuapp.com/files/download?path=" + response.data.filename;
+        //let file_url = "https://tiledesk-server-pre.herokuapp.com/files/download?path=" + response.data.filename;
+        let file_url = this.base_file_url + "/files/download?path=" + response.data.filename;
         return file_url;
       }
 

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -286,12 +286,35 @@ const path = require('path');
             }
             components.push(component);
           }
+          if (template.params && template.params.buttons) {
+
+            let component = {
+              type: "button",
+              sub_type: "url",
+              index: "0",
+              parameters: template.params.buttons
+            }
+            components.push(component);
+
+            /*
+            template.params.buttons.forEach((button) => {
+              let component = button;
+              components.push(component);
+            })
+            
+            let component = {
+              type: "button",
+              sub_type: "url",
+              parmeters: template.params.buttons
+            }
+            */
+          }
 
           if (components.length > 0) {
             whatsapp_message.template.components = components;
           }
 
-          winston.info("(wab) [Translator] whatsapp_message: ", whatsapp_message);
+          winston.verbose("(wab) [Translator] whatsapp_message: ", whatsapp_message);
           return whatsapp_message;
 
         }
@@ -462,7 +485,7 @@ const path = require('path');
       }*/
 
       var tiledeskMessage = {
-        text: "[Download audio](" + media_url + ")",
+        text: "",
         senderFullname: from,
         channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME },
         type: "file",
@@ -475,6 +498,53 @@ const path = require('path');
       return tiledeskMessage;
     }
   }
+
+
+  async sanitizeTiledeskMessage(tiledeskJsonMessage, rcv_option) {
+    console.log("tiledeskJsonMessage: ", JSON.stringify(tiledeskJsonMessage, null, 2))
+    //console.log("rcv_option: ", rcv_option)
+    console.log("Sanitizing...")
+
+    if (!tiledeskJsonMessage.attributes.attachment.template.params) {
+      return tiledeskJsonMessage;
+    }
+
+    let header_params = tiledeskJsonMessage.attributes.attachment.template.params.header;
+    if (header_params) {
+      header_params.forEach((param, i) => {
+        if (param.type === "text") {
+          param.text = rcv_option.header_params[i];
+        }
+        if (param.type === "image") {
+          param.image = {
+            link: rcv_option.header_params[i]
+          }
+        }
+      })
+    }
+
+    let body_params = tiledeskJsonMessage.attributes.attachment.template.params.body;
+    if (body_params) {
+      body_params.forEach((param, i) => {
+        param.text = rcv_option.body_params[i];
+      })
+    }
+
+    let buttons_params = tiledeskJsonMessage.attributes.attachment.template.params.buttons;
+    if (buttons_params) {
+      /*
+      buttons_params.forEach((button, i) => {
+        button.parameters[0].text = rcv_option.buttons_params[i];
+      })
+      */
+      buttons_params.forEach((param, i) => {
+        param.text = rcv_option.buttons_params[i];
+      })
+    }
+
+    console.log("tiledeskJsonMessage: ", JSON.stringify(tiledeskJsonMessage, null, 2))
+    return tiledeskJsonMessage;
+  }
   /*
   *************************************
   ********* WHATSAPP BUSINESS *********