logixia 1.8.2 → 1.8.4

package/dist/index.mjs

@@ -1,7 +1,6 @@
-import { A as disableOtelBridge, B as PluginRegistry, C as traceStorage, D as resetShutdownHandlers, E as registerForShutdown, F as normalizeError, G as createFastifyContextHook, H as usePlugin, I as serializeError, L as DEFAULT_LOG_COLORS, M as getOtelMetaFields, N as initOtelBridge, O as applyRedaction, P as isError, R as DEFAULT_LOG_LEVELS, S as setTraceId, T as flushOnExit, U as LogixiaContext, V as globalPluginRegistry, W as createExpressContextMiddleware, _ as createTraceMiddleware, b as getTraceContextKey, c as LogixiaLoggerService, d as LogixiaLogger, f as createLogger$1, g as _setActiveContextKey, h as TraceContext, i as WebSocketTraceInterceptor, j as getActiveOtelContext, k as redactObject, l as __decorate, m as TRACE_CONTEXT_KEY, n as LOGIXIA_LOGGER_PREFIX, o as __decorateParam, p as DEFAULT_TRACE_HEADERS, r as LogixiaLoggerModule, s as KafkaTraceInterceptor, t as LOGIXIA_LOGGER_CONFIG, u as __decorateMetadata, v as extractTraceId, w as deregisterFromShutdown, x as runWithTraceId, y as getCurrentTraceId, z as LogLevel } from "./logitron-logger.module-DucvDnxZ.mjs";
-import { f as internalWarn } from "./transport.manager-BCnLEmOy.mjs";
-import "./search-1txemGPh.mjs";
-import { randomUUID } from "node:crypto";
+import { f as internalWarn } from "./transport.manager-D3U03fJg.mjs";
+import { A as redactObject, B as LogLevel, C as setTraceId, D as registerForShutdown, E as flushOnExit, F as isError, G as createExpressContextMiddleware, H as globalPluginRegistry, I as normalizeError, K as createFastifyContextHook, L as serializeError, M as getActiveOtelContext, N as getOtelMetaFields, O as resetShutdownHandlers, P as initOtelBridge, R as DEFAULT_LOG_COLORS, S as runWithTraceId, T as deregisterFromShutdown, U as usePlugin, V as PluginRegistry, W as LogixiaContext, _ as _setActiveContextKey, b as getCurrentTraceId, c as KafkaTraceInterceptor, d as __decorateMetadata, f as LogixiaLogger, g as TraceContext, h as TRACE_CONTEXT_KEY, i as WebSocketTraceInterceptor, j as disableOtelBridge, k as applyRedaction, l as LogixiaLoggerService, m as DEFAULT_TRACE_HEADERS, n as LOGIXIA_LOGGER_PREFIX, o as resolveResponseHeader, p as createLogger$1, r as LogixiaLoggerModule, s as __decorateParam, t as LOGIXIA_LOGGER_CONFIG, u as __decorate, v as createTraceMiddleware, w as traceStorage, x as getTraceContextKey, y as extractTraceId, z as DEFAULT_LOG_LEVELS } from "./logitron-logger.module-uyg1-Khn.mjs";
+import "./search-DOvSI-mb.mjs";
 import { Catch, Inject, Optional } from "@nestjs/common";
 
 //#region src/exceptions/exception.ts
