@autofleet/rabbit 3.2.4-beta.0 → 3.2.5

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
+import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
 import { TRACING_HEADER, USER_TRACING_HEADER } from './lib/consts';
@@ -37,6 +37,7 @@ export interface AfRabbitOptions {
 declare type newChannelOpts = {
     name?: string;
     onClose?: null | ((args: any | null) => void);
+    options?: CreateChannelOpts | undefined;
 };
 declare type assertChannelOpts = {
     channelName?: string;
@@ -75,7 +76,7 @@ declare class RabbitMq implements IAfRabbitMq {
     ack: (channel: ConfirmChannel, msg: ConsumeMessageOrNull, shouldUpdateRedisTimestamp?: boolean, releaseLock?: null) => (userMsg: ConsumeMessage) => Promise<any>;
     nack: (channel: ConfirmChannel, queue: string, options: any, deadQueueOptions: Options.AssertQueue, msg: ConsumeMessageOrNull, releaseLock: any) => (userMsg: ConsumeMessageOrNull, { skipRetry, }?: NackOptions) => Promise<any>;
     getConnection(): Promise<AmqpConnectionManager>;
-    getNewChannel({ name, onClose }?: newChannelOpts): Promise<ChannelWrapper>;
+    getNewChannel({ name, onClose, options }?: newChannelOpts): Promise<ChannelWrapper>;
     assertChannel({ force }?: assertChannelOpts): Promise<ChannelWrapper>;
     assertExchange(exchangeName: string, options?: any): Promise<any>;
     getQueueLength(queue: string): Promise<Replies.AssertQueue>;

package/dist/index.js

@@ -183,6 +183,7 @@ class RabbitMq {
                 }
             });
             this.connection.on('connectFailed', (err) => {
+                this.consumersTags = [];
                 logger_1.default.error('rabbit: connection connectFailed', { err });
                 if (!isResolved) {
                     isResolved = true;
@@ -191,6 +192,7 @@ class RabbitMq {
                 }
             });
             this.connection.on('disconnect', ({ err }) => {
+                this.consumersTags = [];
                 debug('rabbit: connection closed');
                 if (this.options?.disableReconnect) {
                     logger_1.default.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
@@ -209,10 +211,12 @@ class RabbitMq {
             });
         });
     }
-    async getNewChannel({ name = utils_1.rand().toString(), onClose = null } = {}) {
+    async getNewChannel({ name = utils_1.rand().toString(), onClose = null, options = {} } = {}) {
         return new Promise(async (resolve, reject) => {
             const connection = await this.getConnection();
-            const channel = connection.createChannel({});
+            const channel = connection.createChannel({
+                ...options,
+            });
             let isResolved = false;
             channel.on('error', (err) => {
                 logger_1.default.error(`rabbit: channel error ${name} error`, { err });
@@ -374,7 +378,7 @@ class RabbitMq {
                     }
                     catch (e) {
                         logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
-                        await this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
+                        return this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
                     }
                 }
                 if (traceId) {
@@ -468,7 +472,21 @@ class RabbitMq {
     }
     async isConnected() {
         const connection = await this.getConnection();
-        return connection.isConnected();
+        const isConnected = connection.isConnected();
+        if (!isConnected) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        const channel = await this.assertChannel();
+        try {
+            await channel.waitForConnect();
+        }
+        catch (e) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        logger_1.default.info('rabbit: isConnected - true');
+        return true;
     }
     async gracefulShutdown(signal) {
         const tagsNumber = this.consumersTags.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.2.4-beta.0",
+  "version": "3.2.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -4,7 +4,9 @@ import { EventEmitter } from 'events';
 import { promisify } from 'util';
 import moment from 'moment';
 import RedisLock from 'redis-lock';
-import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
+import {
+  AmqpConnectionManager, ChannelWrapper, connect, CreateChannelOpts,
+} from 'amqp-connection-manager';
 import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
 } from 'amqplib';
@@ -78,6 +80,7 @@ export interface AfRabbitOptions {
 type newChannelOpts = {
   name?: string;
   onClose?: null | ((args: any | null) => void);
+  options?: CreateChannelOpts | undefined;
 };
 
 type assertChannelOpts = {
@@ -312,6 +315,7 @@ class RabbitMq implements IAfRabbitMq {
       });
 
       this.connection.on('connectFailed', (err) => {
+        this.consumersTags = [];
         logger.error('rabbit: connection connectFailed', { err });
         if (!isResolved) {
           isResolved = true;
@@ -321,6 +325,7 @@ class RabbitMq implements IAfRabbitMq {
       });
 
       this.connection.on('disconnect', ({ err }) => {
+        this.consumersTags = [];
         debug('rabbit: connection closed');
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
@@ -339,10 +344,11 @@ class RabbitMq implements IAfRabbitMq {
     });
   }
 
-  async getNewChannel({ name = rand().toString(), onClose = null }: newChannelOpts = {}) {
+  async getNewChannel({ name = rand().toString(), onClose = null, options = {} }: newChannelOpts = {}) {
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
       const connection: AmqpConnectionManager = await this.getConnection();
       const channel = connection.createChannel({
+        ...options,
       });
 
       let isResolved = false;
@@ -526,7 +532,7 @@ class RabbitMq implements IAfRabbitMq {
               ]);
             } catch (e) {
               logger.error('rabbit: failed to setRabbitTrace', { userId, e });
-              await this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
+              return this.nack(confirmChannel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
             }
           }
 
@@ -647,7 +653,20 @@ class RabbitMq implements IAfRabbitMq {
 
   async isConnected() : Promise<boolean> {
     const connection = await this.getConnection();
-    return connection.isConnected();
+    const isConnected = connection.isConnected();
+    if (!isConnected) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    const channel = await this.assertChannel();
+    try {
+      await channel.waitForConnect();
+    } catch (e) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    logger.info('rabbit: isConnected - true');
+    return true;
   }
 
   async gracefulShutdown(signal: string) : Promise<void> {