@tiledesk/tiledesk-whatsapp-connector 0.1.54 → 0.1.55

package/index.js

@@ -61,6 +61,7 @@ let REDIS_PORT = null;
 let REDIS_PASSWORD = null;
 let BASE_FILE_URL = null;
 let AMQP_MANAGER_URL = null;
+let JOB_TOPIC_EXCHANGE = null;
 
 
 // Handlebars register helpers
@@ -1352,12 +1353,20 @@ async function startApp(settings, callback) {
   }
 
   if (!settings.AMQP_MANAGER_URL) {
-    winston.error("(wab api) AMQP_MANAGER_URL is mandatory (?). Exit...");
+    winston.error("(wab) AMQP_MANAGER_URL is mandatory (?). Exit...");
   } else {
     AMQP_MANAGER_URL = settings.AMQP_MANAGER_URL;
-    winston.info("(wab api) AMQP_MANAGER_URL is present");
+    winston.info("(wab) AMQP_MANAGER_URL is present");
   }
 
+  if (!settings.JOB_TOPIC_EXCHANGE) {
+    winston.warning("(wab) JOB_TOPIC_EXCHANGE should be present. Using default value");
+    JOB_TOPIC_EXCHANGE = "tiledesk-whatsapp";
+  } else {
+    JOB_TOPIC_EXCHANGE = settings.JOB_TOPIC_EXCHANGE;
+    winston.info("(wab) JOB_TOPIC_EXCHANGE is present");
+  }
+  
   mongoose.connect(process.env.MONGODB_URL)
           .then(() => { winston.info("Mongoose DB Connected") })
           .catch((err) => { winston.error("(Mongoose) Unable to connect with MongoDB ", err)
@@ -1376,7 +1385,8 @@ async function startApp(settings, callback) {
     API_URL: API_URL,
     GRAPH_URL: GRAPH_URL,
     BASE_FILE_URL: BASE_FILE_URL,
-    AMQP_MANAGER_URL: AMQP_MANAGER_URL
+    AMQP_MANAGER_URL: AMQP_MANAGER_URL,
+    JOB_TOPIC_EXCHANGE: JOB_TOPIC_EXCHANGE,
   }, (err) => {
     if (!err) {
       winston.info("(wab) API route successfully started.")

package/package.json

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

package/routes/api.js

@@ -152,7 +152,7 @@ router.post('/tiledesk/broadcast', async (req, res) => {
     return res.status(400).send({ success: false, error: "Missing parameter 'WhatsApp Business Account ID'. Please update your app."})
   }
 
-  let scheduler = new Scheduler({ AMQP_MANAGER_URL: AMQP_MANAGER_URL });
+  let scheduler = new Scheduler({ AMQP_MANAGER_URL: AMQP_MANAGER_URL, JOB_TOPIC_EXCHANGE: JOB_TOPIC_EXCHANGE });
   let data_To_scheduler = { 
     project_id: project_id, 
     receiver_list: receiver_list, 
@@ -214,6 +214,13 @@ async function startRoute(settings, callback) {
     AMQP_MANAGER_URL = settings.AMQP_MANAGER_URL;
     winston.info("(wab api) AMQP_MANAGER_URL is present");
   }
+
+  if (!settings.JOB_TOPIC_EXCHANGE) {
+    winston.error("(wab api) JOB_TOPIC_EXCHANGE is mandatory (?). Exit...");
+  } else {
+    JOB_TOPIC_EXCHANGE = settings.JOB_TOPIC_EXCHANGE;
+    winston.info("(wab api) JOB_TOPIC_EXCHANGE is present");
+  }
   
 }
 

package/template/detail.html

@@ -220,7 +220,7 @@
         <p>Added Queue Manager for Whatsapp broadcast</p>
         <p>Bug fixes and performance improvements</p>
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.54</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.55</b></p>
     </div>
     
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">

package/tiledesk/Scheduler.js

@@ -13,7 +13,13 @@ class Scheduler {
       throw new Error('config.AMQP_MANAGER_URL is mandatory');
     }
 
+    if (!config.JOB_TOPIC_EXCHANGE) {
+      throw new Error('config.JOB_TOPIC_EXCHANGE is mandatory');
+    }
+
     this.AMQP_MANAGER_URL = config.AMQP_MANAGER_URL;
+    this.JOB_TOPIC_EXCHANGE = config.JOB_TOPIC_EXCHANGE;
+    
     this.log = false;
     if (config.log) {
       this.log = config.log;
@@ -21,8 +27,8 @@ class Scheduler {
 
     jobManager = new JobManager(this.AMQP_MANAGER_URL, {
       debug: false,
-      topic: "tiledesk-whatsapp_test",
-      exchange: "tiledesk-whatsapp_test"
+      topic: this.JOB_TOPIC_EXCHANGE,
+      exchange: this.JOB_TOPIC_EXCHANGE
     });
   }