@@ -39,13 +38,16 @@ function isLogixiaException(value) {
 //#endregion
 //#region src/exceptions/builder.ts
 /**
-* Generates a trace ID using Node's built-in `crypto.randomUUID`.
-* No extra dependencies required.
+* Generates a trace ID via the shared {@link TraceContext} generator.
+*
+* Delegates to `TraceContext.instance.generate()` so any custom generator
+* configured on `TraceIdConfig.generator` is respected — avoids the silent
+* "builder has its own UUID source" divergence this module had previously.
 *
 * @example `'550e8400-e29b-41d4-a716-446655440000'`
 */
 function generateTraceId() {
-	return randomUUID();
+	return TraceContext.instance.generate();
 }
 /** @deprecated Use `generateTraceId` instead. */
 const generateRequestId = generateTraceId;
@@ -99,24 +101,34 @@ var ErrorResponseBuilder = class {
 	* @param params - See `BuildParams`.
 	* @returns The unified error response and the HTTP status code to send.
 	*
+	* @remarks
+	* `traceId` does not need to be supplied by the caller in most cases — the
+	* builder reads `TraceContext.instance.getCurrentTraceId()` internally and
+	* falls back to the explicit `traceId` argument only when AsyncLocalStorage
+	* is empty. If neither source yields a value, `meta.trace_id` is omitted.
+	*
 	* @example In a NestJS exception filter
 	* ```ts
 	* const { response, httpStatus } = ErrorResponseBuilder.build<AppCode, AppType>({
 	*   exception,
-	*   traceId: request.headers['x-trace-id'] as string | undefined,
+	*   // Omit traceId — it will be picked up from ALS automatically.
 	*   path:    request.url,
 	*   service: process.env.SERVICE_NAME,
 	*   startTime: request.startTime,
 	* });
 	*
 	* if (process.env.NODE_ENV === 'production') delete response.debug;
-	* response.setHeader('X-Trace-ID', response.meta.trace_id);
+	* // Echo the resolved traceId back on whatever header your TraceIdConfig says —
+	* // do NOT hardcode 'X-Trace-Id', use `resolveResponseHeader(config)` instead.
+	* if (response.meta.trace_id) {
+	*   response.setHeader(resolveResponseHeader(config) ?? 'X-Trace-Id', response.meta.trace_id);
+	* }
 	* response.status(httpStatus).json(response);
 	* ```
 	*/
 	static build(params) {
 		const { exception, path, service, startTime, traceId: rawTraceId } = params;
-		const traceId = rawTraceId ?? generateTraceId();
+		const traceId = TraceContext.instance.getCurrentTraceId() ?? rawTraceId;
 		const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 		const durationMs = startTime !== void 0 ? Date.now() - startTime : void 0;
 		if (isLogixiaException(exception)) {
@@ -134,7 +146,7 @@ var ErrorResponseBuilder = class {
 					success: false,
 					error: errorBlock,
 					meta: {
-						trace_id: traceId,
+						...traceId !== void 0 ? { trace_id: traceId } : {},
 						timestamp,
 						path,
 						status: exception.httpStatus
@@ -165,7 +177,7 @@ var ErrorResponseBuilder = class {
 						message
 					},
 					meta: {
-						trace_id: traceId,
+						...traceId !== void 0 ? { trace_id: traceId } : {},
 						timestamp,
 						path,
 						status
@@ -185,7 +197,7 @@ var ErrorResponseBuilder = class {
 					message: "An unexpected error occurred."
 				},
 				meta: {
-					trace_id: traceId,
+					...traceId !== void 0 ? { trace_id: traceId } : {},
 					timestamp,
 					path,
 					status: 500
@@ -199,6 +211,7 @@ var ErrorResponseBuilder = class {
 
 //#endregion
 //#region src/core/nestjs-extras.ts
+var _ref;
 /**
 * Inject the Logixia logger registered in the current NestJS DI container.
 *
@@ -242,9 +255,12 @@ function LogMethod(options = {}) {
 			const start = Date.now();
 			const entry = { method: label };
 			if (logArgs && args.length > 0) entry["args"] = args;
+			const reportLogFailure = (phase, err) => {
+				process.stderr.write(`[logixia] @LogMethod(${label}) ${phase} log failed: ${String(err)}\n`);
+			};
 			if (logger$1) {
 				const logFnRaw = logger$1[level];
-				await (typeof logFnRaw === "function" ? logFnRaw : logger$1.debug).bind(logger$1)(`→ ${label}`, entry).catch(() => void 0);
+				await (typeof logFnRaw === "function" ? logFnRaw : logger$1.debug).bind(logger$1)(`→ ${label}`, entry).catch((e) => reportLogFailure("entry", e));
 			}
 			try {
 				const result = await originalMethod.apply(this, args);
@@ -255,13 +271,17 @@ function LogMethod(options = {}) {
 				if (logResult) exit["result"] = result;
 				if (logger$1) {
 					const logFnRaw = logger$1[level];
-					await (typeof logFnRaw === "function" ? logFnRaw : logger$1.debug).bind(logger$1)(`← ${label}`, exit).catch(() => void 0);
+					await (typeof logFnRaw === "function" ? logFnRaw : logger$1.debug).bind(logger$1)(`← ${label}`, exit).catch((e) => reportLogFailure("exit", e));
 				}
 				return result;
 			} catch (error) {
 				if (logger$1 && logErrors) {
 					const err = error instanceof Error ? error : new Error(String(error));
-					logger$1.error(err, `${label} durationMs=${Date.now() - start}`);
+					const errLog = logger$1.error(err, {
+						method: label,
+						durationMs: Date.now() - start
+					});
+					if (errLog !== void 0 && errLog !== null && typeof errLog.catch === "function") errLog.catch((e) => reportLogFailure("error", e));
 				}
 				throw error;
 			}
@@ -270,15 +290,16 @@ function LogMethod(options = {}) {
 	};
 }
 let LogixiaExceptionFilter = class LogixiaExceptionFilter$1 {
-	constructor(logger$1) {
+	constructor(logger$1, loggerConfig) {
 		this._logger = logger$1 ?? LogixiaLoggerModule._globalLogger ?? void 0;
+		this._traceConfig = typeof (loggerConfig === null || loggerConfig === void 0 ? void 0 : loggerConfig.traceId) === "object" ? loggerConfig.traceId : void 0;
 	}
 	catch(exception, host) {
 		var _request$headers;
 		const ctx = host.switchToHttp();
 		const request = ctx.getRequest();
 		const response = ctx.getResponse();
-		const traceId = ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers["x-trace-id"]) ?? request.id ?? void 0;
+		const traceId = TraceContext.instance.getCurrentTraceId() ?? ((_request$headers = request.headers) === null || _request$headers === void 0 ? void 0 : _request$headers["x-trace-id"]) ?? request.id ?? void 0;
 		const { response: errorResponse, httpStatus } = ErrorResponseBuilder.build({
 			exception,
 			traceId,
@@ -290,16 +311,24 @@ let LogixiaExceptionFilter = class LogixiaExceptionFilter$1 {
 				method: request.method ?? "",
 				url: request.url ?? "",
 				status: httpStatus,
-				trace_id: errorResponse.meta.trace_id
+				...errorResponse.meta.trace_id !== void 0 ? { trace_id: errorResponse.meta.trace_id } : {}
+			};
+			const onLogFailure = (err) => {
+				process.stderr.write(`[logixia] ExceptionFilter failed to write log entry: ${String(err)}\n`);
 			};
+			let logPromise;
 			if (httpStatus >= 500) {
 				const err = exception instanceof Error ? exception : new Error(String(exception));
-				this._logger.error(err, requestMeta);
-			} else if (isLogixiaException(exception)) this._logger.warn(`[${errorResponse.error.code}] ${errorResponse.error.message}`, requestMeta);
-			else this._logger.warn(`[${httpStatus}] ${errorResponse.error.message}`, requestMeta);
+				logPromise = this._logger.error(err, requestMeta);
+			} else if (isLogixiaException(exception)) logPromise = this._logger.warn(`[${errorResponse.error.code}] ${errorResponse.error.message}`, requestMeta);
+			else logPromise = this._logger.warn(`[${httpStatus}] ${errorResponse.error.message}`, requestMeta);
+			if (logPromise && typeof logPromise.catch === "function") logPromise.catch(onLogFailure);
 		}
 		if (process.env["NODE_ENV"] === "production") delete errorResponse.debug;
-		response.setHeader("X-Trace-ID", errorResponse.meta.trace_id);
+		if (errorResponse.meta.trace_id) {
+			const traceHeader = resolveResponseHeader(this._traceConfig);
+			if (traceHeader) response.setHeader(traceHeader, errorResponse.meta.trace_id);
+		}
 		if (httpStatus === 429) response.setHeader("Retry-After", "60");
 		response.status(httpStatus).json(errorResponse);
 	}
@@ -308,7 +337,9 @@ LogixiaExceptionFilter = __decorate([
 	Catch(),
 	__decorateParam(0, Optional()),
 	__decorateParam(0, Inject(`${LOGIXIA_LOGGER_PREFIX}SERVICE`)),
-	__decorateMetadata("design:paramtypes", [Object])
+	__decorateParam(1, Optional()),
+	__decorateParam(1, Inject(LOGIXIA_LOGGER_CONFIG)),
+	__decorateMetadata("design:paramtypes", [Object, typeof (_ref = typeof Partial !== "undefined" && Partial) === "function" ? _ref : Object])
 ], LogixiaExceptionFilter);
 
 //#endregion
@@ -344,15 +375,18 @@ var JsonFormatter = class {
 	}
 	serializePayload(payload) {
 		const serialized = {};
-		for (const [key, value] of Object.entries(payload)) try {
-			if (value instanceof Error) serialized[key] = serializeError(value);
-			else if (value instanceof Date) serialized[key] = value.toISOString();
-			else if (typeof value === "function") serialized[key] = "[Function]";
-			else if (typeof value === "symbol") serialized[key] = value.toString();
-			else if (value === void 0) serialized[key] = null;
-			else serialized[key] = value;
-		} catch {
-			serialized[key] = "[Unserializable]";
+		for (const [key, value] of Object.entries(payload)) {
+			if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
+			try {
+				if (value instanceof Error) serialized[key] = serializeError(value);
+				else if (value instanceof Date) serialized[key] = value.toISOString();
+				else if (typeof value === "function") serialized[key] = "[Function]";
+				else if (typeof value === "symbol") serialized[key] = value.toString();
+				else if (value === void 0) serialized[key] = null;
+				else serialized[key] = value;
+			} catch {
+				serialized[key] = "[Unserializable]";
+			}
 		}
 		return serialized;
 	}
@@ -360,6 +394,8 @@ var JsonFormatter = class {
 
 //#endregion
 //#region src/formatters/text.formatter.ts
+const CONTROL_CHARS_RE = /[\x00-\x08\x0B-\x1F\x7F-\x9F]/g;
+const stripControls = (value) => value.replace(CONTROL_CHARS_RE, "");
 var TextFormatter = class TextFormatter {
 	constructor(options = {}) {
 		this.colorize = options.colorize ?? true;
@@ -392,18 +428,22 @@ var TextFormatter = class TextFormatter {
 		const formattedLevel = this.colorize ? `${levelColor}${this.colors.bold}${levelName.toUpperCase().padEnd(5)}${this.colors.reset}` : levelName.toUpperCase().padEnd(5);
 		parts.push(`[${formattedLevel}]`);
 		if (this.includeAppName) {
-			const appName = this.colorize ? `${this.colors.bold}${entry.appName}${this.colors.reset}` : entry.appName;
+			const safeAppName = stripControls(entry.appName);
+			const appName = this.colorize ? `${this.colors.bold}${safeAppName}${this.colors.reset}` : safeAppName;
 			parts.push(`[${appName}]`);
 		}
 		if (this.includeTraceId && entry.traceId) {
-			const traceId = this.colorize ? `${this.colors.dim}${entry.traceId}${this.colors.reset}` : entry.traceId;
+			const safeTraceId = stripControls(entry.traceId);
+			const traceId = this.colorize ? `${this.colors.dim}${safeTraceId}${this.colors.reset}` : safeTraceId;
 			parts.push(`[${traceId}]`);
 		}
 		if (this.includeContext && entry.context) {
-			const context = this.colorize ? `${this.colors.cyan}${entry.context}${this.colors.reset}` : entry.context;
+			const safeContext = stripControls(entry.context);
+			const context = this.colorize ? `${this.colors.cyan}${safeContext}${this.colors.reset}` : safeContext;
 			parts.push(`[${context}]`);
 		}
-		const message = this.colorize && entry.level === LogLevel.ERROR ? `${this.colors.error}${entry.message}${this.colors.reset}` : entry.message;
+		const safeMessage = stripControls(entry.message);
+		const message = this.colorize && entry.level === LogLevel.ERROR ? `${this.colors.error}${safeMessage}${this.colors.reset}` : safeMessage;
 		parts.push(message);
 		if (entry.payload && Object.keys(entry.payload).length > 0) {
 			const payload = this.formatPayload(entry.payload);