logixia 1.10.0 → 1.10.2

package/dist/{logitron-logger.module-DC0qwI3N.js → logitron-logger.module-bJ1hGhaL.js}

@@ -1,4 +1,4 @@
-const require_transport_manager = require('./transport.manager-CgeSNG_8.js');
+const require_transport_manager = require('./transport.manager-zgEZCJhR.js');
 let fast_json_stringify = require("fast-json-stringify");
 fast_json_stringify = require_transport_manager.__toESM(fast_json_stringify);
 let node_async_hooks = require("node:async_hooks");
@@ -119,8 +119,14 @@ var PluginRegistry = class {
 		let current = entry;
 		for (const plugin of this._plugins) {
 			if (!plugin.onLog) continue;
-			current = await plugin.onLog(current);
-			if (current === null) return null;
+			let next;
+			try {
+				next = await plugin.onLog(current);
+			} catch {
+				continue;
+			}
+			if (next === null) return null;
+			current = next;
 		}
 		return current;
 	}
@@ -499,7 +505,11 @@ function resolveConfig(config) {
 }
 /**
 * Convert a dot-notation path pattern to a RegExp.
-* Supports `*` (one segment) and `**` (zero or more segments).
+* Supports `*` (exactly one segment) and `**` (zero or more segments).
+*
+* Because `**` may match *zero* segments, it also absorbs the dot separator
+* that joins it to its neighbour — so `**.password` matches both a bare
+* top-level `password` (zero leading segments) and any nested `*.password`.
 *
 * Examples:
 *   "password"          → /^password$/
@@ -507,13 +517,26 @@ function resolveConfig(config) {
 *   "*.token"           → /^[^.]+\.token$/
 *   "req.headers.*"     → /^req\.headers\.[^.]+$/
 *   "**"                → /^.*$/
+*   "**.password"       → /^(?:.*\.)?password$/   (matches `password` and `a.b.password`)
+*   "req.**"            → /^req(?:\..*)?$/         (matches `req` and `req.a.b`)
+*
+* Consecutive `**` segments are collapsed (`a.**.**.b` ≡ `a.**.b`).
 */
 function pathToRegExp(pattern) {
-	const regexStr = pattern.split(".").map((segment) => {
-		if (segment === "**") return ".*";
-		if (segment === "*") return "[^.]+";
-		return segment.replace(/[$()*+.?[\\\]^{|}]/g, "\\$&");
-	}).join("\\.");
+	const segments = pattern.split(".").filter((seg, i, arr) => !(seg === "**" && arr[i - 1] === "**"));
+	const lastIndex = segments.length - 1;
+	let regexStr = "";
+	for (const [i, segment] of segments.entries()) {
+		const prevOwnsRightDot = i > 0 && segments[i - 1] === "**" && i - 1 < lastIndex;
+		if (i > 0 && !prevOwnsRightDot && !(segment === "**" && i === lastIndex && i > 0)) regexStr += String.raw`\.`;
+		if (segment === "**") {
+			if (lastIndex === 0) regexStr += ".*";
+			else if (i === lastIndex) regexStr += String.raw`(?:\..*)?`;
+			else regexStr += String.raw`(?:.*\.)?`;
+			continue;
+		}
+		regexStr += segment === "*" ? "[^.]+" : segment.replace(/[$()*+.?[\\\]^{|}]/g, "\\$&");
+	}
 	return /* @__PURE__ */ new RegExp(`^${regexStr}$`);
 }
 /** Pre-compiled path matchers keyed by pattern string for perf */
