@tiledesk/tiledesk-whatsapp-connector 0.1.27 → 0.1.29

package/index.js

@@ -898,13 +898,20 @@ router.post("/newtest", async (req, res) => {
 
   //let short_uid = getRandomName();
   let short_uid = uuidv4().substring(0, 8)
-  let TEST_KEY = "bottest:" + short_uid;
+  let key = "bottest:" + short_uid;
 
-  await redis_client.json.set(TEST_KEY, '.', info);
-  const value = await redis_client.json.get(TEST_KEY)
-  console.log("get --> value: ", value)
+  await redis_client.set(key, JSON.stringify(info));
+  //const value = await redis_client.get(key)
+  //console.log("get --> value: ", value)
+  redis_client.get(key, (err, value) => {
+    if (err) {
+      console.log("get err: ", err)
+    } else {
+      console.log("get value: ", value)
+    }
+  })
   /*
-  const value = await redis_client.json.get(TEST_KEY, {
+  const value = await redis_client.json.get(key, {
     // JSON Path: .node = the element called 'node' at root level.
     path: '.nodell',
   });
@@ -924,11 +931,23 @@ router.post("/testitout/:project_id", async (req, res) => {
 
   let whatsappContact = req.body.entry[0].changes[0].value.contacts[0];
 
-  let REDIS_KEY = "bottest:" + whatsappChannelMessage.text.body.substring(3);
-  console.log("(testitout) key: ", REDIS_KEY);
+  let key = "bottest:" + whatsappChannelMessage.text.body.substring(3);
+  console.log("(testitout) key: ", key);
 
+  /*
   const info = await redis_client.json.get(REDIS_KEY);
   console.log("(testitout) info: ", info);
+  */
+  let test_info;
+  redis_client.get(key, (err, value) => {
+    if (err) {
+      console.log("No info found on redis. Exit..");
+      res.sendStatus(200);
+    } else {
+      test_info = JSON.parse(value)
+      console.log("test_info: ", test_info)
+    }
+  })
   
   let message_info = {
     channel: "whatsapp",
@@ -960,7 +979,7 @@ router.post("/testitout/:project_id", async (req, res) => {
   console.log("(testitout) tiledeskJsonMessage: ", tiledeskJsonMessage)
   
   const tdChannel = new TiledeskChannel({ settings: settings, API_URL: API_URL })
-  const response = await tdChannel.sendAndAddBot(tiledeskJsonMessage, message_info, info.bot_id)
+  const response = await tdChannel.sendAndAddBot(tiledeskJsonMessage, message_info, test_info.bot_id)
   console.log("testitout --> send response: ", response)
   
   res.status(200).send("testitout")
@@ -972,7 +991,7 @@ router.post("/testitout/:project_id", async (req, res) => {
 // *****************************
 
 async function startApp(settings, callback) {
-  console.log("Starting Whatsapp App");
+  console.log("(whatsapp) Starting Whatsapp App");
 
   if (!settings.MONGODB_URL) {
     throw new Error("settings.MONGODB_URL is mandatory");
@@ -982,49 +1001,37 @@ async function startApp(settings, callback) {
     throw new Error("settings.API_URL is mandatory");
   } else {
     API_URL = settings.API_URL;
-    console.log("API_URL: ", API_URL);
+    console.log("(whatsapp) API_URL: ", API_URL);
   }
 
   if (!settings.BASE_URL) {
     throw new Error("settings.BASE_URL is mandatory");
   } else {
     BASE_URL = settings.BASE_URL;
-    console.log("BASE_URL: ", BASE_URL);
+    console.log("(whatsapp) BASE_URL: ", BASE_URL);
   }
 
   if (!settings.GRAPH_URL) {
     throw new Error("settings.GRAPH_URL is mandatory");
   } else {
     GRAPH_URL = settings.GRAPH_URL;
-    console.log("GRAPH_URL: ", GRAPH_URL);
+    console.log("(whatsapp) GRAPH_URL: ", GRAPH_URL);
   }
 
   if (!settings.APPS_API_URL) {
     throw new Error("settings.APPS_API_URL is mandatory");
   } else {
     APPS_API_URL = settings.APPS_API_URL;
-    console.log("APPS_API_URL: ", APPS_API_URL);
+    console.log("(whatsapp) APPS_API_URL: ", APPS_API_URL);
   }
 
-  if (!settings.REDIS_HOST) {
-    throw new Error("!settings.REDIS_HOST is mandatory");
-  } else {
+  if (settings.REDIS_HOST && settings.REDIS_PORT && settings.REDIS_PASSWORD) {
     REDIS_HOST = settings.REDIS_HOST;
-    console.log("REDIS_HOST: ", REDIS_HOST);
-  }
-
-  if (!settings.REDIS_PORT) {
-    throw new Error("!settings.REDIS_PORT is mandatory");
-  } else {
     REDIS_PORT = settings.REDIS_PORT;
-    console.log("REDIS_PORT: ", REDIS_PORT);
-  }
-
-  if (!settings.REDIS_PASSWORD) {
-    throw new Error("!settings.REDIS_PASSWORD is mandatory");
-  } else {
     REDIS_PASSWORD = settings.REDIS_PASSWORD;
-    console.log("REDIS_PASSWORD: *************");
+    connectRedis();
+  } else {
+    console.log("(whatsapp) Missing redis parameters --> Test it out on WhatsApp disabled");
   }
 
   if (settings.log) {
@@ -1032,22 +1039,13 @@ async function startApp(settings, callback) {
   }
 
   redis_client = redis.createClient({
-    socket: {
         host: REDIS_HOST,
         port: REDIS_PORT,
-    },
     password: REDIS_PASSWORD
   });
-  redis_client.on('connect', () => {
-    console.log('Redis Connected!'); // Connected!
-  });
-  //await redis_client.connect(); // only for v4
-  redis_client.on('error', err => {
-    console.log('Error ' + err);
-  })
 
   db.connect(settings.MONGODB_URL, () => {
-    console.log("KVBaseMongo successfully connected.");
+    console.log("(whatsapp) KVBaseMongo successfully connected.");
     
     if (callback) {
       callback();
@@ -1055,8 +1053,30 @@ async function startApp(settings, callback) {
   })
 }
 
+function connectRedis() {
+  redis_client = redis.createClient({
+    host: REDIS_HOST,
+    port: REDIS_PORT,
+    password: REDIS_PASSWORD
+  });
+
+  redis_client.on('error', err => {
+    console.log('(whatsapp) Connect Redis Error ' + err);
+  })
+  /*
+  redis_client.on('connect', () => {
+    console.log('Redis Connected!'); // Connected!
+  });
+  */
+  redis_client.on('ready', () => {
+    console.log("(whatsapp) Redis ready!")
+  })
+  //await redis_client.connect(); // only for v4
+
+}
+
 function readHTMLFile(templateName, callback) {
-  console.log("Reading file: ", templateName)
+  //console.log("Reading file: ", templateName)
   fs.readFile(__dirname + '/template' + templateName, { encoding: 'utf-8' },
     function(err, html) {
       if (err) {

package/package.json

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

package/test/test_translate_whatsapp.js

@@ -1,6 +1,6 @@
 var assert = require('assert');
 const { TiledeskWhatsappTranslator } = require('../tiledesk/TiledeskWhatsappTranslator');
-const log = true;
+const log = false;
 
 
 describe('Test Translator\n', function() {
@@ -57,8 +57,8 @@ describe('Test Translator\n', function() {
     assert(whatsappJsonMessage.image);
     assert(whatsappJsonMessage.image.link === tiledeskChannelMessage.metadata.src);
     assert(whatsappJsonMessage.image.caption === tiledeskChannelMessage.text);
-    console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     if (log) {
+      console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     }
   })
 
@@ -201,7 +201,56 @@ describe('Test Translator\n', function() {
     assert(whatsappJsonMessage.interactive.action.sections);
     assert(whatsappJsonMessage.interactive.action.sections[0].rows.length === 4);
     assert(whatsappJsonMessage.interactive.action.sections[1].rows.length === 1);
-    if (log) {
+    if (!log) {
+      console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
+    }
+  })
+
+  it("Translates a message with BUTTONS (more than 10) from Tiledesk to Whatsapp", function() {
+
+    let tiledeskChannelMessage = {
+      text: 'Test Message',
+      recipient: 'support-group-62c3f10152dc7400352bab0d-86a2293e-wab-104777398965560-393484506627',
+      attributes: {
+        attachment: {
+          buttons: [
+            { type: 'text', value: 'Button 1' },
+            { type: 'text', value: 'Button 2' },
+            { type: 'text', value: 'Button 3' },
+            { type: 'text', value: 'Button 4' },
+            { type: 'text', value: 'Button 5' },
+            { type: 'text', value: 'Button 6' },
+            { type: 'text', value: 'Button 7' },
+            { type: 'text', value: 'Button 8' },
+            { type: 'text', value: 'Button 9' },
+            { type: 'text', value: 'Button 10' },
+            { type: 'text', value: 'Button 11' },
+            { type: 'text', value: 'Button 12' },
+            { type: 'action', value: '↩︎ Back', action: 'main_menu' }
+          ]
+        }
+      }
+    }
+    let whatsapp_receiver = tiledeskChannelMessage.recipient.substring(tiledeskChannelMessage.recipient.lastIndexOf("-") + 1)
+
+    const tlr = new TiledeskWhatsappTranslator();
+    assert(tlr != null);
+    const whatsappJsonMessage = tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
+    assert(whatsappJsonMessage != null);
+    assert(whatsappJsonMessage.messaging_product === TiledeskWhatsappTranslator.WHATSAPP_MESSAGING_PRODUCT);
+    /*
+    assert(!whatsappJsonMessage.text);
+    assert(whatsappJsonMessage.type === "interactive");
+    assert(whatsappJsonMessage.interactive);
+    assert(whatsappJsonMessage.interactive.type === "list");
+    assert(whatsappJsonMessage.interactive.body.text === tiledeskChannelMessage.text);
+    assert(whatsappJsonMessage.interactive.action);
+    assert(whatsappJsonMessage.interactive.action.button === 'Choose an option');
+    assert(whatsappJsonMessage.interactive.action.sections);
+    assert(whatsappJsonMessage.interactive.action.sections[0].rows.length === 4);
+    assert(whatsappJsonMessage.interactive.action.sections[1].rows.length === 1);
+    */
+    if (!log) {
       console.log("(test) whatsappJsonMessage: ", whatsappJsonMessage);
     }
   })

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -285,6 +285,7 @@ const path = require('path');
             // Option 2: Cut buttons array -> display first 10 buttons only
             // Option 3: Send message with *buttons (questa)
 
+            console.log("\n\ntiledeskChannelMessage.attributes._raw_message: ", JSON.stringify(tiledeskChannelMessage))
             whatsapp_message.text = { body: tiledeskChannelMessage.attributes._raw_message };
 
             if (this.log) {