@tiledesk/tiledesk-whatsapp-connector 0.1.72 → 0.1.74

package/index.js

@@ -502,19 +502,21 @@ router.get("/direct/tiledesk", async (req, res) => {
     .then((response) => {
       winston.verbose(
         "(wab) Message sent to WhatsApp! " +
-        response.status +
-        " " +
-        response.statusText
+          response.status +
+          " " +
+          response.statusText
       );
     })
     .catch((err) => {
-      winston.error("(wab) error send message: ", err);
+      //winston.error("(wab) error send message: ", err);
       return res.status(400).send({ success: false, error: err });
     });
 
   res.status(200).send("Message sent");
 });
 
+
+// Can be deleted?
 router.post("/tiledesk/broadcast", async (req, res) => {
   winston.verbose("(wab) Message received from Tiledesk (Broadcast)");
 
@@ -526,22 +528,18 @@ router.post("/tiledesk/broadcast", async (req, res) => {
   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,
-      });
+    return res.status(400).send({
+      success: false,
+      error: "WhatsApp is not installed for the project_id: " + project_id,
+    });
   }
 
   if (!settings.business_account_id) {
-    return res
-      .status(400)
-      .send({
-        success: false,
-        error:
-          "Missing parameter 'WhatsApp Business Account ID'. Please update your app.",
-      });
+    return res.status(400).send({
+      success: false,
+      error:
+        "Missing parameter 'WhatsApp Business Account ID'. Please update your app.",
+    });
   }
 
   let receiver_list = req.body.receiver_list;
@@ -599,9 +597,9 @@ router.post("/tiledesk/broadcast", async (req, res) => {
         .then((response) => {
           winston.verbose(
             "(wab) Message sent to WhatsApp! " +
-            response.status +
-            " " +
-            response.statusText
+              response.status +
+              " " +
+              response.statusText
           );
           messages_sent += 1;
           i += 1;
@@ -609,14 +607,12 @@ router.post("/tiledesk/broadcast", async (req, res) => {
             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,
-              });
+            return res.status(200).send({
+              success: true,
+              message: "Broadcast terminated",
+              messages_sent: messages_sent,
+              errors: errors,
+            });
           }
         })
         .catch((err) => {
@@ -632,14 +628,12 @@ router.post("/tiledesk/broadcast", async (req, res) => {
             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,
-              });
+            return res.status(200).send({
+              success: true,
+              message: "Broadcast terminated",
+              messages_sent: messages_sent,
+              errors: errors,
+            });
           }
         });
     }
@@ -647,84 +641,14 @@ router.post("/tiledesk/broadcast", async (req, res) => {
   }
 });
 
