@autofleet/rabbit 3.2.19-beta.7 → 3.2.19-beta.8

package/dist/index.js

@@ -147,7 +147,7 @@ class RabbitMq {
     }
     async getConnection(connectionRole) {
         return new Promise(async (resolve, reject) => {
-            let { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
+            const { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
             if (this.blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -169,7 +169,12 @@ class RabbitMq {
                 this.em.once(consts_1.CONNECTION_FAILED_CONST, reject);
                 return;
             }
-            creatingConnectionByRole = true;
+            if (connectionRole === types_1.ConnectionRole.Consumer) {
+                this.creatingConsumeConnection = true;
+            }
+            else {
+                this.creatingPublishConnection = true;
+            }
             let isResolved = false;
             // It is import to use it as a function and not as a variable
             // because of k8s changes the env variables
@@ -189,8 +194,13 @@ class RabbitMq {
                 logger_1.default.error('rabbit: couldnt create a connection');
                 return resolve(connectionByRole);
             }
-            connectionByRole = newConnection;
-            connectionByRole.on('error', (err) => {
+            if (connectionRole === types_1.ConnectionRole.Consumer) {
+                this.consumeConnection = newConnection;
+            }
+            else {
+                this.publishConnection = newConnection;
+            }
+            newConnection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {
                     isResolved = true;
@@ -198,7 +208,7 @@ class RabbitMq {
                     this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            connectionByRole.on('connectFailed', (err) => {
+            newConnection.on('connectFailed', (err) => {
                 this.consumersTags = [];
                 logger_1.default.error('rabbit: connection connectFailed', { err });
                 if (!isResolved) {
@@ -207,7 +217,7 @@ class RabbitMq {
                     this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
                 }
             });
-            connectionByRole.on('disconnect', ({ err }) => {
+            newConnection.on('disconnect', ({ err }) => {
                 this.consumersTags = [];
                 debug('rabbit: connection closed');
                 if (this.options?.disableReconnect) {
@@ -218,12 +228,17 @@ class RabbitMq {
                     logger_1.default.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
                 }
             });
-            connectionByRole.once('connect', async () => {
+            newConnection.once('connect', async () => {
                 debug('rabbit: connection established');
-                creatingConnectionByRole = false;
-                this.em.emit(consts_1.CONNECTION_CREATED_CONST, connectionByRole);
+                if (connectionRole === types_1.ConnectionRole.Consumer) {
+                    this.creatingConsumeConnection = false;
+                }
+                else {
+                    this.creatingPublishConnection = false;
+                }
+                this.em.emit(consts_1.CONNECTION_CREATED_CONST, newConnection);
                 isResolved = true;
-                resolve(connectionByRole);
+                resolve(newConnection);
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.19-beta.7",
+  "version": "3.2.19-beta.8",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -284,7 +284,7 @@ class RabbitMq implements IAfRabbitMq {
 
   async getConnection(connectionRole: ConnectionRole) {
     return new Promise<AmqpConnectionManager | undefined | null>(async (resolve, reject) => {
-      let { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
+      const { connectionByRole, creatingConnectionByRole } = this.geConnectionByRole(connectionRole);
       if (this.blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -306,7 +306,12 @@ class RabbitMq implements IAfRabbitMq {
         this.em.once(CONNECTION_FAILED_CONST, reject);
         return;
       }
-      creatingConnectionByRole = true;
+      if (connectionRole === ConnectionRole.Consumer) {
+        this.creatingConsumeConnection = true;
+      } else {
+        this.creatingPublishConnection = true;
+      }
+
       let isResolved = false;
 
       // It is import to use it as a function and not as a variable
@@ -332,9 +337,13 @@ class RabbitMq implements IAfRabbitMq {
         return resolve(connectionByRole);
       }
 
-      connectionByRole = newConnection;
+      if (connectionRole === ConnectionRole.Consumer) {
+        this.consumeConnection = newConnection;
+      } else {
+        this.publishConnection = newConnection;
+      }
 
-      connectionByRole.on('error', (err) => {
+      newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
           isResolved = true;
@@ -343,7 +352,7 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      connectionByRole.on('connectFailed', (err) => {
+      newConnection.on('connectFailed', (err) => {
         this.consumersTags = [];
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
@@ -353,7 +362,7 @@ class RabbitMq implements IAfRabbitMq {
         }
       });
 
-      connectionByRole.on('disconnect', ({ err }) => {
+      newConnection.on('disconnect', ({ err }) => {
         this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
@@ -363,12 +372,16 @@ class RabbitMq implements IAfRabbitMq {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
       });
-      connectionByRole.once('connect', async () => {
+      newConnection.once('connect', async () => {
         debug('rabbit: connection established');
-        creatingConnectionByRole = false;
-        this.em.emit(CONNECTION_CREATED_CONST, connectionByRole);
+        if (connectionRole === ConnectionRole.Consumer) {
+          this.creatingConsumeConnection = false;
+        } else {
+          this.creatingPublishConnection = false;
+        }
+        this.em.emit(CONNECTION_CREATED_CONST, newConnection);
         isResolved = true;
-        resolve(connectionByRole);
+        resolve(newConnection);
       });
     });
   }