@go-mailer/vertebra 2.0.2 → 3.0.0

package/lib/queue/rabbit.js

@@ -1,39 +1,58 @@
 const rabbit = require("amqplib");
 
+class Connector {
+  constructor() {
+    this.channel = null;
+    this.is_connecting = false;
+  }
+
+  async connect(url) {
+    if (this.channel) return this.channel;
+    if (this.is_connecting) return;
+
+    this.is_connecting = true;
+    const conn = await rabbit.connect(url);
+    conn.on("error", async (error) => {
+      throw new Error(error.message);
+    });
+
+    this.channel = await conn.createChannel();
+    this.is_connecting = false;
+    return this.channel;
+  }
+}
+
 class Broker {
-  constructor({ host = "localhost", user = "guest", passwd = "guest", port = 5672, onConnect = () => {}}) {
-    this.url = `amqp://${user}:${passwd}@${host}:${port}`;
+  constructor() {
     this.channel = null;
-    this.onConnect = onConnect;
+    this.connector = null;
   }
 
   getChannel() {
     return this.channel;
   }
 
-  async connect() {
+  async connect(config = { host, user, passwd, port, onConnect }) {
     try {
-      const conn = await rabbit.connect(this.url);
-      conn.on("error", async (error) => {
-        throw new Error(error.message)
-      });
-
-      this.channel = await conn.createChannel();
-      this.onConnect(this);
+      const { host = "localhost", user = "guest", passwd = "guest", port = 5672, onConnect = () => {} } = config;
+      const url = `amqp://${user}:${passwd}@${host}:${port}`;
+      this.channel = await this.connector.connect(url);
+      onConnect(this);
     } catch (e) {
-      console.log(`RabbitMQ connect(): ${e.message}`);
-      setTimeout(this.connect.bind(this), 5000);
+      console.log(`RabbitMQ connection Error(): ${e.message}`);
+      setTimeout(this.connect.bind(this, config), 5000);
     }
   }
 
-  async acknowledge(message = null) {
+  async acknowledge(message = null, retries = 0) {
+    if (retries > 10) return;
     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.connect()
+      this.acknowledge(message, retries + 1);
     }
   }
 
@@ -44,21 +63,22 @@ class Broker {
       else this.channel.nackAll();
     } catch (e) {
       console.log(`RabbitMQ requeue(): ${e.message}`);
-      this.connect()
     }
   }
 
-  async recover() {
+  async recover(retries = 0) {
+    if (retries > 10) return;
     try {
       if (!this.channel) await this.connect();
       await this.channel.recover();
     } catch (e) {
       console.log(`RabbitMQ recover(): ${e.message}`);
-      this.connect()
+      this.recover(retries + 1);
     }
   }
 
-  async publish(queue_name, message = {}) {
+  async publish(queue_name, message = {}, retries = 0) {
+    if (retries > 10) return;
     try {
       if (!this.channel) await this.connect();
       this.channel.assertQueue(queue_name, {
@@ -69,20 +89,26 @@ class Broker {
       });
     } catch (e) {
       console.log(`RabbitMQ publish(): ${e.message}`);
-      this.connect()
+      this.publish(queue_name, message, retries + 1);
     }
   }
 
+  setConnector(connector) {
+    this.connector = connector;
+  }
+
   async subscribe(queue_name, handler = console.log) {
     try {
-      if (!this.channel) await this.connect();
+      if (!this.channel) return;
       this.channel.assertQueue(queue_name, {});
       this.channel.consume(queue_name, handler);
     } catch (e) {
       console.log(`RabbitMQ subscribe(): ${e.message}`);
-      this.connect()
     }
   }
 }
 
-module.exports = Broker;
+const RMQConnector = new Connector();
+const broker = new Broker();
+broker.setConnector(RMQConnector);
+module.exports = broker;

package/package.json

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