@diia-inhouse/diia-queue 14.0.12 → 14.0.14

package/dist/interfaces/queueConfig/configs.d.ts

@@ -32,6 +32,11 @@ type QueueConfigByQueueName = { [k in QueueName]: {
   topics: ExchangeName[];
 } };
 type QueueConfig = Record<QueueConfigType.Internal, QueueConfigByQueueName>;
+/**
+* Under QueueConfigType.External, each key is auto-prefixed
+* with 'TopicExternal' to form the broker exchange name (e.g.
+* 'Auth' → 'TopicExternalAuth'). See ExternalEventBus.
+*/
 type TopicConfigByConfigType = { [k in ExchangeName]: {
   events: EventName[];
 } };

package/dist/providers/rabbitmq/index.js

@@ -9,7 +9,7 @@ import { AmqpConnection } from "./amqpConnection.js";
 import { AmqpListener } from "./amqpListener.js";
 import { AmqpPublisher } from "./amqpPublisher.js";
 import { InternalServerError } from "@diia-inhouse/errors";
-import lodash from "lodash";
+import _ from "lodash";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import pTimeout from "p-timeout";
@@ -111,7 +111,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/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;
@@ -31,8 +31,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/eventMessageHandler.d.ts

@@ -21,7 +21,7 @@ declare class EventMessageHandler {
   private getServiceCode;
   private prepareQueueMessageError;
   private resolveTraceId;
-  private extractTraceparentTraceId;
+  private toPropagationCarrier;
 }
 //#endregion
 export { EventMessageHandler };

package/dist/services/eventMessageHandler.js

@@ -2,7 +2,7 @@ import { NackOptions } from "../interfaces/providers/rabbitmq/index.js";
 import "../interfaces/index.js";
 import { ApiError, ValidationError } from "@diia-inhouse/errors";
 import { randomBytes } from "node:crypto";
-import { isValidTraceId, trace } from "@opentelemetry/api";
+import { context, isValidTraceId, propagation, trace } from "@opentelemetry/api";
 import { utils } from "@diia-inhouse/utils";
 //#region src/services/eventMessageHandler.ts
 var EventMessageHandler = class {
@@ -107,17 +107,20 @@ var EventMessageHandler = class {
 		};
 	}
 	resolveTraceId(properties) {
-		const extractedTraceId = this.extractTraceparentTraceId(properties.headers?.traceparent);
+		const carrier = this.toPropagationCarrier(properties.headers);
+		const extractedTraceId = trace.getSpan(propagation.extract(context.active(), carrier))?.spanContext().traceId ?? "";
 		if (isValidTraceId(extractedTraceId)) return extractedTraceId;
 		const activeSpanTraceId = trace.getActiveSpan()?.spanContext().traceId ?? "";
 		if (isValidTraceId(activeSpanTraceId)) return activeSpanTraceId;
 		return properties.headers?.traceId || randomBytes(16).toString("hex");
 	}
-	extractTraceparentTraceId(raw) {
-		if (raw === void 0 || raw === null) return "";
-		const [version, traceId] = (Buffer.isBuffer(raw) ? raw.toString("utf8") : raw).split("-");
-		if (version !== "00" || !traceId) return "";
-		return isValidTraceId(traceId) ? traceId : "";
+	toPropagationCarrier(headers) {
+		const carrier = {};
+		for (const [key, value] of Object.entries(headers ?? {})) {
+			if (value === void 0 || value === null) continue;
+			carrier[key] = Buffer.isBuffer(value) ? value.toString("utf8") : String(value);
+		}
+		return carrier;
 	}
 };
 //#endregion

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.0.12",
+    "version": "14.0.14",
     "type": "module",
     "description": "Package provide queue functionality",
     "main": "dist/index.js",
@@ -52,9 +52,9 @@
     },
     "devDependencies": {
         "@diia-inhouse/configs": "7.0.0",
-        "@diia-inhouse/diia-logger": "4.2.4",
-        "@diia-inhouse/diia-metrics": "7.1.5",
-        "@diia-inhouse/env": "3.3.1",
+        "@diia-inhouse/diia-logger": "4.3.0",
+        "@diia-inhouse/diia-metrics": "7.1.6",
+        "@diia-inhouse/env": "3.3.2",
         "@diia-inhouse/errors": "2.1.1",
         "@diia-inhouse/oxc-config": "1.10.0",
         "@diia-inhouse/test": "8.2.1",