@diia-inhouse/diia-queue 14.1.0 → 14.1.2

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 lodash from "lodash";
+import _ 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, lodash.merge({ clientProperties: { connectionClientType: client } }, this.rabbitmqConfig.socketOptions));
+		return new AmqpConnection(this.rabbitmqConfig.connection, this.logger, this.rabbitmqConfig.reconnectOptions, _.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/communicator.js

@@ -135,14 +135,14 @@ var Communicator = class {
 	unifyServiceConfig(listeners, implicitExchangesOptions = []) {
 		const queuesMap = /* @__PURE__ */ new Map();
 		const exchangesMap = /* @__PURE__ */ new Map();
+		const { queuesOptions, exchangesOptions: explicitExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
+		for (const exchangeOpts of [...explicitExchangesOptions, ...implicitExchangesOptions]) if (!exchangesMap.has(exchangeOpts.name)) exchangesMap.set(exchangeOpts.name, exchangeOpts);
 		for (const listener of listeners) {
 			const { queueOptions, exchangesOptions } = listener;
 			queuesMap.set(queueOptions.name, queueOptions);
-			for (const exchangeOptions of exchangesOptions) exchangesMap.set(exchangeOptions.name, exchangeOptions);
+			for (const exchangeOptions of exchangesOptions) if (!exchangesMap.has(exchangeOptions.name)) exchangesMap.set(exchangeOptions.name, exchangeOptions);
 		}
-		const { queuesOptions, exchangesOptions: explicitExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
 		for (const queueOpts of queuesOptions) if (!queuesMap.has(queueOpts.name)) queuesMap.set(queueOpts.name, queueOpts);
-		for (const exchangeOpts of [...explicitExchangesOptions, ...implicitExchangesOptions]) if (!exchangesMap.has(exchangeOpts.name)) exchangesMap.set(exchangeOpts.name, exchangeOpts);
 		return {
 			queuesOptions: [...queuesMap.values()],
 			exchangesOptions: [...exchangesMap.values()]

package/dist/services/eventBus.js

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

package/dist/services/eventCommunicator.js

@@ -1,5 +1,5 @@
 import { collectEventBusListeners } from "../utils.js";
-import lodash from "lodash";
+import _ from "lodash";
 //#region src/services/eventCommunicator.ts
 var EventCommunicator = class {
 	logger;
@@ -33,8 +33,8 @@ var EventCommunicator = class {
 	getUnicastListeners() {
 		const listeners = [];
 		const { queuesOptions, exchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		const queuesOptionsMap = lodash.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = _.keyBy(exchangesOptions, "name");
 		for (const eventListener of this.listenerList) {
 			const { queueNames = [] } = eventListener;
 			for (const queueName of queueNames) {

package/dist/services/externalEventBus.js

@@ -64,9 +64,8 @@ var ExternalEventBus = class ExternalEventBus extends Communicator {
 		return `${this.exchangePrefixName}${topic}`;
 	}
 	getProducerExchangesOptions() {
-		const [globalExchangesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
-		const { exchangesOptions: messageBrokerServiceConfigExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		return [...globalExchangesOptions, ...messageBrokerServiceConfigExchangesOptions];
+		const [exchangesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
+		return exchangesOptions;
 	}
 	getMulticastListeners() {
 		const [exchangesOptions, queuesOptions] = this.defineQueuesAndExchangesOptionsBasedOnGlobalConfig();
@@ -123,7 +122,8 @@ var ExternalEventBus = class ExternalEventBus extends Communicator {
 			const exchangeOptions = {
 				name: exchangeName,
 				type: "topic",
-				declare: assertExchanges
+				declare: assertExchanges,
+				bindTo: []
 			};
 			exchangesMap.set(exchangeName, exchangeOptions);
 		}

package/dist/services/scheduledTask.js

@@ -38,21 +38,21 @@ var ScheduledTask = class extends Communicator {
 		return this.eventCommunicator.getMulticastListeners([queueOptions], exchangesOptions);
 	}
 	getProducerExchangesOptions() {
-		const globalExchangesOptions = [];
+		const exchangesOptions = [];
 		const { topics = {}, rabbit: { declareOptions: { assertExchanges } = {} } } = this.queueProvider.getConfig();
 		const createExchangeOptions = (exchangeName) => ({
 			name: exchangeName,
 			type: "topic",
-			declare: assertExchanges
+			declare: assertExchanges,
+			bindTo: []
 		});
-		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);
+		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 { exchangesOptions: messageBrokerServiceConfigExchangesOptions } = this.queueProvider.getMessageBrokerServiceConfig();
-		return [...globalExchangesOptions, ...messageBrokerServiceConfigExchangesOptions];
+		return exchangesOptions;
 	}
 	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 lodash from "lodash";
+import _ 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 = lodash.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = _.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 = lodash.keyBy(queuesOptions, "name");
-		const exchangesOptionsMap = lodash.keyBy(exchangesOptions, "name");
+		const queuesOptionsMap = _.keyBy(queuesOptions, "name");
+		const exchangesOptionsMap = _.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.1.0",
+    "version": "14.1.2",
     "type": "module",
     "description": "Package provide queue functionality",
     "main": "dist/index.js",
@@ -51,14 +51,14 @@
     },
     "devDependencies": {
         "@diia-inhouse/configs": "7.0.1",
-        "@diia-inhouse/diia-logger": "4.4.6",
-        "@diia-inhouse/diia-metrics": "7.1.44",
-        "@diia-inhouse/env": "3.3.28",
+        "@diia-inhouse/diia-logger": "4.4.8",
+        "@diia-inhouse/diia-metrics": "7.1.46",
+        "@diia-inhouse/env": "3.3.29",
         "@diia-inhouse/errors": "2.2.2",
         "@diia-inhouse/oxc-config": "2.0.0",
         "@diia-inhouse/test": "8.2.17",
         "@diia-inhouse/types": "14.1.1",
-        "@diia-inhouse/utils": "6.0.42",
+        "@diia-inhouse/utils": "6.0.43",
         "@diia-inhouse/validators": "2.2.33",
         "@opentelemetry/api": "1.9.0",
         "@types/lodash": "4.17.24",