@go-mailer/vertebra 1.1.2 → 1.1.4

package/lib/queue/rabbit.js

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

package/package.json

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