@autofleet/rabbit 3.1.2 → 3.2.0

package/dist/index.d.ts

@@ -29,6 +29,7 @@ export interface AfRabbitOptions {
      * @default false
      */
     dontRetryAssert?: boolean;
+    rabbitHost?: string;
 }
 declare type newChannelOpts = {
     name?: string;
@@ -43,6 +44,7 @@ declare class RabbitMq implements IAfRabbitMq {
     static validateName(type: string, name: string): void;
     static getPublishOptions(customHeaders?: CustomMessageHeaders): {
         timestamp: number;
+        timeout: number;
         headers: {
             "x-af-user-id": any;
             "x-trace-id": any;
@@ -62,6 +64,9 @@ declare class RabbitMq implements IAfRabbitMq {
     options: AfRabbitOptions | undefined;
     redisClient: any;
     redisLock?: RedisLockType;
+    userName: string;
+    password: string;
+    host: string;
     /** Array of consumers tags used for canceling consumption */
     consumersTags: Array<[ConfirmChannel, string]>;
     private consumers;

package/dist/index.js

@@ -18,14 +18,10 @@ const consts_1 = require("./lib/consts");
 const types_1 = require("./lib/types");
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger_1.default.info;
-const USERNAME = process.env.RABBITMQ_USERNAME || 'guest';
-const PASSWORD = process.env.RABBITMQ_PASSWORD || 'guest';
-const HOST = process.env.RABBITMQ_SERVICE_HOST || 'localhost';
+const PUBLISH_TIMEOUT = 1000 * 10;
 const HEARTBEAT = '60';
 class RabbitMq {
     constructor(options, redisConfig) {
-        // PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
-        // PUBLISH_ERROR_MSG = `rabbit: publish timeout(${this.PUBLISH_TIMEOUT}ms) has pass, exchange: `;
         this.DISCONNECT_MSG = 'rabbit: connection disconnect';
         this.RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
         this.consumers = [];
@@ -84,6 +80,9 @@ class RabbitMq {
                 });
             }
         };
+        this.userName = process.env.RABBITMQ_USERNAME || 'guest';
+        this.password = process.env.RABBITMQ_PASSWORD || 'guest';
+        this.host = options?.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost';
         this.em = new events_1.EventEmitter();
         this.channel = null;
         this.connection = null;
@@ -130,6 +129,7 @@ class RabbitMq {
         const outbreakTrace = zehut_1.outbreak.getCurrentContext();
         return {
             timestamp: moment_1.default().unix(),
+            timeout: PUBLISH_TIMEOUT,
             headers: {
                 creationTimestamp: moment_1.default().valueOf(),
                 ...customHeaders,
@@ -163,8 +163,8 @@ class RabbitMq {
             }
             this.creatingConnection = true;
             let isResolved = false;
-            debug('rabbit: creating connection', { HOST, USERNAME, HEARTBEAT });
-            const connection = await amqp_connection_manager_1.connect([`amqp://${USERNAME}:${PASSWORD}@${HOST}?heartbeat=${HEARTBEAT}}`]);
+            debug('rabbit: creating connection', { host: this.host, userName: this.userName, HEARTBEAT });
+            const connection = await amqp_connection_manager_1.connect([`amqp://${this.userName}:${this.password}@${this.host}?heartbeat=${HEARTBEAT}}`]);
             this.connection = connection;
             this.connection.on('error', (err) => {
                 logger_1.default.error('rabbit: connection error', { err });
@@ -186,8 +186,6 @@ class RabbitMq {
                 debug('rabbit: connection closed');
                 this.exchanges = {};
                 this.queues = {};
-                this.connection = null;
-                this.channel = null;
                 if (this.options?.disableReconnect) {
                     logger_1.default.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
                     this.blockReconnect = true;
@@ -237,10 +235,9 @@ class RabbitMq {
                 return resolve(this.channel);
             }
             try {
-                const channel = await this.getNewChannel({
-                    onClose: () => {
-                        this.channel = null;
-                    },
+                const channel = await this.getNewChannel({});
+                channel.on('error', (err) => {
+                    logger_1.default.error('rabbit: channel error', { err });
                 });
                 this.channel = channel;
                 resolve(channel);
@@ -437,12 +434,18 @@ class RabbitMq {
     }
     async sendToQueue(queue, content, options, customHeaders, isBlocking) {
         const callback = async () => {
-            RabbitMq.validateName('queue', queue);
-            await this.assertChannel();
-            await this.assertQueue(queue, options);
-            const res = await this.channel?.sendToQueue(queue, Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
-            debug(`rabbit: sending to queue ${queue}`, { res });
-            return res;
+            try {
+                RabbitMq.validateName('queue', queue);
+                await this.assertChannel();
+                await this.assertQueue(queue, options);
+                const res = await this.channel?.sendToQueue(queue, Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
+                debug(`rabbit: sending to queue ${queue}`, { res });
+                return res;
+            }
+            catch (e) {
+                logger_1.default.error(`rabbit: failed to send to queue ${queue}`, { e });
+                throw e;
+            }
         };
         if (isBlocking) {
             return callback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "example": "ts-node  src/example.ts",
     "build": "rm -rf dist && tsc",
     "linter": "./node_modules/.bin/eslint .",
-    "test": "jest --forceExit",
+    "test": "jest  --runInBand --forceExit",
     "test-local": "RABBITMQ_SERVICE_HOST=localhost:5672 jest --forceExit",
     "coverage": "jest --coverage --forceExit && rm -rf ./coverage",
     "dev": "nodemon"
@@ -37,6 +37,7 @@
     "eslint-config-airbnb-typescript": "^12.0.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^27.0.5",
+    "node-tcp-proxy": "^0.0.28",
     "ts-jest": "^27.0.3",
     "ts-node": "^8.6.2",
     "typescript": "^3.8.3"

package/src/index.ts

@@ -38,6 +38,7 @@ import {
 // const debug = nodeDebug('af-rabbitmq')
 const debug = logger.info;
 
+const PUBLISH_TIMEOUT = 1000 * 10;
 export interface IAfRabbitMq {
   ack: any;
   nack: any;
@@ -65,6 +66,8 @@ export interface AfRabbitOptions {
    * @default false
    */
   dontRetryAssert?: boolean;
+
+  rabbitHost?: string;
 }
 
 type newChannelOpts = {
@@ -83,12 +86,6 @@ type AfConsumer = {
   options: ConsumeOptions | undefined;
 }
 
-const USERNAME: string = process.env.RABBITMQ_USERNAME || 'guest';
-
-const PASSWORD: string = process.env.RABBITMQ_PASSWORD || 'guest';
-
-const HOST: string = process.env.RABBITMQ_SERVICE_HOST || 'localhost';
-
 const HEARTBEAT = '60';
 
 class RabbitMq implements IAfRabbitMq {
@@ -119,6 +116,7 @@ class RabbitMq implements IAfRabbitMq {
     const outbreakTrace = outbreak.getCurrentContext();
     return {
       timestamp: moment().unix(),
+      timeout: PUBLISH_TIMEOUT,
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
@@ -128,10 +126,6 @@ class RabbitMq implements IAfRabbitMq {
     };
   }
 
-  // PUBLISH_TIMEOUT = Number(process.env.RABBITMQ_PUBLISH_TIMEOUT) || 60000;
-
-  // PUBLISH_ERROR_MSG = `rabbit: publish timeout(${this.PUBLISH_TIMEOUT}ms) has pass, exchange: `;
-
   DISCONNECT_MSG = 'rabbit: connection disconnect';
 
   RECONNECT_MSG = 'rabbit: connection disconnect - reconnecting';
@@ -156,12 +150,24 @@ class RabbitMq implements IAfRabbitMq {
 
   redisLock?: RedisLockType;
 
+  userName: string;
+
+  password: string;
+
+  host: string;
+
   /** Array of consumers tags used for canceling consumption */
   consumersTags: Array<[ConfirmChannel, string]>;
 
   private consumers: Array<AfConsumer> = [];
 
   constructor(options?: AfRabbitOptions, redisConfig?: RedisConfig) {
+    this.userName = process.env.RABBITMQ_USERNAME || 'guest';
+
+    this.password = process.env.RABBITMQ_PASSWORD || 'guest';
+
+    this.host = options?.rabbitHost || process.env.RABBITMQ_SERVICE_HOST || 'localhost';
+
     this.em = new EventEmitter();
     this.channel = null;
     this.connection = null;
@@ -284,8 +290,8 @@ class RabbitMq implements IAfRabbitMq {
       }
       this.creatingConnection = true;
       let isResolved = false;
-      debug('rabbit: creating connection', { HOST, USERNAME, HEARTBEAT });
-      const connection: AmqpConnectionManager = await connect([`amqp://${USERNAME}:${PASSWORD}@${HOST}?heartbeat=${HEARTBEAT}}`]);
+      debug('rabbit: creating connection', { host: this.host, userName: this.userName, HEARTBEAT });
+      const connection: AmqpConnectionManager = await connect([`amqp://${this.userName}:${this.password}@${this.host}?heartbeat=${HEARTBEAT}}`]);
       this.connection = connection;
       this.connection.on('error', (err) => {
         logger.error('rabbit: connection error', { err });
@@ -309,8 +315,6 @@ class RabbitMq implements IAfRabbitMq {
         debug('rabbit: connection closed');
         this.exchanges = {};
         this.queues = {};
-        this.connection = null;
-        this.channel = null;
         if (this.options?.disableReconnect) {
           logger.error(`${this.DISCONNECT_MSG}${err && ` - ${err}`}`);
           this.blockReconnect = true;
@@ -332,7 +336,8 @@ class RabbitMq implements IAfRabbitMq {
   async getNewChannel({ name = rand().toString(), onClose = null }: newChannelOpts = {}) {
     return new Promise<ChannelWrapper>(async (resolve, reject) => {
       const connection: AmqpConnectionManager = await this.getConnection();
-      const channel = connection.createChannel({});
+      const channel = connection.createChannel({
+      });
 
       let isResolved = false;
       channel.on('error', (err) => {
@@ -364,9 +369,9 @@ class RabbitMq implements IAfRabbitMq {
 
       try {
         const channel = await this.getNewChannel({
-          onClose: () => {
-            this.channel = null;
-          },
+        });
+        channel.on('error', (err) => {
+          logger.error('rabbit: channel error', { err });
         });
         this.channel = channel;
         resolve(channel);
@@ -604,14 +609,19 @@ class RabbitMq implements IAfRabbitMq {
     isBlocking?: boolean,
   ): Promise<boolean | undefined> {
     const callback = async (): Promise<boolean | undefined> => {
-      RabbitMq.validateName('queue', queue);
-      await this.assertChannel();
-      await this.assertQueue(queue, options);
-      const res = await this.channel?.sendToQueue(queue,
-        Buffer.from(JSON.stringify(content)),
-        RabbitMq.getPublishOptions(customHeaders));
-      debug(`rabbit: sending to queue ${queue}`, { res });
-      return res;
+      try {
+        RabbitMq.validateName('queue', queue);
+        await this.assertChannel();
+        await this.assertQueue(queue, options);
+        const res = await this.channel?.sendToQueue(queue,
+          Buffer.from(JSON.stringify(content)),
+          RabbitMq.getPublishOptions(customHeaders));
+        debug(`rabbit: sending to queue ${queue}`, { res });
+        return res;
+      } catch (e) {
+        logger.error(`rabbit: failed to send to queue ${queue}`, { e });
+        throw e;
+      }
     };
     if (isBlocking) {
       return callback();