@autofleet/rabbit 1.0.19 → 1.0.21

package/dist/index.d.ts

@@ -5,6 +5,7 @@ declare class RabbitMq {
     channel: ChannelWrapper | null;
     connection: AmqpConnectionManager | null;
     em: EventEmitter;
+    creatingConnection: Boolean;
     constructor();
     ack: (msg: any) => Promise<void>;
     nack: (queue: string) => (msg: any, retries: number) => Promise<void>;

package/dist/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
+const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
     constructor() {
         this.ack = async (msg) => {
@@ -26,15 +27,24 @@ class RabbitMq {
         this.em = new events_1.EventEmitter;
         this.channel = null;
         this.connection = null;
+        this.creatingConnection = false;
     }
     async getConnection() {
-        if (this.connection !== null) {
-            return this.connection;
-        }
-        let host = process.env.RABBITMQ_SERVICE_HOST || '35.240.13.28';
-        let connection = await amqp_connection_manager_1.connect([`amqp://${host}`]);
-        this.connection = connection;
-        return connection;
+        return new Promise(async (resolve) => {
+            if (this.creatingConnection) {
+                this.em.on(connectionCreatedConst, resolve);
+                return;
+            }
+            if (this.connection !== null) {
+                return this.connection;
+            }
+            let host = process.env.RABBITMQ_SERVICE_HOST || '35.240.13.28';
+            let connection = await amqp_connection_manager_1.connect([`amqp://${host}`]);
+            this.connection = connection;
+            this.creatingConnection = false;
+            this.em.emit(connectionCreatedConst, connection);
+            resolve(connection);
+        });
     }
     async assertChannel() {
         return new Promise(async (resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -2,15 +2,18 @@ import { ConfirmChannel } from 'amqplib';
 import { connect, AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 
+const connectionCreatedConst = 'connectionCreated';
 class RabbitMq {
   channel: ChannelWrapper | null;
   connection: AmqpConnectionManager | null;
   em: EventEmitter;
+  creatingConnection: Boolean;
 
   constructor() {
     this.em = new EventEmitter;
     this.channel = null;
     this.connection = null;
+    this.creatingConnection = false;
   }
 
   public ack = async (msg: any) => {
@@ -34,14 +37,23 @@ class RabbitMq {
   }
 
   async getConnection() {
-    if (this.connection !== null) {
-      return this.connection;
-    }
+    return new Promise<AmqpConnectionManager>(async (resolve) => {
+      if (this.creatingConnection) {
+        this.em.on(connectionCreatedConst, resolve);
+        return;
+      }
 
-    let host: string = process.env.RABBITMQ_SERVICE_HOST || '35.240.13.28';
-    let connection: AmqpConnectionManager = await connect([`amqp://${host}`]);
-    this.connection = connection;
-    return connection;
+      if (this.connection !== null) {
+        return this.connection;
+      }
+  
+      let host: string = process.env.RABBITMQ_SERVICE_HOST || '35.240.13.28';
+      let connection: AmqpConnectionManager = await connect([`amqp://${host}`]);
+      this.connection = connection;
+      this.creatingConnection = false;
+      this.em.emit(connectionCreatedConst, connection);
+      resolve(connection);
+    })
   }
 
   async assertChannel() {