@@ -580,7 +603,11 @@ function isPlainObject(value) {
 
 //#endregion
 //#region src/utils/sampling.utils.ts
-const ALWAYS_EMIT_LEVELS = new Set(["error", "fatal"]);
+const ALWAYS_EMIT_LEVELS = new Set([
+	"error",
+	"warn",
+	"fatal"
+]);
 var Sampler = class {
 	constructor(config, onStats) {
 		this.sampledTraces = /* @__PURE__ */ new Set();
@@ -714,6 +741,9 @@ var Sampler = class {
 /** Module-level registry of all logger instances that have opted into graceful shutdown */
 const registry = /* @__PURE__ */ new Set();
 let shutdownHandlerRegistered = false;
+/** Our own handler + the signals we attached it to, so reset() can detach exactly it. */
+let activeHandler;
+let activeSignals = [];
 /**
 * Register a logger instance so it is included in the graceful shutdown flush.
 * Called automatically when `gracefulShutdown: true` is set in logger config.
@@ -755,7 +785,9 @@ function flushOnExit(options = {}) {
 			process.exit(0);
 		}
 	};
-	for (const signal of signals) if (process.listenerCount(signal) === 0) process.on(signal, handler);
+	activeHandler = handler;
+	activeSignals = signals;
+	for (const signal of signals) process.on(signal, activeHandler);
 }
 /**
 * Remove all graceful shutdown handlers and clear the registry.
@@ -763,6 +795,9 @@ function flushOnExit(options = {}) {
 */
 function resetShutdownHandlers() {
 	registry.clear();
+	if (activeHandler) for (const signal of activeSignals) process.removeListener(signal, activeHandler);
+	activeHandler = void 0;
+	activeSignals = [];
 	shutdownHandlerRegistered = false;
 }
 
@@ -989,6 +1024,17 @@ function toValidTraceId(value) {
 	const trimmed = first.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
+/** W3C trace-context: `version-traceId(32hex)-spanId(16hex)-flags(2hex)`. */
+const W3C_TRACEPARENT_RE = /^[\da-f]{2}-([\da-f]{32})-[\da-f]{16}-[\da-f]{2}$/i;
+/**
+* Extract the 32-hex trace-id segment from a W3C `traceparent` header value.
+* Returns the parsed trace ID, or the original value unchanged when it is not a
+* well-formed traceparent (so non-W3C propagation still works).
+*/
+function parseTraceparent(value) {
+	const m = W3C_TRACEPARENT_RE.exec(value);
+	return m ? m[1] : value;
+}
 /** Extract trace ID from request using configuration (header → query → body → params). */
 function extractTraceId(request, config) {
 	const req = request;
@@ -996,8 +1042,9 @@ function extractTraceId(request, config) {
 		const headers = Array.isArray(config.header) ? config.header : [config.header];
 		for (const header of headers) {
 			var _req$headers;
-			const value = toValidTraceId((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[header.toLowerCase()]);
-			if (value) return value;
+			const lower = header.toLowerCase();
+			const value = toValidTraceId((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[lower]);
+			if (value) return lower === "traceparent" ? parseTraceparent(value) : value;
 		}
 	}
 	if (config.query) {
@@ -1175,7 +1222,7 @@ var LogixiaLogger = class LogixiaLogger {
 			...this.config.levelOptions,
 			level: resolvedLevel
 		};
-		if (!this.config.fields) this.config.fields = {
+		this.config.fields ??= {
 			timestamp: "[yyyy-mm-dd HH:MM:ss.MS]",
 			level: "[log_level]",
 			appName: "[app_name]",
@@ -1275,8 +1322,8 @@ var LogixiaLogger = class LogixiaLogger {
 		]) {
 			var _this$config$fields;
 			if (this.fieldState.has(f)) this._fieldCache.set(f, this.fieldState.get(f));
-			else if (((_this$config$fields = this.config.fields) === null || _this$config$fields === void 0 ? void 0 : _this$config$fields[f]) !== void 0) this._fieldCache.set(f, this.config.fields[f] !== false);
-			else this._fieldCache.set(f, true);
+			else if (((_this$config$fields = this.config.fields) === null || _this$config$fields === void 0 ? void 0 : _this$config$fields[f]) === void 0) this._fieldCache.set(f, true);
+			else this._fieldCache.set(f, this.config.fields[f] !== false);
 		}
 		const colorize = ((_this$config$format = this.config.format) === null || _this$config$format === void 0 ? void 0 : _this$config$format.colorize) ?? true;
 		this._formattedLevels = /* @__PURE__ */ new Map();
@@ -1312,9 +1359,9 @@ var LogixiaLogger = class LogixiaLogger {
 			} else this._formattedLevels.set(lvl, `[${upper}] `);
 		}
 		const appNameRaw = `[${this.config.appName ?? "App"}]`;
-		if (this._fieldCache.get("appName") !== false) this._formattedAppName = colorize ? `${this._colorMap.get("gray")}${appNameRaw}${this._colorMap.get("reset")} ` : `${appNameRaw} `;
-		else this._formattedAppName = "";
-		this._hasRedact = !!(this.config.redact && ((((_this$config$redact$p = this.config.redact.paths) === null || _this$config$redact$p === void 0 ? void 0 : _this$config$redact$p.length) ?? 0) > 0 || (((_this$config$redact$p2 = this.config.redact.patterns) === null || _this$config$redact$p2 === void 0 ? void 0 : _this$config$redact$p2.length) ?? 0) > 0));
+		if (this._fieldCache.get("appName") === false) this._formattedAppName = "";
+		else this._formattedAppName = colorize ? `${this._colorMap.get("gray")}${appNameRaw}${this._colorMap.get("reset")} ` : `${appNameRaw} `;
+		this._hasRedact = !!(this.config.redact && ((((_this$config$redact$p = this.config.redact.paths) === null || _this$config$redact$p === void 0 ? void 0 : _this$config$redact$p.length) ?? 0) > 0 || (((_this$config$redact$p2 = this.config.redact.patterns) === null || _this$config$redact$p2 === void 0 ? void 0 : _this$config$redact$p2.length) ?? 0) > 0 || !!this.config.redact.autoDetect));
 	}
 	async error(messageOrError, data) {
 		if (isError(messageOrError)) await this.log("error", messageOrError.message, {
@@ -1456,10 +1503,14 @@ var LogixiaLogger = class LogixiaLogger {
 	}
 	child(context, data) {
 		const childLogger = new LogixiaLogger(this.config, context);
-		if (data) childLogger.contextData = {
+		const mergedContextData = {
 			...this.contextData,
 			...data
 		};
+		if (Object.keys(mergedContextData).length > 0) {
+			childLogger.contextData = mergedContextData;
+			childLogger._hasContextData = true;
+		}
 		return childLogger;
 	}
 	/**
@@ -1615,6 +1666,7 @@ var LogixiaLogger = class LogixiaLogger {
 			return;
 		} catch (error) {
 			require_transport_manager.internalError("Transport write failed", error);
+			if (this._pluginRegistry.size > 0) await this._pluginRegistry.runOnError(error instanceof Error ? error : new Error(String(error)), entry);
 		}
 		(level === LogLevel.ERROR ? process.stderr : process.stdout).write(message + "\n");
 	}
@@ -2567,4 +2619,4 @@ Object.defineProperty(exports, 'usePlugin', {
     return usePlugin;
   }
 });
-//# sourceMappingURL=logitron-logger.module-DC0qwI3N.js.map
+//# sourceMappingURL=logitron-logger.module-bJ1hGhaL.js.map