@go-mailer/vertebra 1.1.6 → 2.0.1

package/lib/queue/_manager.js

@@ -28,6 +28,10 @@ class QueueManager {
       max_size
     })
   }
+
+  size (queue_name) {
+    return this.queues.get(queue_name).current_size
+  }
 }
 
 module.exports = new QueueManager()

package/lib/queue/rabbit.js

@@ -1,64 +1,87 @@
 const rabbit = require("amqplib");
 
 class Broker {
-  constructor({ host = "localhost", user = "guest", passwd = "guest", port = 5672, onConnect = () => {} }) {
+  constructor({ host = "localhost", user = "guest", passwd = "guest", port = 5672, onConnect = () => {}}) {
     this.url = `amqp://${user}:${passwd}@${host}:${port}`;
     this.channel = null;
-    this.retries = 0;
+    this.onConnect = onConnect;
   }
 
   getChannel() {
     return this.channel;
   }
 
-  async connect({ onConnect = () => {}, onError = () => {} }) {
+  async connect() {
     try {
       const conn = await rabbit.connect(this.url);
       conn.on("error", async (error) => {
-        onError(error);
+        throw new Error(error.message)
       });
 
       this.channel = await conn.createChannel();
-      this.retries = 0;
-      onConnect(this);
+      this.onConnect(this);
     } catch (e) {
       console.log(`RabbitMQ connect(): ${e.message}`);
-      setTimeout(this.connect.bind(this), this.retries * 1000);
-      this.retries += 1;
+      setTimeout(this.connect.call(this), 5000);
     }
   }
 
   async acknowledge(message = null) {
-    if (!this.channel) await this.connect();
-    if (message) this.channel.ack(message);
-    else this.channel.ackAll();
+    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()
+    }
   }
 
   async requeue(message = null) {
-    if (!this.channel) await this.connect();
-    if (message) this.channel.nack(message);
-    else this.channel.nackAll();
+    try {
+      if (!this.channel) await this.connect();
+      if (message) this.channel.nack(message);
+      else this.channel.nackAll();
+    } catch (e) {
+      console.log(`RabbitMQ requeue(): ${e.message}`);
+      this.connect()
+    }
   }
 
   async recover() {
-    if (!this.channel) await this.connect();
-    await this.channel.recover();
+    try {
+      if (!this.channel) await this.connect();
+      await this.channel.recover();
+    } catch (e) {
+      console.log(`RabbitMQ recover(): ${e.message}`);
+      this.connect()
+    }
   }
 
   async publish(queue_name, message = {}) {
-    if (!this.channel) await this.connect();
-    this.channel.assertQueue(queue_name, {
-      durable: true,
-    });
-    this.channel.sendToQueue(queue_name, Buffer.from(message), {
-      persistent: true,
-    });
+    try {
+      if (!this.channel) await this.connect();
+      this.channel.assertQueue(queue_name, {
+        durable: true,
+      });
+      this.channel.sendToQueue(queue_name, Buffer.from(message), {
+        persistent: true,
+      });
+    } catch (e) {
+      console.log(`RabbitMQ publish(): ${e.message}`);
+      this.connect()
+    }
   }
 
   async subscribe(queue_name, handler = console.log) {
-    if (!this.channel) await this.connect();
-    this.channel.assertQueue(queue_name, {});
-    this.channel.consume(queue_name, handler);
+    try {
+      if (!this.channel) await this.connect();
+      this.channel.assertQueue(queue_name, {});
+      this.channel.consume(queue_name, handler);
+    } catch (e) {
+      console.log(`RabbitMQ subscribe(): ${e.message}`);
+      this.connect()
+    }
   }
 }
 

package/package.json

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