@tiledesk/tiledesk-whatsapp-connector 0.1.9 → 0.1.10

package/index.js

@@ -341,9 +341,9 @@ router.post('/tiledesk', async (req, res) => {
   let phone_number_id = recipient_id.substring(recipient_id.lastIndexOf("wab-") + 4, recipient_id.lastIndexOf("-"));
   console.log("(Tiledesk) phone_number_id: ", phone_number_id)
 
-  const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+  const tlr = new TiledeskWhatsappTranslator();
 
-  const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+  const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
   console.log("whatsappJsonMessage: ", whatsappJsonMessage);
 
   if (whatsappJsonMessage) {
@@ -363,7 +363,7 @@ router.post('/tiledesk', async (req, res) => {
     })
     */
   } else {
-    console.error("Whatsapp Json Message is mandatory!")
+    console.error("Whatsapp Json Message is undefined!")
   }
   // richiamo toWhatsapp;
   // sendMessage
@@ -393,9 +393,15 @@ router.post("/webhook/:project_id", async (req, res) => {
 
       console.log("\n***Body: ", JSON.stringify(req.body, null, 2));
 
+      if (req.body.entry[0].changes[0].value.messages[0].type == "system") {
+        console.log("Skip system message")
+        res.sendStatus(200);
+      }
+
       //let originalWhatsappMessage = req.body;
       let whatsappChannelMessage = req.body.entry[0].changes[0].value.messages[0];
 
+
       let firstname = req.body.entry[0].changes[0].value.contacts[0].profile.name;
       console.log("(WAB) firstname: ", firstname)
 
@@ -424,16 +430,16 @@ router.post("/webhook/:project_id", async (req, res) => {
 
       let tiledeskJsonMessage;
 
-      const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+      const tlr = new TiledeskWhatsappTranslator();
 
       if ((whatsappChannelMessage.type == 'text')) {
         console.log("message type text")
-        tiledeskJsonMessage = tlr.toTiledesk(firstname);
+        tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname);
 
       }
       else if (whatsappChannelMessage.type == 'interactive') {
         console.log("message type interactive")
-        tiledeskJsonMessage = tlr.toTiledesk(firstname);
+        tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname);
 
       }
       else if ((whatsappChannelMessage.type == 'image') || (whatsappChannelMessage.type == 'video') || (whatsappChannelMessage.type == 'document')) {
@@ -450,7 +456,7 @@ router.post("/webhook/:project_id", async (req, res) => {
           const image_url = await util.uploadMedia(filename, "images");
           console.log("image_url: ", image_url)
 
-          tiledeskJsonMessage = tlr.toTiledesk(firstname, image_url);
+          tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname, image_url);
 
         }
 
@@ -463,7 +469,7 @@ router.post("/webhook/:project_id", async (req, res) => {
           const media_url = await util.uploadMedia(filename, "files");
           console.log("image_url: ", media_url)
 
-          tiledeskJsonMessage = tlr.toTiledesk(firstname, media_url);
+          tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
         }
 
         if (whatsappChannelMessage.type == 'document') {
@@ -475,7 +481,7 @@ router.post("/webhook/:project_id", async (req, res) => {
           const media_url = await util.uploadMedia(filename, "files");
           console.log("image_url: ", media_url)
 
-          tiledeskJsonMessage = tlr.toTiledesk(firstname, media_url);
+          tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
         }
 
       } else {
@@ -493,7 +499,7 @@ router.post("/webhook/:project_id", async (req, res) => {
       }
 
     }
-    res.sendStatus(200);
+    res.sendStatus(200); 
   } else {
     // Return a '404 Not Found' if event is not from a WhatsApp API
     res.sendStatus(404);

package/package.json

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

package/test/test_translate_whatsapp.js

@@ -10,16 +10,16 @@ describe('Test Translator\n', function() {
   it("Translates a TEXT message from Tiledesk to Whatsapp", function() {
     let tiledeskChannelMessage = {
       text: 'Test Message',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-tel393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       attributes: {
         userFullname: 'John Doe'
       }
     }
     let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 1)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(whatsappJsonMessage.to === whatsapp_receiver);
@@ -36,7 +36,7 @@ describe('Test Translator\n', function() {
     let tiledeskChannelMessage = {
       text: 'Image Caption', // can be empty --> ""
       type: 'image',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-tel393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
         src: 'https://fakeimageurl.com/',
       },
@@ -46,9 +46,9 @@ describe('Test Translator\n', function() {
     }
     let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(whatsappJsonMessage.to === whatsapp_receiver);
@@ -67,7 +67,7 @@ describe('Test Translator\n', function() {
     let tiledeskChannelMessage = {
       text: 'Video Caption', // can be empty --> ""
       type: 'video',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
         src: 'https://fakevideourl.com/'
       },
@@ -77,9 +77,9 @@ describe('Test Translator\n', function() {
     }
     let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(whatsappJsonMessage.to === whatsapp_receiver);
@@ -98,7 +98,7 @@ describe('Test Translator\n', function() {
     let tiledeskChannelMessage = {
       text: 'Document Caption', // can be empty --> ""
       type: 'application',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-tel393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       metadata: {
         src: 'https://fakedocumenturl.com/'
       },
@@ -108,9 +108,9 @@ describe('Test Translator\n', function() {
     }
     let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(whatsappJsonMessage.to === whatsapp_receiver);
@@ -128,7 +128,7 @@ describe('Test Translator\n', function() {
 
     let tiledeskChannelMessage = {
       text: 'Test Message',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-tel393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       attributes: {
         attachment: {
           buttons: [
@@ -141,9 +141,9 @@ describe('Test Translator\n', function() {
     }
     let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(!whatsappJsonMessage.text);
@@ -166,7 +166,7 @@ describe('Test Translator\n', function() {
 
     let tiledeskChannelMessage = {
       text: 'Test Message',
-      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-c7dc-4e62-89b1-ffe9bba7fd59-wab-104777398965560-tel393484506627',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
       attributes: {
         attachment: {
           buttons: [
@@ -179,11 +179,11 @@ describe('Test Translator\n', function() {
         }
       }
     }
-    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("tel") + 3)
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: tiledeskChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const whatsappJsonMessage = tlr.toWhatsapp(whatsapp_receiver);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
     assert(whatsappJsonMessage != null);
     assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
     assert(!whatsappJsonMessage.text);
@@ -214,9 +214,9 @@ describe('Test Translator\n', function() {
     }
     let fullname = "John Doe"; // from whatsapp contacts
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, null)
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === whatsappChannelMessage.text.body);
@@ -241,9 +241,9 @@ describe('Test Translator\n', function() {
     }
     let fullname = "John Doe"; // from whatsapp contacts
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, null)
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === whatsappChannelMessage.interactive.list_reply.title);
@@ -268,9 +268,9 @@ describe('Test Translator\n', function() {
     }
     let fullname = "John Doe"; // from whatsapp contacts
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, null)
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === ' ');
@@ -303,9 +303,9 @@ describe('Test Translator\n', function() {
     }
     let fullname = "John Doe"; // from whatsapp contacts
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, null)
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === whatsappChannelMessage.interactive.button_reply.title);
@@ -330,9 +330,9 @@ describe('Test Translator\n', function() {
     }
     let fullname = "John Doe"; // from whatsapp contacts
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, null)
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, null)
     assert(tiledeskJsonMessage != null);
     assert(tiledeskJsonMessage.channel.name === TiledeskWhatsappTranslator.CHANNEL_NAME);
     assert(tiledeskJsonMessage.text === ' ');
@@ -359,9 +359,9 @@ describe('Test Translator\n', function() {
     let fullname = "John Doe";
     let media_url = "https://fakeimageurl.com/"
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
       console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
@@ -379,9 +379,9 @@ describe('Test Translator\n', function() {
     let fullname = "John Doe";
     let media_url = "https://fakeimageurl.com/"
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
       console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
@@ -399,9 +399,9 @@ describe('Test Translator\n', function() {
     let fullname = "John Doe";
     let media_url = "https://fakedocumenturl.com/"
 
-    const tlr = new TiledeskWhatsappTranslator({ channelMessage: whatsappChannelMessage });
+    const tlr = new TiledeskWhatsappTranslator();
     assert(tlr != null);
-    const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
+    const tiledeskJsonMessage = tlr.toTiledesk(whatsappChannelMessage, fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
       console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -1,4 +1,3 @@
-
 class TiledeskWhatsappTranslator {
 
   /**
@@ -6,20 +5,16 @@ class TiledeskWhatsappTranslator {
    *
    * @example
    * const { TiledeskWhatsappTranslator } = require('tiledesk-whatsapp-translator');
-   * const tlr = new TiledeskWhatsappTranslator({channelMessage: replyFromChatbot});
+   * const tlr = new TiledeskWhatsappTranslator();
    * 
    * @param {Object} config JSON configuration.
-   * @param {string} config.channelMessage Mandatory. Tiledesk channel native message
-   * @param {boolean} options.log Optional. If true HTTP requests are logged.
    */
 
   static WHATSAPP_MESSAGING_PRODUCT = "whatsapp";
-  static CHANNEL_NAME = "whatsapp"
+  static CHANNEL_NAME = "whatsapp";
 
-  constructor(config) {
-    if (!config) {
-      throw new Error('config is mandatory');
-    }
+  constructor() {
+    
 
     /*
     if (!config.tiledeskChannelMessage) {
@@ -28,15 +23,9 @@ class TiledeskWhatsappTranslator {
     this.tiledeskChannelMessage = config.tiledeskChannelMessage;
     console.log("this.tiledeskChannelMessage: ", this.tiledeskChannelMessage);
     */
-
-    if (!config.channelMessage) {
-      throw new Error('config.channelMessage is mandatory');
-    }
-    this.channelMessage = config.channelMessage;
+    
     this.log = true;
-    if (config.log) {
-      this.log = true;
-    }
+    
 
   }
 
@@ -46,11 +35,21 @@ class TiledeskWhatsappTranslator {
   ********* WHATSAPP BUSINESS *********
   *************************************
   */
-  toWhatsapp(whatsapp_receiver) {
+
+  /** Returns a Whatsapp  messagem new request ID for the specified Project.<br>
+   * A request's ID has the format:<br>
+   * <br>
+   * <i>support-group-PROJECT_ID-UNIQUE_ID</i><br>
+   * <br>
+   * <i>UNIQUE_ID</i> MUST be unique in your Project. <b>This method always returns an <i>UUID</i> for the <i>UNIQUE_ID</i> component</b>.
+   * 
+   * @param {Object} tiledeskChannelMessage - The message in Tiledesk format.
+   * @param {string} whatsapp_receiver - The Whatsapp recipient fo the message.
+  */
+  toWhatsapp(tiledeskChannelMessage, whatsapp_receiver) {
 
 
     // to --> recipient
-    let tiledeskChannelMessage = this.channelMessage;
     if (this.log) {
       console.log("[Translator] tiledesk message: ", tiledeskChannelMessage)
     }
@@ -287,9 +286,8 @@ class TiledeskWhatsappTranslator {
     }
   }
 
-  toTiledesk(from, media_url) {
+  toTiledesk(whatsappChannelMessage, from, media_url) {
 
-    let whatsappChannelMessage = this.channelMessage;
     if (this.log) {
       console.log("[Translator] whatsapp message: ", whatsappChannelMessage)
     }