@tiledesk/tiledesk-whatsapp-connector 0.1.4 → 0.1.7

package/index.js

@@ -42,7 +42,7 @@ router.use(bodyParser.urlencoded({ extended: true }));
 var API_URL = null;
 var GRAPH_URL = null;
 var BASE_URL = null;
-var log = false;
+var log = true;
 
 const db = new KVBaseMongo(kvbase_collection);
 /*
@@ -165,9 +165,9 @@ router.post('/update', async (req, res) => {
         subscription_id: settings.subscriptionId,
       }
       if (log) {
-        console.log("Replacements: ", replacements);  
+        console.log("Replacements: ", replacements);
       }
-      
+
       var html = template(replacements);
       res.send(html);
     })
@@ -192,9 +192,9 @@ router.post('/update', async (req, res) => {
     tdClient.subscribe(subscription_info).then((data) => {
       let subscription = data;
       if (log) {
-        console.log("\nSubscription: ", subscription)  
+        console.log("\nSubscription: ", subscription)
       }
-      
+
       let settings = {
         project_id: projectId,
         token: token,
@@ -223,9 +223,9 @@ router.post('/update', async (req, res) => {
           subscription_id: settings.subscriptionId,
         }
         if (log) {
-          console.log("Replacements: ", replacements);  
+          console.log("Replacements: ", replacements);
         }
-        
+
         var html = template(replacements);
         res.send(html);
       })
@@ -240,7 +240,7 @@ router.post('/update', async (req, res) => {
 router.post('/disconnect', async (req, res) => {
   console.log("\n/disconnect")
   if (log) {
-    console.log("/disconnect body: ", req.body)  
+    console.log("/disconnect body: ", req.body)
   }
 
   let projectId = req.body.project_id;
@@ -277,9 +277,9 @@ router.post('/disconnect', async (req, res) => {
         proxy_url: proxy_url,
       }
       if (log) {
-        console.log("Replacements: ", replacements);  
+        console.log("Replacements: ", replacements);
       }
-      
+
       var html = template(replacements);
       res.send(html);
     })
@@ -487,7 +487,7 @@ router.post("/webhook/:project_id", async (req, res) => {
       // tdClient.getRequests 
       const tdChannel = new TiledeskChannel({ settings: settings, API_URL: API_URL })
       const response = await tdChannel.send(tiledeskJsonMessage, message_info);
-      if (log) {  
+      if (log) {
         console.log("Send response: ", response)
       }
 
@@ -550,7 +550,7 @@ function startApp(settings, callback) {
   if (!settings.MONGODB_URL) {
     throw new Error("settings.MONGODB_URL is mandatory");
   }
-  
+
   if (!settings.API_URL) {
     throw new Error("settings.API_URL is mandatory");
   } else {
@@ -586,11 +586,6 @@ function startApp(settings, callback) {
 
 function readHTMLFile(templateName, callback) {
   console.log("Reading file: ", templateName)
-  console.log("appRoot: ", appRoot)
-  let file = appRoot + '/template' + templateName;
-  console.log("file: ", file);
-  console.log("*** appRoot: ", appRoot.toString());
-  console.log("type: ", typeof(appRoot))
   fs.readFile(__dirname + '/template' + templateName, { encoding: 'utf-8' },
     function(err, html) {
       if (err) {
@@ -602,4 +597,4 @@ function readHTMLFile(templateName, callback) {
     })
 }
 
-module.exports = { router: router, startApp: startApp};
+module.exports = { router: router, startApp: startApp };

package/package.json

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

package/template/configure.html

@@ -43,7 +43,7 @@
           <div>
             
             <h1 style="margin-top: 0px; margin-bottom: 2px; min-width: 500px;">WhatsApp Business (Test)</h1>
-            <h7 style="color: rgb(140, 140, 140);">by Tiledesk (v. 0.1.4)</h7>
+            <h7 style="color: rgb(140, 140, 140);">by Tiledesk (v. 0.1.7)</h7>
 
             {{#if wab_token}}
               <div style="margin-top: 20px;">

package/test/test_translate_whatsapp.js

@@ -35,10 +35,10 @@ 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',
       metadata: {
         src: 'https://fakeimageurl.com/',
-        type: 'image/png',
       },
       attributes: {
         userFullname: 'John Doe'
@@ -66,10 +66,10 @@ 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',
       metadata: {
-        src: 'https://fakevideourl.com/',
-        type: 'video/png',
+        src: 'https://fakevideourl.com/'
       },
       attributes: {
         userFullname: 'John Doe'
@@ -97,10 +97,10 @@ 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',
       metadata: {
-        src: 'https://fakedocumenturl.com/',
-        type: 'application/pdf',
+        src: 'https://fakedocumenturl.com/'
       },
       attributes: {
         userFullname: 'John Doe'
@@ -283,13 +283,13 @@ describe('Test Translator\n', function() {
     assert(tiledeskJsonMessage.senderFullname === fullname);
 
     if (log) {
-      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);  
+      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     }
-    
+
   })
 
 
- it("Translates a message with QUICK REPLY (button_reply) from Whatsapp to Tiledesk", function() {
+  it("Translates a message with QUICK REPLY (button_reply) from Whatsapp to Tiledesk", function() {
 
     let whatsappChannelMessage = {
       type: "interactive",
@@ -314,7 +314,7 @@ describe('Test Translator\n', function() {
       console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     }
   })
-  
+
 
   it("Translates a message with ACTION BUTTON (button_reply) from Whatsapp to Tiledesk", function() {
 
@@ -364,7 +364,7 @@ describe('Test Translator\n', function() {
     const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
-      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);  
+      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     }
   })
 
@@ -384,7 +384,7 @@ describe('Test Translator\n', function() {
     const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
-      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);  
+      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     }
   })
 
@@ -404,9 +404,9 @@ describe('Test Translator\n', function() {
     const tiledeskJsonMessage = tlr.toTiledesk(fullname, media_url);
     assert(tiledeskJsonMessage != null);
     if (log) {
-      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);  
+      console.log("(test) tiledeskJsonMessage: ", tiledeskJsonMessage);
     }
   })
 
-  
+
 })

package/tiledesk/TiledeskChannel.js

@@ -32,7 +32,7 @@ class TiledeskChannel {
       throw new Error('config.API_URL is mandatory');
     }
 
-    this.log = false;
+    this.log = true;
     if (config.log) {
       this.log = config.log;
     }
@@ -104,8 +104,10 @@ class TiledeskChannel {
         let request_id;
         if (response.data.requests[0]) {
           request_id = response.data.requests[0].request_id;
+          console.log("Old request id: ", request_id);
         } else {
           request_id = new_request_id;
+          console.log("New request id: ", request_id);
         }
 
         if (this.log) {

package/tiledesk/TiledeskWhatsapp.js

@@ -32,10 +32,15 @@ class TiledeskWhatsapp {
     // this.media = config.channelMedia;
     this.token = config.token;
     this.GRAPH_URL = config.GRAPH_URL
+    
+    this.log = false;
+    if (config.log) {
+      this.log = config.log;
+    }
   }
 
   async sendMessage(phone_number_id, message) {
-    if (log) {
+    if (this.log) {
       console.log("[Tiledesk Whatsapp] Sending message...", message);  
     } else {
       console.log("[Tiledesk Whatsapp] Sending message...");  
@@ -58,7 +63,7 @@ class TiledeskWhatsapp {
   }
 
   async downloadMedia(mediaId) {
-    if (log) {
+    if (this.log) {
       console.log("[Tiledesk Whatsapp] Download media with id: ", mediaId);  
     }
 
@@ -128,7 +133,7 @@ class TiledeskWhatsapp {
     }
 
     return await axios.post(url, form, request_config).then((response) => {
-      if (log) {
+      if (this.log) {
         console.log("[Tiledesk Whatsapp] upload response: ", response.data);
       }
 
@@ -146,7 +151,7 @@ class TiledeskWhatsapp {
   
   // HTTP REQUEST
   static async myrequest(options, callback, log) {
-    if (log) {
+    if (this.log) {
       console.log("API URL: ", options.url);
       console.log("** Options: ", options);
     }
@@ -157,7 +162,7 @@ class TiledeskWhatsapp {
       params: options.params,
       headers: options.headers
     }).then((res) => {
-      if (log) {
+      if (this.log) {
         console.log("Response for url:", options.url);
         console.log("Response headers:\n", res.headers);
       }

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -33,7 +33,7 @@ class TiledeskWhatsappTranslator {
       throw new Error('config.channelMessage is mandatory');
     }
     this.channelMessage = config.channelMessage;
-    this.log = false;
+    this.log = true;
     if (config.log) {
       this.log = true;
     }
@@ -63,8 +63,9 @@ class TiledeskWhatsappTranslator {
     }
 
     if (tiledeskChannelMessage.metadata) {
-
-      if (tiledeskChannelMessage.metadata.type.startsWith('image/')) {
+  
+      if (tiledeskChannelMessage.type.startsWith('image')) {
+      //if (tiledeskChannelMessage.metadata.type.startsWith('image/')) {
         var imgUrl = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'image'
         whatsapp_message.image = {
@@ -73,7 +74,8 @@ class TiledeskWhatsappTranslator {
         }
       }
 
-      if (tiledeskChannelMessage.metadata.type.startsWith('video/')) {
+      if (tiledeskChannelMessage.type.startsWith('video')) {
+      //if (tiledeskChannelMessage.metadata.type.startsWith('video/')) {
         var videoUrl = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'document'
         whatsapp_message.document = {
@@ -89,7 +91,8 @@ class TiledeskWhatsappTranslator {
         */
       }
 
-      if (tiledeskChannelMessage.metadata.type.startsWith('application/')) {
+      if (tiledeskChannelMessage.type.startsWith('application')) {
+      //if (tiledeskChannelMessage.metadata.type.startsWith('application/')) {
         var doc = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'document'
         whatsapp_message.document = {