@tiledesk/tiledesk-whatsapp-connector 0.1.51 → 0.1.53

package/index.js

@@ -497,14 +497,14 @@ router.post('/tiledesk/broadcast', async (req, res) => {
   let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
   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 response = await tm.getTemplates();
   let templates = response.data;
-  
+
   let selected_template = templates.find(t => t.name === tiledeskChannelMessage.attributes.attachment.template.name);
 
   let params_object = await tm.generateParamsObject(selected_template);
-  
+
   tiledeskChannelMessage.attributes.attachment.template.params = params_object;
   winston.verbose("(wab) --> tiledeskChannelMessage: ", tiledeskChannelMessage)
 
@@ -530,8 +530,8 @@ router.post('/tiledesk/broadcast', async (req, res) => {
         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")
+          return res.status(200).send({ success: true, message: "Broadcast terminated", messages_sent: messages_sent, errors: errors });
         }
       }).catch((err) => {
         winston.error("(wab) error send message: " + err.response.data.error.message);
@@ -547,7 +547,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
     }
     execute(receiver_list[0]);
   }
-  
+
 })
 
 
@@ -662,7 +662,19 @@ router.post('/tiledesk', async (req, res) => {
   let recipient_id = tiledeskChannelMessage.recipient;
   let sender = tiledeskChannelMessage.sender;
   let whatsapp_receiver = recipient_id.substring(recipient_id.lastIndexOf("-") + 1);
-  let phone_number_id = recipient_id.substring(recipient_id.lastIndexOf("wab-") + 4, recipient_id.lastIndexOf("-"));
+
+  let phone_number_id;
+  if (attributes && attributes.whatsapp_phone_number_id) {
+    phone_number_id = attributes.whatsapp_phone_number_id;
+  } else {
+    phone_number_id = recipient_id.substring(recipient_id.lastIndexOf("wab-") + 4, recipient_id.lastIndexOf("-"));
+  }
+
+  if (!phone_number_id) {
+    return res.status(400).send({ success: false, message: "Phone number id undefined"})
+  }
+
+  console.log("phone_number_id: ", phone_number_id)
 
   /*
   if (settings.expired && 
@@ -679,7 +691,7 @@ router.post('/tiledesk', async (req, res) => {
     winston.verbose("settings expired: " + settings.expired);
     let tiledeskJsonMessage = {
       text: 'Expired. Upgrade Plan.',
-      sender: sender,
+      sender: "system",
       senderFullname: "System",
       attributes: {
         subtype: 'info'
@@ -835,7 +847,8 @@ router.post("/webhook/:project_id", async (req, res) => {
         })
 
         // Standard message
-      } else {
+      }
+      else {
 
         let firstname = req.body.entry[0].changes[0].value.contacts[0].profile.name;
 
@@ -851,6 +864,7 @@ router.post("/webhook/:project_id", async (req, res) => {
 
         let tiledeskJsonMessage;
 
+        /*
         if ((whatsappChannelMessage.type == 'text')) {
           winston.debug("(wab) message type: text")
           tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname);
@@ -932,6 +946,86 @@ router.post("/webhook/:project_id", async (req, res) => {
           // unsupported. Try anyway to send something.
           winston.debug("(wab) unsupported message")
         }
+        */
+
+
+
+        ////////////////////////////////////////////////////
+
+
+
+        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, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL })
+
+          if (whatsappChannelMessage.type == 'image') {
+            media = whatsappChannelMessage.image;
+            const filename = await util.downloadMedia(media.id);
+            if (!filename) {
+              winston.debug("(wab) Unable to download media with id " + media.id + ". Message not sent.");
+              return res.status(500).send({ success: false, error: "unable to download media" })
+            }
+            let file_path = path.join(__dirname, 'tmp', filename);
+
+            const image_url = await util.uploadMedia(file_path, "images");
+            winston.debug("(wab) image_url: " + image_url)
+
+            tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, image_url);
+          }
+
+          if (whatsappChannelMessage.type == 'video') {
+            media = whatsappChannelMessage.video;
+
+            const filename = await util.downloadMedia(media.id);
+            if (!filename) {
+              winston.debug("(wab) Unable to download media with id " + media.id + ". Message not sent.");
+              return res.status(500).send({ success: false, error: "unable to download media" })
+            }
+            let file_path = path.join(__dirname, 'tmp', filename);
+
+            const media_url = await util.uploadMedia(file_path, "files");
+            winston.debug("(wab) media_url: " + media_url)
+
+            tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
+          }
+
+          if (whatsappChannelMessage.type == 'document') {
+            media = whatsappChannelMessage.document;
+
+            const filename = await util.downloadMedia(media.id);
+            if (!filename) {
+              winston.debug("(wab) Unable to download media with id " + media.id + ". Message not sent.");
+              return res.status(500).send({ success: false, error: "unable to download media" })
+            }
+            let file_path = path.join(__dirname, 'tmp', filename);
+
+            const media_url = await util.uploadMedia(file_path, "files");
+            winston.debug("(wab) media_url: " + media_url)
+
+            tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
+          }
+
+          if (whatsappChannelMessage.type == 'audio') {
+            media = whatsappChannelMessage.audio;
+
+            const filename = await util.downloadMedia(media.id);
+            if (!filename) {
+              winston.debug("(wab) Unable to download media with id " + media.id + ". Message not sent.");
+              return res.status(500).send({ success: false, error: "unable to download media" })
+            }
+            let file_path = path.join(__dirname, 'tmp', filename);
+
+            const media_url = await util.uploadMedia(file_path, "files");
+            winston.debug("(wab) media_url: " + media_url)
+
+            tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
+          }
+
+        }
+        else {
+          winston.debug("(wab) message type: ", whatsappChannelMessage.type)
+          tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname);
+        }
 
         if (tiledeskJsonMessage) {
           winston.verbose("(wab) tiledeskJsonMessage: ", tiledeskJsonMessage);

package/logs/app.log

@@ -1,4 +0,0 @@
-info: (wab) Starting Whatsapp App
-info: (wab) API_URL: https://tiledesk-server-pre.herokuapp.com
-info: (wab) BASE_URL: https://tiledesk-whatsapp-app-pre.giovannitroisi3.repl.co
-info: (wab) GRAPH_URL: https://graph.facebook.com/v14.0/

package/package.json

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

package/routes/api.js

@@ -171,7 +171,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
         messages_sent += 1;
         i += 1;
         if (i < receiver_list.length) {
-          execute(receiver_list[i])
+            execute(receiver_list[i])
         } else {
           winston.debug("(wab) End of list")
           return res.status(200).send({ success: true, message: "Broadcast terminated", messages_sent: messages_sent, errors: errors });
@@ -181,7 +181,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
         errors.push({ receiver: receiver.phone_number, error: err.response.data.error.message });
         i += 1;
         if (i < receiver_list.length) {
-          execute(receiver_list[i])
+            execute(receiver_list[i])
         } else {
           winston.debug("(wab) End of list")
           return res.status(200).send({ success: true, message: "Broadcast terminated", messages_sent: messages_sent, errors: errors });
@@ -196,38 +196,38 @@ router.post('/tiledesk/broadcast', async (req, res) => {
 
 // start api route from whatsappRoute
 async function startRoute(settings, callback) {
-  winston.info("(wab) Starting api route", settings);
+  winston.info("(wab api) Starting api route", settings);
 
   if (!settings.DB) {
-    winston.error("(wab) db id mandatory. Exit...");
+    winston.error("(wab api) db id mandatory. Exit...");
     return callback('Missing parameter: db');
   } else {
     db = settings.DB;
-    winston.info("(wab) db " + db);
+    //winston.info("(wab) db " + db);
   }
 
   if (!settings.GRAPH_URL) {
-    winston.error("(wab) GRAPH_URL is mandatory. Exit...");
+    winston.error("(wab api) GRAPH_URL is mandatory. Exit...");
     return callback('Missing parameter: GRAPH_URL');
   } else {
     GRAPH_URL = settings.GRAPH_URL;
-    winston.info("(wab) GRAPH_URL: " + GRAPH_URL);
+    winston.info("(wab api) GRAPH_URL: " + GRAPH_URL);
   }
 
   if (!settings.API_URL) {
-    winston.error("(wab) API_URL is mandatory. Exit...");
+    winston.error("(wab api) API_URL is mandatory. Exit...");
     return callback('Missing parameter: API_URL');
   } else {
     API_URL = settings.API_URL;
-    winston.info("(wab) API_URL: " + API_URL);
+    winston.info("(wab api) API_URL: " + API_URL);
   }
 
   if (!settings.BASE_FILE_URL) {
-    winston.error("(wab) BASE_FILE_URL is mandatory. Exit...");
+    winston.error("(wab api) 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);
+    winston.info("(wab api) BASE_FILE_URL: " + BASE_FILE_URL);
   }
 
   

package/template/configure.html

@@ -199,7 +199,7 @@
               <label class="input-label" for="wab_token">Whatsapp Token
               </label>
               <div style="display: flex; flex-direction: row; align-items: center;">
-              <input type="text" required class="form-control custom-input" name="wab_token" value="{{ wab_token }}" placeholder="Enter the Whatsapp Token">
+              <input id="tkn" type="text" required class="form-control custom-input" name="wab_token" value="{{ wab_token }}" placeholder="Enter the Whatsapp Token">
                 <span style="margin-left: 10px;">
                   <i class="fa fa-question-circle custom-tooltip">
                     <span class="custom-tooltiptext">This is the permanent WhatsApp Business token.</span>
@@ -264,7 +264,8 @@
               </div>
             {{else}}
               <div style="width: 500px; text-align: right;">
-                <input type="submit" class="btn" style="width: 200px; background-color: #0ba2dc; color: white; font-weight: 500;" value="Connect">
+                <input type="submit" class="btn" style="width: 200px; background-color: #0ba2dc; color: white; font-weight: 500;" value="Connect"
+                    onclick="postMessage('connectWhatsapp')">
               </div>
             {{/if}}
           </form>
@@ -289,7 +290,7 @@
             <input type="hidden" name="project_id" value="{{ project_id }}">
                 <input type="hidden" name="token" value="{{ token }}">
                 <input type="hidden" name="subscription_id" value="{{ subscription_id }}">
-            <input type="submit" class="btn disconnect-button" style="margin-top: 10px; width: 160px;" value="Disconnect">
+            <input type="submit" class="btn disconnect-button" style="margin-top: 10px; width: 160px;" value="Disconnect" onclick="postMessage('disconnectWhatsapp')">
           </form>
         </div>
         {{else}}
@@ -332,6 +333,19 @@
         console.error('Async: Could not copy text: ', err);
       }
     }
+    
+    function postMessage(action) {
+    
+      const tkn = document.getElementById('tkn').value;
+      let connected = false;
+      if (tkn) {
+        connected = true;
+      }
+      const msg = { action: action, calledBy: 'whatsapp_proxy', connected: connected}
+      window.parent.postMessage(msg, '*');
+    }
+    
   </script>
+
   
 </body>

package/template/detail.html

@@ -107,7 +107,7 @@
                     <input type="hidden" name="project_id" value="{{ project_id }}" />
                     <input type="hidden" name="app_id" value="{{ app_id }}" />
                     <input type="hidden" name="token" value="{{ token }}" />
-                    <input type="submit" class="btn uninstall-button" value="Yes, uninstall">
+                    <input type="submit" class="btn uninstall-button" value="Yes, uninstall" onclick="postMessage('uninstallWhatsapp')">
                   </form>
                 </div>
               </div>
@@ -138,7 +138,8 @@
                     <input type="hidden" name="project_id" value="{{ project_id }}" />
                     <input type="hidden" name="app_id" value="{{ app_id }}" />
                     <input type="hidden" name="token" value="{{ token }}" />
-                    <input type="submit" class="btn install-button" value="Install">
+                    <input type="submit" class="btn install-button" value="Install" onclick="postMessage('installWhatsapp')">
+                    <!--<input type="submit" class="btn install-button" value="Install" onclick="postMessage('installWhatsapp')">-->
                   </form>
                 </div>
               </div>
@@ -215,37 +216,42 @@
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">
       <div>
-        <p style="margin-bottom: 0px">Bug fixes</p>
-        <!--<p>Bug fixes and performance improvements</p>-->
+        <p>Bug fixes and performance improvements</p>
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.50</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.53</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 voice messages</p>
-        <p style="margin-bottom: 0px">Bug fixes and minor improvements</p>
-        <!--<p>Bug fixes and performance 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>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.52</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 style="margin-bottom: 0px">Bug fixes</p>
         <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.48</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.50</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 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.45</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.49</b></p>
     </div>
 
     <hr style="margin-top: 50px; margin-bottom: 20px">
+
+  <script>   
+    function postMessage(action) {
+      const msg = { action: action, calledBy: 'whatsapp_proxy' }
+      window.parent.postMessage(msg, '*');
+    }
+  </script>
   
 </body>

package/tiledesk/TemplateManager.js

@@ -71,6 +71,7 @@ class TemplateManager {
   }
 
   async generateParamsObject(template) {
+
     let header_params = [];
     let body_params = [];
     let url_button_params = [];
@@ -106,7 +107,11 @@ class TemplateManager {
 
       } else {
 
-        if (header_component.format === 'LOCATION') {
+        if (header_component.format === "TEXT") {
+          header_params.push({ type: "text", text: header_component.text })
+        }
+
+        else if (header_component.format === 'LOCATION') {
           header_params.push({ type: header_component.format, location: { latitude: null, longitude: null, name: null, address: null } })
         }
         else {

package/tiledesk/TiledeskSubscriptionClient.js

@@ -119,7 +119,8 @@ class TiledeskSubscriptionClient {
       }
       else {
         if (callback) {
-          callback(TiledeskClient.getErr({ message: "Response status not 200" }, options, res), null, null);
+          callback("Response status not 200", null, null);
+          //callback({ message: "Response status not 200" }, options, res), null, null);
         }
       }
     }).catch((err) => {

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -260,7 +260,7 @@ const path = require('path');
 
         }
         else if (tiledeskChannelMessage.attributes.attachment.template) {
-          winston.verbose("(wab) [Translator] template: ", tiledeskChannelMessage.attributes.attachment.template)
+          winston.debug("(wab) [Translator] template: ", tiledeskChannelMessage.attributes.attachment.template)
 
           let template = tiledeskChannelMessage.attributes.attachment.template;
 
@@ -314,7 +314,6 @@ const path = require('path');
             whatsapp_message.template.components = components;
           }
 
-          winston.verbose("(wab) [Translator] whatsapp_message: ", whatsapp_message);
           return whatsapp_message;
 
         }
@@ -446,9 +445,17 @@ const path = require('path');
       return data;
     }
 
+    else if (whatsappChannelMessage.type == 'button')  {
+      var tiledeskMessage = {
+        text: whatsappChannelMessage.button.text, // or whatsappChannelMessage.button.payload (?)
+        senderFullname: from,
+        channel: { name: TiledeskWhatsappTranslator.CHANNEL_NAME }
+      }
+      return tiledeskMessage;
+    }
 
     // interactive message
-    if (whatsappChannelMessage.type == 'interactive') {
+    else if (whatsappChannelMessage.type == 'interactive') {
 
       // list reply
       if (whatsappChannelMessage.interactive.type == 'list_reply') {
@@ -506,7 +513,7 @@ const path = require('path');
     }
 
     // media message - image
-    if (whatsappChannelMessage.type == 'image') {
+    else if (whatsappChannelMessage.type == 'image') {
 
       let text = "Image attached"
       if (whatsappChannelMessage.image.caption) {
@@ -526,7 +533,7 @@ const path = require('path');
     }
 
     // media message - video
-    if (whatsappChannelMessage.type == 'video') {
+    else if (whatsappChannelMessage.type == 'video') {
 
       let text = "Video attached"
       if (whatsappChannelMessage.video.caption) {
@@ -548,7 +555,7 @@ const path = require('path');
     }
 
     // media message - document
-    if (whatsappChannelMessage.type == 'document') {
+    else if (whatsappChannelMessage.type == 'document') {
 
       let text = "Document attached"
       if (whatsappChannelMessage.document.caption) {
@@ -570,7 +577,7 @@ const path = require('path');
     }
 
     // media message - audio
-    if (whatsappChannelMessage.type == 'audio') {
+    else if (whatsappChannelMessage.type == 'audio') {
 
       let text = "Audio attached"
       /*if (whatsappChannelMessage.document.caption) {
@@ -590,6 +597,11 @@ const path = require('path');
       }
       return tiledeskMessage;
     }
+
+    else {
+      winston.verbose("(wab) [Translator] unsupported whatsapp messsage type");
+      return null;
+    }
   }
 
   async fillParams(params, rcv_option) {