@autofleet/rabbit 3.4.0-beta.17 → 3.4.0-beta.18

package/dist/index.js

@@ -168,14 +168,14 @@ class RabbitMq {
         this.publishChannelSetupPromise = null;
         this.connection = null;
         this.publishConnection = {
-            connection: null,
+            amqpConnection: null,
             creatingConnection: false,
             connectionCreatedEventName: 'publishConnectionCreated',
             connectionFailedEventName: 'publishConnectionFailed',
             blockReconnect: false,
         };
         this.consumeConnection = {
-            connection: null,
+            amqpConnection: null,
             creatingConnection: false,
             connectionCreatedEventName: 'consumeConnectionCreated',
             connectionFailedEventName: 'consumeConnectionFailed',
@@ -207,14 +207,14 @@ class RabbitMq {
         this.oldPublishChannel = null;
         this.oldPublishChannelSetupPromise = null;
         this.oldPublishConnection = {
-            connection: null,
+            amqpConnection: null,
             creatingConnection: false,
             connectionCreatedEventName: 'oldPublishConnectionCreated',
             connectionFailedEventName: 'oldPublishConnectionFailed',
             blockReconnect: false,
         };
         this.oldConsumeConnection = {
-            connection: null,
+            amqpConnection: null,
             creatingConnection: false,
             connectionCreatedEventName: 'oldConsumeConnectionCreated',
             connectionFailedEventName: 'oldConsumeConnectionFailed',
@@ -230,7 +230,7 @@ class RabbitMq {
     }
     async getConnection(connection) {
         return new Promise(async (resolve, reject) => {
-            const { connection: connectionLocal, creatingConnection, connectionCreatedEventName, connectionFailedEventName, blockReconnect, } = connection;
+            const { amqpConnection: connectionLocal, creatingConnection, connectionCreatedEventName, connectionFailedEventName, blockReconnect, } = connection;
             if (blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -268,7 +268,7 @@ class RabbitMq {
             const newConnection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
                 findServers,
             });
-            connection.connection = newConnection;
+            connection.amqpConnection = newConnection;
             newConnection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {
@@ -374,7 +374,7 @@ class RabbitMq {
         if (!channel) {
             throw new rabbitError_1.default('channel is not defined');
         }
-        debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+        debug('rabbit: getting queue length', { queue, connected: this.oldPublishConnection.amqpConnection?.isConnected() });
         return channel?.checkQueue(queue);
     }
     async deleteQueue(queue, connection) {
@@ -669,7 +669,6 @@ class RabbitMq {
     }
     // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
     async isConnected() {
-        // TODO: OLD IMPLEMENTATION
         debug('rabbit: start old is connected');
         const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
         const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
@@ -690,27 +689,6 @@ class RabbitMq {
             return false;
         }
         logger_1.default.debug('rabbit: old isConnected - true');
-        // TODO: NEW IMPLEMENTATION
-        debug('rabbit: start is connected');
-        const consumeConnection = await this.getConnection(this.consumeConnection);
-        const publishConnection = await this.getConnection(this.publishConnection);
-        const isConnected = consumeConnection.isConnected() && publishConnection.isConnected();
-        if (!isConnected) {
-            logger_1.default.error('rabbit: isConnected - false');
-            return false;
-        }
-        const channel = await this.assertChannel({ connection: this.publishConnection });
-        try {
-            await Promise.all([
-                channel.waitForConnect(),
-                ...this.consumers.map((c) => channel.checkQueue(c.queue)),
-            ]);
-        }
-        catch (e) {
-            logger_1.default.error('rabbit: isConnected - false');
-            return false;
-        }
-        logger_1.default.debug('rabbit: isConnected - true');
         return true;
     }
     async gracefulShutdown(signal) {
@@ -851,7 +829,7 @@ class RabbitMq {
     }
     async getConnectionOld(connection) {
         return new Promise(async (resolve, reject) => {
-            const { connection: connectionLocal, creatingConnection, connectionCreatedEventName, connectionFailedEventName, blockReconnect, } = connection;
+            const { amqpConnection: connectionLocal, creatingConnection, connectionCreatedEventName, connectionFailedEventName, blockReconnect, } = connection;
             if (blockReconnect) {
                 debug('rabbit: block reconnect');
                 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -889,7 +867,7 @@ class RabbitMq {
             const newConnection = await (0, amqp_connection_manager_1.connect)(defaultUrls, {
                 findServers,
             });
-            connection.connection = newConnection;
+            connection.amqpConnection = newConnection;
             newConnection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
                 if (!isResolved) {

package/dist/lib/types.d.ts

@@ -44,7 +44,7 @@ export type AfConsumer = {
 };
 export declare const CONSUMER_DEFAULT_OPTIONS: Options.Consume;
 export type ConnectionData = {
-    connection: AmqpConnectionManager | null;
+    amqpConnection: AmqpConnectionManager | null;
     creatingConnection: boolean;
     connectionCreatedEventName: string;
     connectionFailedEventName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.4.0-beta.17",
+  "version": "3.4.0-beta.18",
   "description": "",
   "main": "dist/index.js",
   "engines": {

package/src/index.ts

@@ -215,14 +215,14 @@ class RabbitMq implements IAfRabbitMq {
     this.publishChannelSetupPromise = null;
     this.connection = null;
     this.publishConnection = {
-      connection: null,
+      amqpConnection: null,
       creatingConnection: false,
       connectionCreatedEventName: 'publishConnectionCreated',
       connectionFailedEventName: 'publishConnectionFailed',
       blockReconnect: false,
     };
     this.consumeConnection = {
-      connection: null,
+      amqpConnection: null,
       creatingConnection: false,
       connectionCreatedEventName: 'consumeConnectionCreated',
       connectionFailedEventName: 'consumeConnectionFailed',
@@ -256,14 +256,14 @@ class RabbitMq implements IAfRabbitMq {
     this.oldPublishChannel = null;
     this.oldPublishChannelSetupPromise = null;
     this.oldPublishConnection = {
-      connection: null,
+      amqpConnection: null,
       creatingConnection: false,
       connectionCreatedEventName: 'oldPublishConnectionCreated',
       connectionFailedEventName: 'oldPublishConnectionFailed',
       blockReconnect: false,
     };
     this.oldConsumeConnection = {
-      connection: null,
+      amqpConnection: null,
       creatingConnection: false,
       connectionCreatedEventName: 'oldConsumeConnectionCreated',
       connectionFailedEventName: 'oldConsumeConnectionFailed',
@@ -409,7 +409,7 @@ class RabbitMq implements IAfRabbitMq {
   async getConnection(connection: ConnectionData) {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
       const {
-        connection: connectionLocal,
+        amqpConnection: connectionLocal,
         creatingConnection,
         connectionCreatedEventName,
         connectionFailedEventName,
@@ -457,7 +457,7 @@ class RabbitMq implements IAfRabbitMq {
         findServers,
       });
 
-      connection.connection = newConnection;
+      connection.amqpConnection = newConnection;
       newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {
@@ -572,7 +572,7 @@ class RabbitMq implements IAfRabbitMq {
     if (!channel) {
       throw new RabbitError('channel is not defined');
     }
-    debug('rabbit: getting queue length', { queue, connected: this.connection?.isConnected() });
+    debug('rabbit: getting queue length', { queue, connected: this.oldPublishConnection.amqpConnection?.isConnected() });
     return channel?.checkQueue(queue);
   }
 
@@ -922,8 +922,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
-  async isConnected() : Promise<boolean> {
-    // TODO: OLD IMPLEMENTATION
+  async isConnected(): Promise<boolean> {
     debug('rabbit: start old is connected');
     const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
     const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
@@ -943,27 +942,6 @@ class RabbitMq implements IAfRabbitMq {
       return false;
     }
     logger.debug('rabbit: old isConnected - true');
-
-    // TODO: NEW IMPLEMENTATION
-    debug('rabbit: start is connected');
-    const consumeConnection = await this.getConnection(this.consumeConnection);
-    const publishConnection = await this.getConnection(this.publishConnection);
-    const isConnected = consumeConnection.isConnected() && publishConnection.isConnected();
-    if (!isConnected) {
-      logger.error('rabbit: isConnected - false');
-      return false;
-    }
-    const channel: any = await this.assertChannel({ connection: this.publishConnection });
-    try {
-      await Promise.all([
-        channel.waitForConnect(),
-        ...this.consumers.map((c: AfConsumer) => channel.checkQueue(c.queue)),
-      ]);
-    } catch (e) {
-      logger.error('rabbit: isConnected - false');
-      return false;
-    }
-    logger.debug('rabbit: isConnected - true');
     return true;
   }
 
@@ -1123,7 +1101,7 @@ class RabbitMq implements IAfRabbitMq {
   async getConnectionOld(connection: ConnectionData) {
     return new Promise<AmqpConnectionManager>(async (resolve, reject) => {
       const {
-        connection: connectionLocal,
+        amqpConnection: connectionLocal,
         creatingConnection,
         connectionCreatedEventName,
         connectionFailedEventName,
@@ -1172,7 +1150,7 @@ class RabbitMq implements IAfRabbitMq {
         findServers,
       });
 
-      connection.connection = newConnection;
+      connection.amqpConnection = newConnection;
       newConnection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
         if (!isResolved) {

package/src/lib/types.ts

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