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

package/dist/index.js

@@ -120,8 +120,18 @@ class RabbitMq {
         this.channel = null;
         this.publishChannelSetupPromise = null;
         this.connectionsMap = {
-            [consts_1.ConnectionPurpose.Consume]: { connection: null, creatingConnection: false },
-            [consts_1.ConnectionPurpose.Publish]: { connection: null, creatingConnection: false },
+            [consts_1.ConnectionPurpose.Consume]: {
+                connection: null,
+                creatingConnection: false,
+                connectionCreatedEventName: 'consumeConnectionCreated',
+                connectionFailedEventName: 'consumeConnectionFailed',
+            },
+            [consts_1.ConnectionPurpose.Publish]: {
+                connection: null,
+                creatingConnection: false,
+                connectionCreatedEventName: 'publishConnectionCreated',
+                connectionFailedEventName: 'publishConnectionFailed',
+            },
         };
         this.exchanges = {};
         this.queues = {};
@@ -146,7 +156,7 @@ class RabbitMq {
     }
     async getConnection(connectionPurpose) {
         return new Promise(async (resolve, reject) => {
-            const { connection, creatingConnection } = this.connectionsMap[connectionPurpose];
+            const { connection, creatingConnection, connectionCreatedEventName, connectionFailedEventName, } = this.connectionsMap[connectionPurpose];
             if (this.blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -164,8 +174,8 @@ class RabbitMq {
             }
             if (creatingConnection) {
                 debug('rabbit: creating connection emi');
-                this.em.once(consts_1.CONNECTION_CREATED_CONST, resolve);
-                this.em.once(consts_1.CONNECTION_FAILED_CONST, reject);
+                this.em.once(connectionCreatedEventName, resolve);
+                this.em.once(connectionFailedEventName, reject);
                 return;
             }
             this.connectionsMap[connectionPurpose].creatingConnection = true;
@@ -191,7 +201,7 @@ class RabbitMq {
                 if (!isResolved) {
                     isResolved = true;
                     reject(err);
-                    this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
+                    this.em.emit(connectionFailedEventName, err);
                 }
             });
             newConnection.on('connectFailed', (err) => {
@@ -200,7 +210,7 @@ class RabbitMq {
                 if (!isResolved) {
                     isResolved = true;
                     reject(err);
-                    this.em.emit(consts_1.CONNECTION_FAILED_CONST, err);
+                    this.em.emit(connectionFailedEventName, err);
                 }
             });
             newConnection.on('disconnect', ({ err }) => {
@@ -216,7 +226,7 @@ class RabbitMq {
             });
             newConnection.once('connect', async () => {
                 this.connectionsMap[connectionPurpose].creatingConnection = false;
-                this.em.emit(consts_1.CONNECTION_CREATED_CONST, newConnection);
+                this.em.emit(connectionCreatedEventName, newConnection);
                 isResolved = true;
                 resolve(newConnection);
             });
@@ -507,6 +517,7 @@ class RabbitMq {
         });
     }
     async publish(exchange, content, customHeaders) {
+        debug('rabbit: start publish msg');
         return (0, utils_1.wrapSetImmediate)(async () => {
             RabbitMq.validateName('exchange', exchange);
             const channel = await this.assertChannel({ connectionPurpose: consts_1.ConnectionPurpose.Publish });
@@ -541,8 +552,10 @@ 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;
+            debug('rabbit: is connected inside map', { connection, connectionPurpose });
             if (connectionPurpose === consts_1.ConnectionPurpose.Publish && !connection) {
                 return true; // The connection hasn't been initialized yet, as no messages have been sent through it
             }

package/dist/lib/consts.d.ts

@@ -6,8 +6,6 @@ export declare const USER_TRACING_HEADER = "x-af-user-id";
 export declare const AUTOMATION_ID_HEADER = "x-af-automation-id";
 export declare const USER_OBJECT = "userObject";
 export declare const DEFAULT_USE_CONSUME_WITH_LOCK = false;
-export declare const CONNECTION_CREATED_CONST = "connectionCreated";
-export declare const CONNECTION_FAILED_CONST = "connectionFailed";
 export declare const DEFAULT_OPTIONS: {
     limit: number;
     retries: number;

package/dist/lib/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionPurpose = exports.DEFAULT_OPTIONS = exports.CONNECTION_FAILED_CONST = exports.CONNECTION_CREATED_CONST = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.USER_OBJECT = exports.AUTOMATION_ID_HEADER = exports.USER_TRACING_HEADER = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
+exports.ConnectionPurpose = exports.DEFAULT_OPTIONS = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.USER_OBJECT = exports.AUTOMATION_ID_HEADER = exports.USER_TRACING_HEADER = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
 exports.DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 12;
 exports.DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 exports.RETRY_HEADER = 'x-retry-count';
@@ -9,8 +9,6 @@ exports.USER_TRACING_HEADER = 'x-af-user-id';
 exports.AUTOMATION_ID_HEADER = 'x-af-automation-id';
 exports.USER_OBJECT = 'userObject';
 exports.DEFAULT_USE_CONSUME_WITH_LOCK = false;
-exports.CONNECTION_CREATED_CONST = 'connectionCreated';
-exports.CONNECTION_FAILED_CONST = 'connectionFailed';
 exports.DEFAULT_OPTIONS = {
     limit: 1,
     retries: 1,

package/dist/lib/types.d.ts

@@ -45,4 +45,6 @@ export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
 export type ConnectionData = {
     connection: AmqpConnectionManager | null;
     creatingConnection: boolean;
+    connectionCreatedEventName: string;
+    connectionFailedEventName: string;
 };

package/package.json

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

package/src/index.ts

@@ -20,8 +20,6 @@ import getRedisInstance, { RedisConfig } from './lib/redis';
 import { assertExchangeFanout, rand, wrapSetImmediate } from './lib/utils';
 import {
   AUTOMATION_ID_HEADER,
-  CONNECTION_CREATED_CONST,
-  CONNECTION_FAILED_CONST,
   ConnectionPurpose,
   DEFAULT_LOCK_TIMEOUT,
   DEFAULT_OPTIONS,
@@ -183,8 +181,18 @@ class RabbitMq implements IAfRabbitMq {
     this.channel = null;
     this.publishChannelSetupPromise = null;
     this.connectionsMap = {
-      [ConnectionPurpose.Consume]: { connection: null, creatingConnection: false },
-      [ConnectionPurpose.Publish]: { connection: null, creatingConnection: false },
+      [ConnectionPurpose.Consume]: {
+        connection: null,
+        creatingConnection: false,
+        connectionCreatedEventName: 'consumeConnectionCreated',
+        connectionFailedEventName: 'consumeConnectionFailed',
+      },
+      [ConnectionPurpose.Publish]: {
+        connection: null,
+        creatingConnection: false,
+        connectionCreatedEventName: 'publishConnectionCreated',
+        connectionFailedEventName: 'publishConnectionFailed',
+      },
     };
     this.exchanges = {};
     this.queues = {};
@@ -285,7 +293,12 @@ class RabbitMq implements IAfRabbitMq {
 
   async getConnection(connectionPurpose: ConnectionPurpose) {
     return new Promise<AmqpConnectionManager | undefined | null>(async (resolve, reject) => {
-      const { connection, creatingConnection } = this.connectionsMap[connectionPurpose];
+      const {
+        connection,
+        creatingConnection,
+        connectionCreatedEventName,
+        connectionFailedEventName,
+      } = this.connectionsMap[connectionPurpose];
       if (this.blockReconnect) {
         debug('rabbit: block reconnect');
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -303,8 +316,8 @@ class RabbitMq implements IAfRabbitMq {
       }
       if (creatingConnection) {
         debug('rabbit: creating connection emi');
-        this.em.once(CONNECTION_CREATED_CONST, resolve);
-        this.em.once(CONNECTION_FAILED_CONST, reject);
+        this.em.once(connectionCreatedEventName, resolve);
+        this.em.once(connectionFailedEventName, reject);
         return;
       }
       this.connectionsMap[connectionPurpose].creatingConnection = true;
@@ -336,7 +349,7 @@ class RabbitMq implements IAfRabbitMq {
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(CONNECTION_FAILED_CONST, err);
+          this.em.emit(connectionFailedEventName, err);
         }
       });
 
@@ -346,7 +359,7 @@ class RabbitMq implements IAfRabbitMq {
         if (!isResolved) {
           isResolved = true;
           reject(err);
-          this.em.emit(CONNECTION_FAILED_CONST, err);
+          this.em.emit(connectionFailedEventName, err);
         }
       });
 
@@ -362,7 +375,7 @@ class RabbitMq implements IAfRabbitMq {
       });
       newConnection.once('connect', async () => {
         this.connectionsMap[connectionPurpose].creatingConnection = false;
-        this.em.emit(CONNECTION_CREATED_CONST, newConnection);
+        this.em.emit(connectionCreatedEventName, newConnection);
         isResolved = true;
         resolve(newConnection);
       });
@@ -698,6 +711,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async publish(exchange: string, content: any, customHeaders?: any): Promise<boolean> {
+    debug('rabbit: start publish msg');
     return wrapSetImmediate(async () => {
       RabbitMq.validateName('exchange', exchange);
       const channel: ChannelWrapper = await this.assertChannel({ connectionPurpose: ConnectionPurpose.Publish });
@@ -742,9 +756,11 @@ 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;
+        debug('rabbit: is connected inside map', { connection, connectionPurpose });
         if (connectionPurpose === ConnectionPurpose.Publish && !connection) {
           return true; // The connection hasn't been initialized yet, as no messages have been sent through it
         }

package/src/lib/consts.ts

@@ -6,8 +6,6 @@ export const USER_TRACING_HEADER = 'x-af-user-id';
 export const AUTOMATION_ID_HEADER = 'x-af-automation-id';
 export const USER_OBJECT = 'userObject';
 export const DEFAULT_USE_CONSUME_WITH_LOCK = false;
-export const CONNECTION_CREATED_CONST = 'connectionCreated';
-export const CONNECTION_FAILED_CONST = 'connectionFailed';
 export const DEFAULT_OPTIONS = {
   limit: 1,
   retries: 1,

package/src/lib/types.ts

@@ -64,4 +64,6 @@ export const CONSUMER_DEFAULT_OPTIONS: Options.Consume = {
 export type ConnectionData = {
   connection: AmqpConnectionManager | null;
   creatingConnection: boolean;
+  connectionCreatedEventName: string;
+  connectionFailedEventName: string;
 };