@tiledesk/tiledesk-whatsapp-connector 1.0.21 → 1.0.23

package/.env

@@ -1,2 +1,2 @@
 # CUSTOM ENV
-NPM_PUBLISH_TOKEN=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
+NPM_PUBLISH_TOKEN=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

package/index.js

@@ -878,9 +878,14 @@ router.post('/webhook', async (req, res) => {
 
       if (tiledeskJsonMessage) {
         winston.verbose("(wab) tiledeskJsonMessage: ", tiledeskJsonMessage);
-        const response = await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
-        winston.verbose("(wab) Message sent to Tiledesk!");
-        winston.debug("(wab) response: ", response);
+
+        try {
+          const response = await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
+          winston.verbose("(wab) Message sent to Tiledesk!");
+          winston.debug("(wab) response: ", response);
+        } catch (err) {
+          winston.error("(wab) send message error: ", err);
+        }
       } else {
         winston.verbose("(wab) tiledeskJsonMessage is undefined");
       }
@@ -1017,6 +1022,14 @@ router.post("/webhook/:project_id", async (req, res) => {
 
         let firstname = message_info.whatsapp.firstname;
 
+        let userToken;
+        try {
+          userToken = await getUserToken(tdChannel, message_info.whatsapp, settings);
+          message_info.userToken = userToken;
+        } catch (err) {
+          winston.error("(wab) get user token error: ", err);
+        }
+
         let tiledeskJsonMessage;
 
         if (
@@ -1041,7 +1054,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
 
             let file_path = path.join(__dirname, "tmp", filename);
-            const image_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
+            const image_url = await util.uploadMedia(file_path, settings.project_id, userToken);
             winston.debug("(wab) image_url: " + image_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, image_url);
@@ -1057,7 +1070,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
+            const media_url = await util.uploadMedia(file_path, settings.project_id, userToken);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1073,7 +1086,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
+            const media_url = await util.uploadMedia(file_path, settings.project_id, userToken);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1089,7 +1102,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
+            const media_url = await util.uploadMedia(file_path, settings.project_id, userToken);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);

package/package.json

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

package/tiledesk/TiledeskChannel.js

@@ -53,6 +53,7 @@ class TiledeskChannel {
   async send(tiledeskMessage, messageInfo, department_id) {
 
     let channel;
+    let request_id;
     let new_request_id;
 
     if (department_id) {
@@ -85,7 +86,6 @@ class TiledeskChannel {
       const requestsResponse = await this.getRequests(messageInfo.channel, token);
       winston.debug("(wab) [TiledeskChannel] get request response: ", requestsResponse.data);
 
-      let request_id;
       if (requestsResponse.data.requests[0]) {
         request_id = requestsResponse.data.requests[0].request_id;
         winston.debug("(wab) [TiledeskChannel] Old request_id: " + request_id);
@@ -94,20 +94,24 @@ class TiledeskChannel {
         winston.debug("(wab) [TiledeskChannel] New request_id: " + request_id);
       }
 
-      winston.debug("(wab) [TiledeskChannel] tiledeskMessage:", tiledeskMessage);
-      
-      try {
-        const sendResponse = await this.sendMessage(request_id, tiledeskMessage, token);
-        winston.debug("(wab) [TiledeskChannel] send message response: ", sendResponse.data);
-        return sendResponse.data;
-      } catch (err) {
-        winston.error("(wab) [TiledeskChannel] send message error: ", err);
-        throw err;
-      }
     } catch (err) {
-      winston.error("(wab) [TiledeskChannel] get requests error: ", err);
-      throw err;
+      const errorMessage = utils._extractErrorMessage(err);
+      winston.error("(wab) [TiledeskChannel] get requests error: " + errorMessage);
+      throw new Error(errorMessage);
+    }
+
+    winston.debug("(wab) [TiledeskChannel] tiledeskMessage:", tiledeskMessage);
+
+    try {
+      const sendResponse = await this.sendMessage(request_id, tiledeskMessage, token);
+      winston.debug("(wab) [TiledeskChannel] send message response: ", sendResponse.data);
+      return sendResponse.data;
+    } catch (err) {
+      const errorMessage = utils._extractErrorMessage(err);
+      winston.error("(wab) [TiledeskChannel] send message error: " + errorMessage);
+      throw new Error(errorMessage);
     }
+        
   }
 
   /**
@@ -227,10 +231,12 @@ class TiledeskChannel {
       }).then((response) => {
         return response.data
       }).catch((err) => {
-        winston.error("(wab) [TiledeskChannel] send message (open conversation) error: ", err);
+        const errorMessage = utils._extractErrorMessage(err);
+        winston.error("(wab) [TiledeskChannel] send message (open conversation) error: " + errorMessage);
       })
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] sign in error: ", err);
+      const errorMessage = utils._extractErrorMessage(err);
+      winston.error("(wab) [TiledeskChannel] sign in error: " + errorMessage);
     })
   }
 
@@ -250,7 +256,8 @@ class TiledeskChannel {
     }).then((response) => {
       return this.checkPlan(response.data);
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] get project detail error: ", err);
+      const errorMessage = utils._extractErrorMessage(err);
+      winston.error("(wab) [TiledeskChannel] get project detail error: " + errorMessage);
       return null;
     })
   }

package/utils/utils.js

@@ -35,6 +35,50 @@ class Utils {
     }
     return phonePrefixes[matchedPrefix];
   }
+
+  /**
+   * Extract error message from axios error, converting it to a string
+   * @param {Error} err - The error object
+   * @returns {string} - A string representation of the error
+   */
+  _extractErrorMessage(err) {
+    if (!err) {
+      return 'Unknown error';
+    }
+
+    // If it's an axios error with a response
+    if (err.response) {
+      const status = err.response.status;
+      const statusText = err.response.statusText;
+      const data = err.response.data;
+
+      // Try to extract a meaningful message from response.data
+      let message = '';
+      if (typeof data === 'string') {
+        message = data;
+      } else if (data && typeof data === 'object') {
+        // Try common error message fields
+        message = data.message || data.error?.message || data.error || JSON.stringify(data);
+      }
+
+      return `HTTP ${status} ${statusText}${message ? ': ' + message : ''}`;
+    }
+
+    // If it's an axios error without response (network error, timeout, etc.)
+    if (err.request) {
+      const code = err.code || '';
+      const message = err.message || 'Network error';
+      return code ? `${message} (${code})` : message;
+    }
+
+    // For other errors, use the message or convert to string
+    if (err.message) {
+      return err.message;
+    }
+
+    // Last resort: convert to string
+    return String(err);
+  }
   
 }
 
@@ -46,6 +90,8 @@ function fixNumber(phone_number) {
   }
 }
 
+
+
 let utils = new Utils();
 
 module.exports = utils;