-/*
-router.post('/tiledesk/broadcast2', 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;
-  let phone_number_id = req.body.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);
-
-      //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")
-          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");
+  console.log("req.body: ", JSON.stringify(req.body));
 
   var tiledeskChannelMessage = req.body.payload;
   winston.debug("(wab) tiledeskChannelMessage: ", tiledeskChannelMessage);
   var project_id = req.body.payload.id_project;
-  
+
   // get settings from mongo
   let CONTENT_KEY = "whatsapp-" + project_id;
   let settings = await db.get(CONTENT_KEY);
@@ -776,7 +700,9 @@ router.post("/tiledesk", async (req, res) => {
   }
 
   if (!phone_number_id) {
-    return res.status(400).send({ success: false, message: "Phone number id undefined" });
+    return res
+      .status(400)
+      .send({ success: false, message: "Phone number id undefined" });
   }
 
   /*
@@ -861,7 +787,12 @@ router.post("/tiledesk", async (req, res) => {
           twClient
             .sendMessage(phone_number_id, whatsappJsonMessage)
             .then((response) => {
-              winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
+              winston.verbose(
+                "(wab) Message sent to WhatsApp! " +
+                  response.status +
+                  " " +
+                  response.statusText
+              );
               i += 1;
               if (i < commands.length) {
                 execute(commands[i]);
@@ -892,7 +823,6 @@ router.post("/tiledesk", async (req, res) => {
       }
     }
     execute(commands[0]);
-
   } else if (tiledeskChannelMessage.text || tiledeskChannelMessage.metadata) {
     let whatsappJsonMessage = await tlr.toWhatsapp(
       tiledeskChannelMessage,
@@ -911,22 +841,38 @@ router.post("/tiledesk", async (req, res) => {
       twClient
         .sendMessage(phone_number_id, whatsappJsonMessage)
         .then((response) => {
-          winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
+          winston.verbose(
+            "(wab) Message sent to WhatsApp! " +
+              response.status +
+              " " +
+              response.statusText
+          );
           return res.sendStatus(200);
         })
         .catch((err) => {
-          winston.error("(wab) error send message: ", err);
-          return res.status(400).send({ success: false, error: "Template not existing" });
+          //winston.error("(wab) error send message: ", err);
+          return res
+            .status(400)
+            .send({ success: false, error: "Template not existing" });
         });
     } else {
       winston.error("(wab) Whatsapp Json Message is undefined!");
-      return res.status(400).send({ success: false, error: "An error occurred during message translation" });
+      return res
+        .status(400)
+        .send({
+          success: false,
+          error: "An error occurred during message translation",
+        });
     }
   } else {
     winston.debug("(wab) no command, no text --> skip");
-    return res.sendStatus(400).send({ success: false, error: "No command or text specified. Skip message." });
+    return res
+      .sendStatus(400)
+      .send({
+        success: false,
+        error: "No command or text specified. Skip message.",
+      });
   }
-  
 });
 
 // Endpoint for Whatsapp Business
@@ -935,15 +881,20 @@ router.post("/webhook/:project_id", async (req, res) => {
   // Parse the request body from the POST
   let project_id = req.params.project_id;
   winston.verbose("(wab) Message received from WhatsApp");
-  
+
   // Check the Incoming webhook message
   // info on WhatsApp text message payload: https://developers.facebook.com/docs/whatsapp/cloud-api/webhooks/payload-examples#text-messages
   if (req.body.object) {
-    
     let CONTENT_KEY = "whatsapp-" + project_id;
     let settings = await db.get(CONTENT_KEY);
     winston.debug("(wab) settings: ", settings);
-    
+
+    if (!settings) {
+      winston.warn("(wab) settings not found for project_id: " + project_id);
+      winston.warn("(wab) settings not found for request: ", req.body);
+      return res.sendStatus(200);
+    }
+
     const tdClient = new TiledeskClient({
       projectId: project_id,
       token: settings.token,
@@ -966,9 +917,11 @@ router.post("/webhook/:project_id", async (req, res) => {
         winston.verbose("(wab) Skip system message");
         return res.sendStatus(200);
       }
-      
+
       if (req.body.entry[0].id !== settings.business_account_id) {
-        winston.verbose("(wab) Skip message with waba that not belong to Tiledesk project id");
+        winston.verbose(
+          "(wab) Skip message with waba that not belong to Tiledesk project id"
+        );
         return res.sendStatus(200);
       }
 
@@ -1032,7 +985,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             lastname: " ",
           },
         };
-        
+
         let tiledeskJsonMessage;
 
         /*
@@ -1141,8 +1094,8 @@ router.post("/webhook/:project_id", async (req, res) => {
             if (!filename) {
               winston.debug(
                 "(wab) Unable to download media with id " +
-                media.id +
-                ". Message not sent."
+                  media.id +
+                  ". Message not sent."
               );
               return res
                 .status(500)
@@ -1167,8 +1120,8 @@ router.post("/webhook/:project_id", async (req, res) => {
             if (!filename) {
               winston.debug(
                 "(wab) Unable to download media with id " +
-                media.id +
-                ". Message not sent."
+                  media.id +
+                  ". Message not sent."
               );
               return res
                 .status(500)
@@ -1193,8 +1146,8 @@ router.post("/webhook/:project_id", async (req, res) => {
             if (!filename) {
               winston.debug(
                 "(wab) Unable to download media with id " +
-                media.id +
-                ". Message not sent."
+                  media.id +
+                  ". Message not sent."
               );
               return res
                 .status(500)
@@ -1219,8 +1172,8 @@ router.post("/webhook/:project_id", async (req, res) => {
             if (!filename) {
               winston.debug(
                 "(wab) Unable to download media with id " +
-                media.id +
-                ". Message not sent."
+                  media.id +
+                  ". Message not sent."
               );
               return res
                 .status(500)
@@ -1368,11 +1321,9 @@ router.post("/newtest", async (req, res) => {
   let key = "bottest:" + short_uid;
 
   if (!redis_client) {
-    return res
-      .status(500)
-      .send({
-        message: "Test it out on Whatsapp not available. Redis not ready.",
-      });
+    return res.status(500).send({
+      message: "Test it out on Whatsapp not available. Redis not ready.",
+    });
   }
 
   await redis_client.set(key, JSON.stringify(info), "EX", 604800);
@@ -1446,6 +1397,7 @@ router.get("/templates/detail", async (req, res) => {
   }
 });
 
+/*
 router.get("/templates/:project_id", async (req, res) => {
   winston.verbose("(wab) /templates");
 
@@ -1487,6 +1439,7 @@ router.get("/templates/:project_id", async (req, res) => {
       });
   }
 });
+*/
 
 /*
 router.get("/ext/templates/:project_id", async (req, res) => {
@@ -1607,17 +1560,19 @@ async function startApp(settings, callback) {
   }
 
   if (!settings.JOB_TOPIC_EXCHANGE) {
-    winston.info("(wab) JOB_TOPIC_EXCHANGE should be present. Using default value");
+    winston.info(
+      "(wab) JOB_TOPIC_EXCHANGE should be present. Using default value"
+    );
     JOB_TOPIC_EXCHANGE = "tiledesk-whatsapp";
   } else {
     JOB_TOPIC_EXCHANGE = settings.JOB_TOPIC_EXCHANGE;
     winston.info("(wab) JOB_TOPIC_EXCHANGE is present");
   }
-  
+
   if (settings.BRAND_NAME) {
-    BRAND_NAME = settings.BRAND_NAME
+    BRAND_NAME = settings.BRAND_NAME;
   }
-  
+
   // // For test only
   // if (settings.LOG_MONGODB_URL) {
   //   /**
@@ -1655,11 +1610,11 @@ async function startApp(settings, callback) {
       if (callback) {
         callback(null);
       }
-    })
+    });
   } else {
     db.connect(settings.MONGODB_URL, () => {
       winston.info("(wab) KVBaseMongo successfully connected.");
-  
+
       if (callback) {
         callback(null);
       }

package/package.json

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

package/routes/api.js

@@ -13,6 +13,7 @@ let API_URL = null;
 let GRAPH_URL = null;
 let BASE_FILE_URL = null;
 let AMQP_MANAGER_URL = null;
+let JOB_TOPIC_EXCHANGE = null;
 
 router.get('/', async (req, res) => {
   res.status(200).send({ message: "API route works"})
@@ -78,8 +79,9 @@ router.post('/customer/io', async (req, res) => {
     })
 
   } else {
+      winston.error("(wab) whatsappJsonMessage is undefined");
       res.status(400).send({ success: false, error: "whatsappJsonMessage is undefined" });
-      winston.error("(wab) error send message: ", err);
+      
   }
 })
 
@@ -136,6 +138,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
   let phone_number_id = body.phone_number_id;
   let template = body.template;
   let transaction_id = body.transaction_id;
+  let broadcast = body.broadcast;
 
   if (!transaction_id) {
     transaction_id = "tiledesk-broadcast-" + Date.now();
@@ -144,6 +147,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
   let CONTENT_KEY = "whatsapp-" + project_id;
   let settings = await db.get(CONTENT_KEY);
 
+  console.log("Settings: ", settings);
   if (!settings) {
     return res.status(400).send({ success: false, error: "WhatsApp is not installed for the project_id: " + project_id });
   }
@@ -159,7 +163,8 @@ router.post('/tiledesk/broadcast', async (req, res) => {
     phone_number_id: phone_number_id, 
     transaction_id: transaction_id,
     template: template, 
-    settings: settings 
+    settings: settings,
+    broadcast: broadcast
   };
 
   winston.debug('(wab) data_To_scheduler: ', data_To_scheduler);