@autofleet/rabbit 3.2.19 → 3.2.20-beta-1

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { AmqpConnectionManager, ChannelWrapper, CreateChannelOpts } from 'amqp-connection-manager';
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
-import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary } from './lib/types';
+import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache, QueueSetupPromisesDictionary, AssertExchangePromisesDictionary } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -66,6 +66,7 @@ declare class RabbitMq implements IAfRabbitMq {
     exchanges: ExchangesCache;
     queues: QueuesCache;
     queueSetupPromises: QueueSetupPromisesDictionary;
+    assertExchangePromises: AssertExchangePromisesDictionary;
     options: AfRabbitOptions | undefined;
     redisClient: any;
     redisLock?: RedisLockType;

package/dist/index.js

@@ -123,6 +123,7 @@ class RabbitMq {
         this.exchanges = {};
         this.queues = {};
         this.queueSetupPromises = {};
+        this.assertExchangePromises = {};
         this.consumers = [];
         this.options = options;
         this.redisClient = redisConfig && (0, redis_1.default)(redisConfig);
@@ -266,11 +267,15 @@ class RabbitMq {
     async assertExchange(exchangeName, options) {
         const channel = await this.assertChannel();
         if (this.exchanges[exchangeName]) {
+            delete this.assertExchangePromises[exchangeName];
             return this.exchanges[exchangeName];
         }
-        const exchange = await (0, utils_1.assertExchangeFanout)(channel, exchangeName);
-        this.exchanges[exchangeName] = exchange;
-        return exchange;
+        if (this.assertExchangePromises[exchangeName]) {
+            return this.assertExchangePromises[exchangeName];
+        }
+        this.assertExchangePromises[exchangeName] = (0, utils_1.assertExchangeFanout)(channel, exchangeName);
+        this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
+        return this.exchanges[exchangeName];
     }
     async getQueueLength(queue) {
         RabbitMq.validateName('queue', queue);
@@ -383,6 +388,7 @@ class RabbitMq {
                 }
                 const traceId = msg.properties.headers[consts_1.TRACING_HEADER];
                 const userId = msg.properties.headers[consts_1.USER_TRACING_HEADER];
+                const automationId = msg.properties.headers['x-af-automation-id'];
                 const parsedMessage = RabbitMq.parseMsg(msg);
                 const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
                 const trace = (0, zehut_1.newTrace)(zehut_1.traceTypes.RABBIT);
@@ -407,7 +413,10 @@ class RabbitMq {
                     outbreakTrace?.context.set(consts_1.TRACING_HEADER, traceId);
                 }
                 if (auditContext) {
-                    await auditContext(queue);
+                    await auditContext(queue, {
+                        userId,
+                        automationId,
+                    });
                 }
                 const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
                 if (!shouldConsume) {

package/dist/lib/types.d.ts

@@ -8,6 +8,9 @@ export interface QueuesCache {
 export interface QueueSetupPromisesDictionary {
     [key: string]: Promise<Replies.AssertQueue> | undefined;
 }
+export interface AssertExchangePromisesDictionary {
+    [key: string]: Promise<Replies.AssertExchange> | undefined;
+}
 export type CustomMessageHeaders = {
     redisTimestampValidationKey?: string;
 };

package/dist/lib/utils.d.ts

@@ -1,5 +1,5 @@
 import { ChannelWrapper } from 'amqp-connection-manager';
-import { ConfirmChannel } from 'amqplib';
-export declare const assertExchangeFanout: (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => Promise<import("amqplib").Replies.AssertExchange>;
+import { ConfirmChannel, Replies } from 'amqplib';
+export declare const assertExchangeFanout: (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => Promise<Replies.AssertExchange>;
 export declare const wrapSetImmediate: (callback: () => any) => Promise<any>;
 export declare const rand: () => number;

package/package.json

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

package/src/index.ts

@@ -35,7 +35,10 @@ import {
   CustomMessageHeaders,
   QueuesCache,
   RedisLockType,
-  ExchangesCache, CONSUMER_DEFAULT_OPTIONS, QueueSetupPromisesDictionary,
+  ExchangesCache,
+  CONSUMER_DEFAULT_OPTIONS,
+  QueueSetupPromisesDictionary,
+  AssertExchangePromisesDictionary,
 } from './lib/types';
 
 // const debug = nodeDebug('af-rabbitmq')
@@ -157,6 +160,8 @@ class RabbitMq implements IAfRabbitMq {
 
   queueSetupPromises: QueueSetupPromisesDictionary;
 
+  assertExchangePromises: AssertExchangePromisesDictionary;
+
   options: AfRabbitOptions | undefined;
 
   redisClient: any;
@@ -177,6 +182,7 @@ class RabbitMq implements IAfRabbitMq {
     this.exchanges = {};
     this.queues = {};
     this.queueSetupPromises = {};
+    this.assertExchangePromises = {};
     this.consumers = [];
     this.options = options;
     this.redisClient = redisConfig && getRedisInstance(redisConfig);
@@ -403,12 +409,19 @@ class RabbitMq implements IAfRabbitMq {
 
   async assertExchange(exchangeName: string, options?: any) {
     const channel: ChannelWrapper = await this.assertChannel();
+
     if (this.exchanges[exchangeName]) {
+      delete this.assertExchangePromises[exchangeName];
       return this.exchanges[exchangeName];
     }
-    const exchange = await assertExchangeFanout(channel, exchangeName);
-    this.exchanges[exchangeName] = exchange;
-    return exchange;
+
+    if (this.assertExchangePromises[exchangeName]) {
+      return this.assertExchangePromises[exchangeName];
+    }
+
+    this.assertExchangePromises[exchangeName] = assertExchangeFanout(channel, exchangeName);
+    this.exchanges[exchangeName] = await this.assertExchangePromises[exchangeName];
+    return this.exchanges[exchangeName];
   }
 
   async getQueueLength(queue: string) {
@@ -542,6 +555,7 @@ class RabbitMq implements IAfRabbitMq {
 
           const traceId = msg.properties.headers[TRACING_HEADER];
           const userId = msg.properties.headers[USER_TRACING_HEADER];
+          const automationId = msg.properties.headers['x-af-automation-id'];
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
@@ -567,7 +581,10 @@ class RabbitMq implements IAfRabbitMq {
           }
 
           if (auditContext) {
-            await auditContext(queue);
+            await auditContext(queue, {
+              userId,
+              automationId,
+            });
           }
           const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
           if (!shouldConsume) {

package/src/lib/types.ts

@@ -12,6 +12,10 @@ export interface QueueSetupPromisesDictionary {
   [key: string]: Promise<Replies.AssertQueue> | undefined
 }
 
+export interface AssertExchangePromisesDictionary {
+  [key: string]: Promise<Replies.AssertExchange> | undefined
+}
+
 export type CustomMessageHeaders = {
   redisTimestampValidationKey?: string;
 }

package/src/lib/utils.ts

@@ -1,7 +1,11 @@
 import { ChannelWrapper } from 'amqp-connection-manager';
-import { ConfirmChannel } from 'amqplib';
+import { ConfirmChannel, Replies } from 'amqplib';
+
+export const assertExchangeFanout = async (
+  c: ChannelWrapper | ConfirmChannel,
+  exchangeName: string,
+): Promise<Replies.AssertExchange> => c.assertExchange(exchangeName, 'fanout');
 
-export const assertExchangeFanout = async (c: ChannelWrapper | ConfirmChannel, exchangeName: string) => c.assertExchange(exchangeName, 'fanout');
 export const wrapSetImmediate = (callback: () => any) => new Promise<any>((resolve, reject) => {
   setImmediate(async () => {
     try {