@tiledesk/tiledesk-whatsapp-connector 1.0.8 → 1.0.10

package/index.js

@@ -185,7 +185,13 @@ router.get("/configure", async (req, res) => {
 
 router.get('/onboarding/callback', async (req, res) => {
   const { code, waba_id, phone_number_id, business_id } = req.query;
-  const state = JSON.parse(req.query.state)
+  let state;
+  try {
+    state = JSON.parse(req.query.state)
+  } catch(err) {
+    winston.error("(wab) Error parsing query state");
+    return res.status(500).send({ success: false, message: "Error parsing query state" });
+  }
   const project_id = state.project_id;
   const token = state.token;
 
@@ -700,9 +706,11 @@ router.post("/tiledesk", async (req, res) => {
             }
           }).catch((err) => {
             winston.error("(wab) send message error: ", err.response.data);
+            return res.status(500).send({ success: false, error: "Send message error" });
           });
         } else {
           winston.error("(wab) WhatsappJsonMessage is undefined!");
+          return res.status(500).send({ success: false, error: "Translation to whatsapp message failed" });
         }
       }
 
@@ -993,105 +1001,21 @@ router.post("/webhook/:project_id", async (req, res) => {
 
         // Standard message
       } else {
-        let firstname = req.body.entry[0].changes[0].value.contacts[0].profile.name;
+        const value = req.body?.entry?.[0]?.changes?.[0]?.value;
 
         let message_info = {
           channel: "whatsapp",
           whatsapp: {
-            phone_number_id: req.body.entry[0].changes[0].value.metadata.phone_number_id,
-            from: req.body.entry[0].changes[0].value.messages[0].from,
-            firstname: req.body.entry[0].changes[0].value.contacts[0].profile.name,
+            phone_number_id: value?.metadata?.phone_number_id || null,
+            from: value?.messages?.[0]?.from || null,
+            firstname: value?.contacts?.[0]?.profile?.name || "Unknown",
             lastname: " "
           },
         };
 
-        let tiledeskJsonMessage;
-
-        /*
-        if ((whatsappChannelMessage.type == 'text')) {
-          winston.debug("(wab) message type: text")
-          tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname);
-        }
-
-        else if (whatsappChannelMessage.type == 'interactive') {
-          winston.debug("(wab) message type: interactive")
-          tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname);
-        }
-
-        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, 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);
-          }
+        let firstname = message_info.whatsapp.firstname;
 
-        } else {
-          // unsupported. Try anyway to send something.
-          winston.debug("(wab) unsupported message")
-        }
-        */
-
-        ////////////////////////////////////////////////////
+        let tiledeskJsonMessage;
 
         if (
           whatsappChannelMessage.type == "image" ||
@@ -1491,37 +1415,42 @@ router.get("/templates/detail", async (req, res) => {
     let namespace = templates_info.message_template_namespace;
     let template = await tm.getTemplateById(namespace);
     */
-    let tm = new TemplateManager({
-      token: settings.wab_token,
-      business_account_id: settings.business_account_id,
-      GRAPH_URL: GRAPH_URL,
-    });
-    let templates = await tm.getTemplates();
-    let template = JSON.parse(JSON.stringify(templates.data.find((t) => t.id === template_id)));
-    let template_name = template.name;
-
-    let template_copy = {
-      name: template.name,
-      components: template.components,
-      language: template.language,
-      status: template.status,
-      id: template.id,
-      category: template.category,
-    };
-
-    readHTMLFile("/template_detail.html", (err, html) => {
-      var template = handlebars.compile(html);
-      var replacements = {
-        app_version: pjson.version,
-        project_id: project_id,
-        token: token,
-        app_id: app_id,
-        name: template_name,
-        template: template_copy,
-      };
-      var html = template(replacements);
-      res.send(html);
-    });
+   try {
+     let tm = new TemplateManager({
+       token: settings.wab_token,
+       business_account_id: settings.business_account_id,
+       GRAPH_URL: GRAPH_URL,
+     });
+     let templates = await tm.getTemplates();
+     let template = JSON.parse(JSON.stringify(templates.data.find((t) => t.id === template_id)));
+     let template_name = template.name;
+ 
+     let template_copy = {
+       name: template.name,
+       components: template.components,
+       language: template.language,
+       status: template.status,
+       id: template.id,
+       category: template.category,
+     };
+ 
+     readHTMLFile("/template_detail.html", (err, html) => {
+       var template = handlebars.compile(html);
+       var replacements = {
+         app_version: pjson.version,
+         project_id: project_id,
+         token: token,
+         app_id: app_id,
+         name: template_name,
+         template: template_copy,
+       };
+       var html = template(replacements);
+       res.send(html);
+     });
+   } catch (err) {
+    winston.error("(wab) Error geting templates: ", err);
+    return res.status(500).send({ success: false, error: err?.response?.data || "General error" });
+   }
   } else {
     return res.send("whatsapp not installed on this project");
   }

package/package.json

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

package/tiledesk/TiledeskBotTester.js

@@ -75,7 +75,12 @@ class TiledeskBotTester {
             return;
             
           } else {
-            test_info = JSON.parse(value)
+            try {
+              test_info = JSON.parse(value)
+            } catch(err) {
+              winston.error("(wab) Error parsing value: " + value);
+              reject(err);
+            }
             let message_info = {
               channel: "whatsapp",
               whatsapp: {
@@ -86,9 +91,9 @@ class TiledeskBotTester {
               }
             }
 
-            let settings = await utils.getSettingsByProjectId(this.project_id);
+            let settings = await this.utils.getSettingsByProjectId(this.project_id);
             if (!settings) {
-              settings = await utils.getSettings(this.project_id, null);
+              settings = await this.utils.getSettings(this.project_id, null);
             }
           
             if (!settings) {