@diia-inhouse/diia-queue 14.0.31 → 14.1.0

package/dist/providers/rabbitmq/index.js

@@ -8,7 +8,7 @@ import { AmqpAsserter } from "./amqpAsserter.js";
 import { AmqpConnection } from "./amqpConnection.js";
 import { AmqpListener } from "./amqpListener.js";
 import { AmqpPublisher } from "./amqpPublisher.js";
-import _ from "lodash";
+import lodash from "lodash";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 //#region src/providers/rabbitmq/index.ts
@@ -112,7 +112,7 @@ var RabbitMQProvider = class extends EventEmitter {
 		};
 	}
 	async makeAMQPConnection(client) {
-		return new AmqpConnection(this.rabbitmqConfig.connection, this.logger, this.rabbitmqConfig.reconnectOptions, _.merge({ clientProperties: { connectionClientType: client } }, this.rabbitmqConfig.socketOptions));
+		return new AmqpConnection(this.rabbitmqConfig.connection, this.logger, this.rabbitmqConfig.reconnectOptions, lodash.merge({ clientProperties: { connectionClientType: client } }, this.rabbitmqConfig.socketOptions));
 	}
 	async makeAMQPListener(queuesOptions) {
 		return new AmqpListener(await this.getConnection("listener"), this.logger, this.rabbitMQMetricsService, queuesOptions, this.systemServiceName);

package/dist/services/eventBus.js

@@ -25,14 +25,15 @@ var EventBus = class extends Communicator {
 	getProducerExchangesOptions() {
 		if (!this.queueName) return [];
 		const { rabbit: { declareOptions: { assertExchanges } = {} } } = this.queueProvider.getConfig();
-		const exchangeNames = this.optionsBuilder.getExchangeNamesByQueueName(this.queueName);
-		const exchangesOptions = [];
-		for (const exchangeName of exchangeNames) exchangesOptions.push({
-			name: exchangeName,
+		const globalExchangeNames = this.optionsBuilder.getExchangeNamesByQueueName(this.queueName);
+		const globalExchangesOptions = [];
+		for (const globalExchangeName of globalExchangeNames) globalExchangesOptions.push({
+			name: globalExchangeName,
 			declare: assertExchanges,
 			type: "topic"
 		});
-		return exchangesOptions;
+		const { exchangesOptions: messageBrokerServiceConfigExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
+		return [...globalExchangesOptions, ...messageBrokerServiceConfigExchangesOptions];
 	}
 	getMulticastListeners() {
 		if (!this.queueName || this.eventListenerList.length === 0) return [];

package/dist/services/eventCommunicator.js

@@ -1,5 +1,5 @@
 import { collectEventBusListeners } from "../utils.js";
-import _ from "lodash";
+import lodash from "lodash";
 //#region src/services/eventCommunicator.ts
 var EventCommunicator = class {
 	logger;
@@ -18,8 +18,10 @@ var EventCommunicator = class {
 		const listeners = [];
 		for (const queueOptions of queuesOptions) {
 			const { name: queueName } = queueOptions;
+			const eventNames = this.defineEventNamesByQueueName(queueName, eventQueueMap);
+			if (!this.listenerList.some(({ queueNames = [], event }) => queueNames.includes(queueName) || eventNames.includes(event))) continue;
 			const listener = {
-				eventNames: this.defineEventNamesByQueueName(queueName, eventQueueMap),
+				eventNames,
 				queueOptions,
 				exchangesOptions,
 				handler: eventsHandler
@@ -31,8 +33,8 @@ var EventCommunicator = class {
 	getUnicastListeners() {
 		const listeners = [];
 		const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const eventListener of this.listenerList) {
 			const { queueNames = [] } = eventListener;
 			for (const queueName of queueNames) {

package/dist/services/externalEventBus.js

@@ -64,8 +64,9 @@ var ExternalEventBus = class ExternalEventBus extends Communicator {
 		return `${this.exchangePrefixName}${topic}`;
 	}
 	getProducerExchangesOptions() {
-		const [exchangesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
-		return exchangesOptions;
+		const [globalExchangesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
+		const { exchangesOptions: messageBrokerServiceConfigExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
+		return [...globalExchangesOptions, ...messageBrokerServiceConfigExchangesOptions];
 	}
 	getMulticastListeners() {
 		const [exchangesOptions, queuesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();

package/dist/services/scheduledTask.js

@@ -38,20 +38,21 @@ var ScheduledTask = class extends Communicator {
 		return this.eventCommunicator.getMulticastListeners([queueOptions], exchangesOptions);
 	}
 	getProducerExchangesOptions() {
-		const exchangesOptions = [];
+		const globalExchangesOptions = [];
 		const { topics = {}, rabbit: { declareOptions: { assertExchanges } = {} } } = this.queueProvider.getConfig();
 		const createExchangeOptions = (exchangeName) => ({
 			name: exchangeName,
 			type: "topic",
 			declare: assertExchanges
 		});
-		const exchangeNamesByQueueName = this.optionsBuilder.getExchangeNamesByQueueName(this.queueName);
-		const exchangeNamesSet = new Set([...Object.keys(topics), ...exchangeNamesByQueueName]);
-		for (const exchangeName of exchangeNamesSet) {
-			const exchangeOptions = createExchangeOptions(exchangeName);
-			exchangesOptions.push(exchangeOptions);
+		const globalExchangeNamesByQueueName = this.optionsBuilder.getExchangeNamesByQueueName(this.queueName);
+		const globalExchangeNamesSet = new Set([...Object.keys(topics), ...globalExchangeNamesByQueueName]);
+		for (const globalExchangeName of globalExchangeNamesSet) {
+			const exchangeOptions = createExchangeOptions(globalExchangeName);
+			globalExchangesOptions.push(exchangeOptions);
 		}
-		return exchangesOptions;
+		const { exchangesOptions: messageBrokerServiceConfigExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
+		return [...globalExchangesOptions, ...messageBrokerServiceConfigExchangesOptions];
 	}
 	getRoutingKey(serviceName) {
 		return `${serviceName}.${this.eventRoutingPart}`;

package/dist/services/task.js

@@ -2,7 +2,7 @@ import { QueueTypes } from "../interfaces/messageBrokerServiceConfig.js";
 import "../interfaces/index.js";
 import constants_default from "../constants.js";
 import Communicator from "./communicator.js";
-import _ from "lodash";
+import lodash from "lodash";
 //#region src/services/task.ts
 var Task = class extends Communicator {
 	serviceName;
@@ -18,8 +18,8 @@ var Task = class extends Communicator {
 	}
 	async onInit() {
 		const { queuesOptions, exchangesOptions } = await this.init();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const task of this.taskList) {
 			const { name: taskName, isDelayed = false, queueNames = [] } = task;
 			if (queueNames.length === 0) {
@@ -69,8 +69,8 @@ var Task = class extends Communicator {
 	getUnicastListeners() {
 		const listeners = [];
 		const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
 		for (const task of this.taskList) {
 			const { queueNames = [], name: taskName, isDelayed = false } = task;
 			if (queueNames.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/diia-queue",
-    "version": "14.0.31",
+    "version": "14.1.0",
     "type": "module",
     "description": "Package provide queue functionality",
     "main": "dist/index.js",
@@ -23,7 +23,7 @@
     ],
     "scripts": {
         "build": "rimraf dist/ && tsdown",
-        "build-watch": "tsdown --watch",
+        "build:watch": "tsdown --watch",
         "lint": "oxlint && oxfmt --check .",
         "lint-fix": "oxlint --fix && oxfmt .",
         "lint:lockfile": "lockfile-lint --path package-lock.json --allowed-hosts registry.npmjs.org --validate-https",