@go-mailer/vertebra 3.0.0 → 3.1.0

package/lib/constants/queues.js

@@ -18,6 +18,7 @@ module.exports = {
   CAMPAIGNS_TO_PROCESS: "campaigns_to_process",
   TRANSACTIONAL_SENT: "transactional_sent",
   PAUSED_CAMPAIGNS: 'paused_campaigns',
+  BOUNCED_EMAILS: 'emails_that_bounced',
 
   NOTIFICATION: "new_notification",
 

package/lib/queue/rabbit.js

@@ -1,24 +1,25 @@
 const rabbit = require("amqplib");
+const EventEmitter = require("events");
 
-class Connector {
-  constructor() {
-    this.channel = null;
-    this.is_connecting = false;
-  }
+class AppEvent extends EventEmitter {}
+const appEvent = new AppEvent();
+const CHANNEL_CLOSED = "channel:closed";
+const CHANNEL_OPENED = "channel:opened";
 
-  async connect(url) {
-    if (this.channel) return this.channel;
-    if (this.is_connecting) return;
+const delay = async (seconds = 1) => {
+  return await new Promise((resolve, __) => {
+    setTimeout(() => resolve(), seconds * 1000);
+  });
+};
 
-    this.is_connecting = true;
+class Connector {
+  async connect(url) {
     const conn = await rabbit.connect(url);
-    conn.on("error", async (error) => {
-      throw new Error(error.message);
-    });
+    const ch = await conn.createChannel();
+    appEvent.emit(CHANNEL_OPENED, ch);
 
-    this.channel = await conn.createChannel();
-    this.is_connecting = false;
-    return this.channel;
+    ch.on("close", () => appEvent.emit(CHANNEL_CLOSED));
+    ch.on("error", () => appEvent.emit(CHANNEL_CLOSED));
   }
 }
 
@@ -26,6 +27,7 @@ class Broker {
   constructor() {
     this.channel = null;
     this.connector = null;
+    this.connection_config = null;
   }
 
   getChannel() {
@@ -34,31 +36,44 @@ class Broker {
 
   async connect(config = { host, user, passwd, port, onConnect }) {
     try {
-      const { host = "localhost", user = "guest", passwd = "guest", port = 5672, onConnect = () => {} } = config;
+      if (config) this.connection_config = config;
+      const {
+        host = "localhost",
+        user = "guest",
+        passwd = "guest",
+        port = 5672,
+        onConnect = () => {},
+      } = this.connection_config;
       const url = `amqp://${user}:${passwd}@${host}:${port}`;
-      this.channel = await this.connector.connect(url);
-      onConnect(this);
+
+      appEvent.once(CHANNEL_OPENED, (ch) => {
+        this.channel = ch;
+        onConnect(this);
+      });
+
+      appEvent.once(CHANNEL_CLOSED, () => {
+        this.channel = null;
+      });
+
+      await this.connector.connect(url);
     } catch (e) {
       console.log(`RabbitMQ connection Error(): ${e.message}`);
-      setTimeout(this.connect.bind(this, config), 5000);
+      await delay(5);
+      this.connect();
     }
   }
 
-  async acknowledge(message = null, retries = 0) {
-    if (retries > 10) return;
+  async acknowledge(message = null) {
     try {
-      if (!this.channel) await this.connect();
       if (message) this.channel.ack(message);
       else this.channel.ackAll();
     } catch (e) {
       console.log(`RabbitMQ acknowledge(): ${e.message}`);
-      this.acknowledge(message, retries + 1);
     }
   }
 
   async requeue(message = null) {
     try {
-      if (!this.channel) await this.connect();
       if (message) this.channel.nack(message);
       else this.channel.nackAll();
     } catch (e) {
@@ -66,21 +81,16 @@ class Broker {
     }
   }
 
-  async recover(retries = 0) {
-    if (retries > 10) return;
+  async recover(queue_name) {
     try {
-      if (!this.channel) await this.connect();
-      await this.channel.recover();
+      await this.channel.recover(queue_name);
     } catch (e) {
       console.log(`RabbitMQ recover(): ${e.message}`);
-      this.recover(retries + 1);
     }
   }
 
-  async publish(queue_name, message = {}, retries = 0) {
-    if (retries > 10) return;
+  async publish(queue_name, message = {}) {
     try {
-      if (!this.channel) await this.connect();
       this.channel.assertQueue(queue_name, {
         durable: true,
       });
@@ -89,7 +99,6 @@ class Broker {
       });
     } catch (e) {
       console.log(`RabbitMQ publish(): ${e.message}`);
-      this.publish(queue_name, message, retries + 1);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-mailer/vertebra",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Go-Mailer vertebra",
   "main": "index.js",
   "scripts": {