@autofleet/rabbit 3.3.0-beta.2 → 3.3.0-beta.4

package/dist/index.d.ts

@@ -62,7 +62,6 @@ declare class RabbitMq implements IAfRabbitMq {
     RECONNECT_MSG: string;
     publishChannel: ChannelWrapper | null;
     publishChannelSetupPromise: Promise<ChannelWrapper> | null;
-    blockReconnect: boolean | null | undefined;
     connectionsMap: {
         [ConnectionPurpose.Consume]: ConnectionData;
         [ConnectionPurpose.Publish]: ConnectionData;

package/dist/index.js

@@ -125,12 +125,14 @@ class RabbitMq {
                 creatingConnection: false,
                 connectionCreatedEventName: 'consumeConnectionCreated',
                 connectionFailedEventName: 'consumeConnectionFailed',
+                blockReconnect: false,
             },
             [consts_1.ConnectionPurpose.Publish]: {
                 connection: null,
                 creatingConnection: false,
                 connectionCreatedEventName: 'publishConnectionCreated',
                 connectionFailedEventName: 'publishConnectionFailed',
+                blockReconnect: false,
             },
         };
         this.exchanges = {};
@@ -156,8 +158,8 @@ class RabbitMq {
     }
     async getConnection(connectionPurpose) {
         return new Promise(async (resolve, reject) => {
-            const { connection, creatingConnection, connectionCreatedEventName, connectionFailedEventName, } = this.connectionsMap[connectionPurpose];
-            if (this.blockReconnect) {
+            const { connection, creatingConnection, connectionCreatedEventName, connectionFailedEventName, blockReconnect, } = this.connectionsMap[connectionPurpose];
+            if (blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-ignore
@@ -218,7 +220,7 @@ class RabbitMq {
                 debug('rabbit: connection closed');
                 if (this.options?.disableReconnect) {
                     logger_1.default.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-                    this.blockReconnect = true;
+                    this.connectionsMap[connectionPurpose].blockReconnect = true;
                 }
                 else {
                     logger_1.default.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
@@ -556,14 +558,13 @@ class RabbitMq {
     }
     async isConnected() {
         debug('rabbit: start is connected');
-        const isEachConnectionConnected = await Promise.all(Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-            const { connection } = connectionData;
+        const isEachConnectionConnected = await Promise.all(Object.keys(this.connectionsMap).map(async (connectionPurpose) => {
+            const connection = await this.getConnection(connectionPurpose);
             const isConnected = connection?.isConnected();
             if (!isConnected) {
                 logger_1.default.error('rabbit: isConnected - false', { connectionPurpose });
                 return false;
             }
-            logger_1.default.info('rabbit: isConnected - true', { connectionPurpose });
             if (connectionPurpose === consts_1.ConnectionPurpose.Publish) {
                 const channel = await this.assertChannel({ connectionPurpose: connectionPurpose });
                 try {
@@ -577,6 +578,7 @@ class RabbitMq {
                     return false;
                 }
             }
+            logger_1.default.info('rabbit: isConnected - true', { connectionPurpose });
             return true;
         }));
         return isEachConnectionConnected.every((isConnected) => isConnected === true);

package/dist/lib/types.d.ts

@@ -47,4 +47,5 @@ export type ConnectionData = {
     creatingConnection: boolean;
     connectionCreatedEventName: string;
     connectionFailedEventName: string;
+    blockReconnect: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.3.0-beta.2",
+  "version": "3.3.0-beta.4",
   "description": "",
   "main": "dist/index.js",
   "engines": {

package/src/index.ts

@@ -148,8 +148,6 @@ class RabbitMq implements IAfRabbitMq {
 
   publishChannelSetupPromise: Promise<ChannelWrapper> | null;
 
-  blockReconnect: boolean | null | undefined;
-
   connectionsMap: {
     [ConnectionPurpose.Consume]: ConnectionData;
     [ConnectionPurpose.Publish]: ConnectionData;
@@ -186,12 +184,14 @@ class RabbitMq implements IAfRabbitMq {
         creatingConnection: false,
         connectionCreatedEventName: 'consumeConnectionCreated',
         connectionFailedEventName: 'consumeConnectionFailed',
+        blockReconnect: false,
       },
       [ConnectionPurpose.Publish]: {
         connection: null,
         creatingConnection: false,
         connectionCreatedEventName: 'publishConnectionCreated',
         connectionFailedEventName: 'publishConnectionFailed',
+        blockReconnect: false,
       },
     };
     this.exchanges = {};
@@ -298,8 +298,10 @@ class RabbitMq implements IAfRabbitMq {
         creatingConnection,
         connectionCreatedEventName,
         connectionFailedEventName,
+        blockReconnect,
       } = this.connectionsMap[connectionPurpose];
-      if (this.blockReconnect) {
+
+      if (blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
@@ -368,7 +370,7 @@ class RabbitMq implements IAfRabbitMq {
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
-          this.blockReconnect = true;
+          this.connectionsMap[connectionPurpose].blockReconnect = true;
         } else {
           logger.error(`${this.RECONNECT_MSG}${err && ` - ${err}`}`);
         }
@@ -761,14 +763,13 @@ class RabbitMq implements IAfRabbitMq {
   async isConnected(): Promise<boolean> {
     debug('rabbit: start is connected');
     const isEachConnectionConnected = await Promise.all(
-      Object.entries(this.connectionsMap).map(async ([connectionPurpose, connectionData]) => {
-        const { connection } = connectionData;
+      Object.keys(this.connectionsMap).map(async (connectionPurpose) => {
+        const connection = await this.getConnection(connectionPurpose as ConnectionPurpose);
         const isConnected = connection?.isConnected();
         if (!isConnected) {
           logger.error('rabbit: isConnected - false', { connectionPurpose });
           return false;
         }
-        logger.info('rabbit: isConnected - true', { connectionPurpose });
 
         if (connectionPurpose === ConnectionPurpose.Publish) {
           const channel: any = await this.assertChannel({ connectionPurpose: connectionPurpose as ConnectionPurpose });
@@ -782,7 +783,7 @@ class RabbitMq implements IAfRabbitMq {
             return false;
           }
         }
-
+        logger.info('rabbit: isConnected - true', { connectionPurpose });
         return true;
       }),
     );

package/src/lib/types.ts

@@ -66,4 +66,5 @@ export type ConnectionData = {
   creatingConnection: boolean;
   connectionCreatedEventName: string;
   connectionFailedEventName: string;
+  blockReconnect: boolean;
 };