@tiledesk/tiledesk-whatsapp-connector 0.1.28 → 0.1.30

package/index.js

@@ -898,18 +898,33 @@ 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)
+  if (!redis_client) {
+    return res.status(500).send({ message: "Test it out on Whatsapp not available. Redis not ready."})
+  }
+
+  //console.log("redis_client: ", redis_client)
+
+  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)
+      return res.status(500).send({success: "false", message: "No info found on redis"});
+    } else {
+      console.log("get value: ", value)
+      return res.status(200).send({short_uid: short_uid});
+    }
+  })
   /*
-  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',
   });
   */
-  res.status(200).send({short_uid: short_uid});
+  //res.status(200).send({short_uid: short_uid});
 })
 
 router.post("/testitout/:project_id", async (req, res) => {
@@ -924,11 +939,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 +987,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 +999,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,63 +1009,61 @@ 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) {
     log = settings.log;
   }
 
+  db.connect(settings.MONGODB_URL, () => {
+    console.log("(whatsapp) KVBaseMongo successfully connected.");
+    
+    if (callback) {
+      callback();
+    }
+  })
+}
+
+function connectRedis() {
   redis_client = redis.createClient({
-        host: REDIS_HOST,
-        port: REDIS_PORT,
-    password: REDIS_PASSWORD
+    host: REDIS_HOST,
+    port: REDIS_PORT,
+    password: REDIS_PASSWORD 
   });
 
   redis_client.on('error', err => {
-    console.log('Error ' + err);
+    console.log('(whatsapp) Connect Redis Error ' + err);
   })
   /*
   redis_client.on('connect', () => {
@@ -1046,22 +1071,14 @@ async function startApp(settings, callback) {
   });
   */
   redis_client.on('ready', () => {
-    console.log("Redis ready")
+    console.log("(whatsapp) Redis ready!")
   })
   //await redis_client.connect(); // only for v4
-  
 
-  db.connect(settings.MONGODB_URL, () => {
-    console.log("KVBaseMongo successfully connected.");
-    
-    if (callback) {
-      callback();
-    }
-  })
 }
 
 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.28",
+  "version": "0.1.30",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {