logixia 1.13.0 → 1.13.3

package/dist/middleware.js

@@ -1,12 +1,60 @@
+const require_internal_log = require('./internal-log-BUJYMZbE.js');
 const require_safe_stringify = require('./safe-stringify-DWo3aZp_.js');
+const require_trace_utils = require('./trace.utils-DpBOLDtq.js');
 
 //#region src/middleware/http-logger.ts
-const DEFAULT_REDACT_HEADERS = new Set([
+const DEFAULT_REDACT_HEADERS = [
 	"authorization",
 	"cookie",
 	"set-cookie",
-	"x-api-key"
-]);
+	"x-api-key",
+	"proxy-authorization",
+	"x-auth-token",
+	"x-access-token",
+	"x-csrf-token",
+	"x-amz-security-token"
+];
+const DEFAULT_REDACT_QUERY_PARAMS = [
+	"token",
+	"access_token",
+	"refresh_token",
+	"code",
+	"password",
+	"secret",
+	"api_key",
+	"apikey",
+	"key",
+	"signature",
+	"sig",
+	"auth"
+];
+function buildNameSet(defaults, extra) {
+	return new Set([...defaults, ...extra ?? []].map((n) => n.toLowerCase()));
+}
+function safeDecode(value) {
+	try {
+		return decodeURIComponent(value.replace(/\+/g, " "));
+	} catch {
+		return value;
+	}
+}
+/** Replace the values of sensitive query parameters, leaving the rest verbatim. */
+function sanitizeUrl(url, redactParams) {
+	const q = url.indexOf("?");
+	if (q === -1) return url;
+	const hashAt = url.indexOf("#", q);
+	const query = url.slice(q + 1, hashAt === -1 ? void 0 : hashAt);
+	const hash = hashAt === -1 ? "" : url.slice(hashAt);
+	const cleaned = query.split("&").map((pair) => {
+		const eq = pair.indexOf("=");
+		const rawKey = eq === -1 ? pair : pair.slice(0, eq);
+		const decoded = safeDecode(rawKey);
+		const bracket = decoded.indexOf("[");
+		const name = (bracket === -1 ? decoded : decoded.slice(0, bracket)).toLowerCase();
+		return redactParams.has(name) && eq !== -1 ? `${rawKey}=[REDACTED]` : pair;
+	}).join("&");
+	return `${url.slice(0, q)}?${cleaned}${hash}`;
+}
 function sanitizeHeaders(headers, redactSet) {
 	if (!headers) return {};
 	const out = {};
@@ -16,16 +64,25 @@ function sanitizeHeaders(headers, redactSet) {
 	}
 	return out;
 }
+/** Fire-and-forget a logger call; a failing log must never become an unhandled rejection. */
+function fire(result) {
+	if (result && typeof result.catch === "function") result.catch((error) => require_internal_log.internalError("http-logger: log call failed", error));
+}
 function shortId() {
 	return Math.random().toString(36).slice(2, 10);
 }
-function buildBaseFields(req, traceId, options) {
+function resolveNameSets(options) {
+	return {
+		headers: buildNameSet(DEFAULT_REDACT_HEADERS, options.redactHeaders),
+		queryParams: buildNameSet(DEFAULT_REDACT_QUERY_PARAMS, options.redactQueryParams)
+	};
+}
+function buildBaseFields(req, traceId, options, { headers: redactSet, queryParams: paramSet }) {
 	var _req$method, _req$socket;
-	const redactSet = options.redactHeaders ? new Set(options.redactHeaders.map((h) => h.toLowerCase())) : DEFAULT_REDACT_HEADERS;
 	const fields = {
 		traceId,
 		method: ((_req$method = req.method) === null || _req$method === void 0 ? void 0 : _req$method.toUpperCase()) ?? "UNKNOWN",
-		url: req.url ?? "/",
+		url: sanitizeUrl(req.url ?? "/", paramSet),
 		ip: req.ip ?? ((_req$socket = req.socket) === null || _req$socket === void 0 ? void 0 : _req$socket.remoteAddress) ?? "unknown",
 		headers: sanitizeHeaders(req.headers, redactSet)
 	};
@@ -37,19 +94,21 @@ function buildBaseFields(req, traceId, options) {
 */
 function createExpressMiddleware(logger, options = {}) {
 	const { skip, logBody, bodyMaxBytes, traceIdHeader = "x-trace-id", requestLevel = "debug", responseLevel = "info", errorLevel = "error", slowRequestThresholdMs = 1e3 } = options;
+	const nameSets = resolveNameSets(options);
+	const traceHeaderName = traceIdHeader.toLowerCase();
 	return function logixiaHttpMiddleware(req, res, next) {
 		var _req$headers, _res$once, _res$once2;
 		if (skip === null || skip === void 0 ? void 0 : skip(req)) {
 			next();
 			return;
 		}
-		const traceId = ((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[traceIdHeader]) ?? shortId();
+		const traceId = require_trace_utils.sanitizeIncomingId((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[traceHeaderName]) ?? shortId();
 		const startMs = Date.now();
-		const baseFields = buildBaseFields(req, traceId, options);
-		if (requestLevel !== "silent") logger.logLevel(requestLevel, "request started", {
+		const baseFields = buildBaseFields(req, traceId, options, nameSets);
+		if (requestLevel !== "silent") fire(logger.logLevel(requestLevel, "request started", {
 			...baseFields,
 			...logBody && req.body ? { body: truncateBody(req.body, bodyMaxBytes) } : {}
-		});
+		}));
 		let completed = false;
 		const onFinish = () => {
 			if (completed) return;
@@ -57,17 +116,17 @@ function createExpressMiddleware(logger, options = {}) {
 			const duration = Date.now() - startMs;
 			const status = res.statusCode ?? 0;
 			const level = status >= 500 ? errorLevel : responseLevel;
-			logger.logLevel(level, "request completed", {
+			fire(logger.logLevel(level, "request completed", {
 				...baseFields,
 				statusCode: status,
 				duration
-			});
-			if (duration > slowRequestThresholdMs) logger.warn("slow request detected", {
+			}));
+			if (duration > slowRequestThresholdMs) fire(logger.warn("slow request detected", {
 				...baseFields,
 				statusCode: status,
 				duration,
 				threshold: slowRequestThresholdMs
-			});
+			}));
 		};
 		(_res$once = res.once) === null || _res$once === void 0 || _res$once.call(res, "finish", onFinish);
 		(_res$once2 = res.once) === null || _res$once2 === void 0 || _res$once2.call(res, "close", onFinish);
@@ -84,6 +143,8 @@ function createExpressMiddleware(logger, options = {}) {
 */
 function createFastifyPlugin(logger, options = {}) {
 	const { skip, traceIdHeader = "x-trace-id", requestLevel = "debug", responseLevel = "info", errorLevel = "error", slowRequestThresholdMs = 1e3 } = options;
+	const nameSets = resolveNameSets(options);
+	const traceHeaderName = traceIdHeader.toLowerCase();
 	function logixiaFastifyPlugin(fastify, _opts, done) {
 		fastify.addHook("onRequest", (request, _reply, hookDone) => {
 			var _req$headers2;
@@ -92,10 +153,10 @@ function createFastifyPlugin(logger, options = {}) {
 				hookDone();
 				return;
 			}
-			const traceId = ((_req$headers2 = req.headers) === null || _req$headers2 === void 0 ? void 0 : _req$headers2[traceIdHeader]) ?? shortId();
+			const traceId = require_trace_utils.sanitizeIncomingId((_req$headers2 = req.headers) === null || _req$headers2 === void 0 ? void 0 : _req$headers2[traceHeaderName]) ?? shortId();
 			req._logixiaStart = Date.now();
 			req._logixiaId = traceId;
-			if (requestLevel !== "silent") logger.logLevel(requestLevel, "request started", buildBaseFields(req, traceId, options));
+			if (requestLevel !== "silent") fire(logger.logLevel(requestLevel, "request started", buildBaseFields(req, traceId, options, nameSets)));
 			hookDone();
 		});
 		fastify.addHook("onResponse", (request, reply, hookDone) => {
@@ -109,18 +170,19 @@ function createFastifyPlugin(logger, options = {}) {
 			const status = rep.statusCode ?? 0;
 			const traceId = req._logixiaId ?? shortId();
 			const level = status >= 500 ? errorLevel : responseLevel;
-			logger.logLevel(level, "request completed", {
-				...buildBaseFields(req, traceId, options),
+			const baseFields = buildBaseFields(req, traceId, options, nameSets);
+			fire(logger.logLevel(level, "request completed", {
+				...baseFields,
 				statusCode: status,
 				duration
-			});
-			if (duration > slowRequestThresholdMs) logger.warn("slow request detected", {
+			}));
+			if (duration > slowRequestThresholdMs) fire(logger.warn("slow request detected", {
 				traceId,
-				url: req.url,
+				url: baseFields.url,
 				method: req.method,
 				duration,
 				threshold: slowRequestThresholdMs
-			});
+			}));
 			hookDone();
 		});
 		done();
@@ -130,14 +192,76 @@ function createFastifyPlugin(logger, options = {}) {
 		[Symbol.for("fastify.display-name")]: "logixia"
 	});
 }
+/**
+* Bound the captured body without turning it into a string, so the logger's
+* path-based redaction still sees the original keys. Oversized structures are
+* pruned (extra keys/items dropped, long strings cut) rather than serialized.
+*/
 function truncateBody(body, maxBytes = 4096) {
 	if (typeof body === "string") return body.length > maxBytes ? body.slice(0, maxBytes) + "…[truncated]" : body;
 	if (body && typeof body === "object") {
-		const str = require_safe_stringify.stringifyForLog(body);
-		if (str.length > maxBytes) return str.slice(0, maxBytes) + "…[truncated]";
+		if (require_safe_stringify.stringifyForLog(body).length <= maxBytes) return body;
+		return pruneValue(body, { left: maxBytes }, 0, /* @__PURE__ */ new Set());
 	}
 	return body;
 }
+const TRUNCATED = "…[truncated]";
+const MAX_PRUNE_DEPTH = 8;
+function pruneValue(value, budget, depth, ancestors) {
+	if (typeof value === "string") {
+		const cut = value.slice(0, Math.max(0, budget.left));
+		budget.left -= cut.length;
+		return cut.length < value.length ? cut + TRUNCATED : cut;
+	}
+	if (value === null || typeof value !== "object") {
+		budget.left -= 8;
+		return value;
+	}
+	if (value instanceof Date) {
+		budget.left -= 24;
+		return Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+	}
+	if (value instanceof ArrayBuffer || ArrayBuffer.isView(value)) {
+		budget.left -= 16;
+		return `[Buffer ${value.byteLength} bytes]`;
+	}
+	if (value instanceof Error) return value;
+	if (ancestors.has(value) || depth >= MAX_PRUNE_DEPTH) return TRUNCATED;
+	ancestors.add(value);
+	try {
+		if (Array.isArray(value) || value instanceof Set || value instanceof Map) {
+			const items = [];
+			for (const item of value instanceof Map ? value.entries() : value) {
+				if (budget.left <= 0) {
+					items.push(TRUNCATED);
+					break;
+				}
+				items.push(pruneValue(item, budget, depth + 1, ancestors));
+			}
+			return items;
+		}
+		const toJSON = value.toJSON;
+		if (typeof toJSON === "function") {
+			const json = toJSON.call(value);
+			if (json !== value) return pruneValue(json, budget, depth + 1, ancestors);
+		}
+		const record = {};
+		for (const [k, v] of Object.entries(value)) {
+			if (k === "__proto__" || k === "constructor" || k === "prototype") continue;
+			if (budget.left <= 0) {
+				record["…"] = TRUNCATED;
+				break;
+			}
+			budget.left -= k.length;
+			record[k] = pruneValue(v, budget, depth + 1, ancestors);
+		}
+		return record;
+	} catch {
+		return TRUNCATED;
+	} finally {
+		ancestors.delete(value);
+	}
+}
 
 //#endregion
 exports.createExpressMiddleware = createExpressMiddleware;

package/dist/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","names":["out: Record<string, unknown>","fields: Record<string, unknown>","stringifyForLog"],"sources":["../src/middleware/http-logger.ts"],"sourcesContent":["/**\n * HTTP request/response logging middleware — Morgan replacement.\n *\n * Fixes every documented Morgan bug:\n *  - statusCode always captured correctly, even for requests > 20 s\n *  - Logs request START (with traceId) and response FINISH (with duration)\n *  - Captures errors before and after response\n *  - Auto-redacts Authorization / Cookie / Set-Cookie headers\n *  - Slow-request warnings\n *  - Skip predicates for health-check routes / static assets\n *\n * @example Express\n * ```ts\n * import { createExpressMiddleware } from 'logixia/middleware';\n * app.use(createExpressMiddleware(logger));\n * ```\n *\n * @example Fastify\n * ```ts\n * import { createFastifyPlugin } from 'logixia/middleware';\n * await fastify.register(createFastifyPlugin(logger));\n * ```\n */\n\nimport type { IBaseLogger } from '../types';\nimport { stringifyForLog } from '../utils/safe-stringify';\n\n// ── Shared types ─────────────────────────────────────────────────────────────\n\nexport interface HttpLoggerOptions {\n  /**\n   * Skip logging for a request. Called before any I/O.\n   * @example `skip: (req) => req.url === '/health'`\n   */\n  skip?: (req: IncomingRequest) => boolean;\n  /**\n   * Log request body (POST/PUT/PATCH). Capped at `bodyMaxBytes` (default: 4096).\n   * Redaction still applies to the captured body.\n   * Default: false.\n   */\n  logBody?: boolean;\n  /** Max bytes of body to capture. Default: 4096. */\n  bodyMaxBytes?: number;\n  /**\n   * Emit a WARN log when a request duration exceeds this threshold (ms).\n   * Default: 1000.\n   */\n  slowRequestThresholdMs?: number;\n  /**\n   * Additional fields to include in every log entry.\n   * @example `extraFields: (req) => ({ tenantId: req.headers['x-tenant-id'] })`\n   */\n  extraFields?: (req: IncomingRequest) => Record<string, unknown>;\n  /**\n   * Trace ID header. Default: 'x-trace-id'.\n   * If the header is absent, a short random ID is generated.\n   */\n  traceIdHeader?: string;\n  /**\n   * Headers to redact from logged output.\n   * Default: ['authorization', 'cookie', 'set-cookie', 'x-api-key'].\n   */\n  redactHeaders?: string[];\n  /**\n   * Log level for request-start entries. Default: 'debug'.\n   * Set to 'silent' to suppress request-start logs entirely.\n   */\n  requestLevel?: string;\n  /** Log level for successful response entries. Default: 'info'. */\n  responseLevel?: string;\n  /** Log level for error responses (status ≥ 500). Default: 'error'. */\n  errorLevel?: string;\n}\n\n// Minimal structural types so we don't need @types/express / fastify in core\nexport interface IncomingRequest {\n  method?: string;\n  url?: string;\n  headers?: Record<string, string | string[] | undefined>;\n  body?: unknown;\n  socket?: { remoteAddress?: string };\n  ip?: string;\n}\n\nexport interface OutgoingResponse {\n  statusCode?: number;\n  on?: (event: string, cb: () => void) => void;\n  once?: (event: string, cb: () => void) => void;\n  getHeader?: (name: string) => string | number | string[] | undefined;\n}\n\n// ── Helpers ───────────────────────────────────────────────────────────────────\n\nconst DEFAULT_REDACT_HEADERS = new Set(['authorization', 'cookie', 'set-cookie', 'x-api-key']);\n\nfunction sanitizeHeaders(\n  headers: Record<string, string | string[] | undefined> | undefined,\n  redactSet: Set<string>\n): Record<string, unknown> {\n  if (!headers) return {};\n  const out: Record<string, unknown> = {};\n  for (const [k, v] of Object.entries(headers)) {\n    if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;\n    out[k] = redactSet.has(k.toLowerCase()) ? '[REDACTED]' : v;\n  }\n  return out;\n}\n\nfunction shortId(): string {\n  // eslint-disable-next-line sonarjs/pseudo-random -- non-security request ID\n  return Math.random().toString(36).slice(2, 10);\n}\n\nfunction buildBaseFields(\n  req: IncomingRequest,\n  traceId: string,\n  options: HttpLoggerOptions\n): Record<string, unknown> {\n  const redactSet = options.redactHeaders\n    ? new Set(options.redactHeaders.map((h) => h.toLowerCase()))\n    : DEFAULT_REDACT_HEADERS;\n\n  const fields: Record<string, unknown> = {\n    traceId,\n    method: req.method?.toUpperCase() ?? 'UNKNOWN',\n    url: req.url ?? '/',\n    ip: req.ip ?? req.socket?.remoteAddress ?? 'unknown',\n    headers: sanitizeHeaders(req.headers, redactSet),\n  };\n\n  if (options.extraFields) {\n    Object.assign(fields, options.extraFields(req));\n  }\n\n  return fields;\n}\n\n// ── Express middleware ────────────────────────────────────────────────────────\n\n/**\n * Create an Express / Connect compatible middleware that replaces Morgan.\n */\nexport function createExpressMiddleware(\n  logger: IBaseLogger,\n  options: HttpLoggerOptions = {}\n): (req: IncomingRequest, res: OutgoingResponse, next: () => void) => void {\n  const {\n    skip,\n    logBody,\n    bodyMaxBytes,\n    traceIdHeader = 'x-trace-id',\n    requestLevel = 'debug',\n    responseLevel = 'info',\n    errorLevel = 'error',\n    slowRequestThresholdMs = 1000,\n  } = options;\n\n  return function logixiaHttpMiddleware(\n    req: IncomingRequest,\n    res: OutgoingResponse,\n    next: () => void\n  ): void {\n    if (skip?.(req)) {\n      next();\n      return;\n    }\n\n    const traceId = (req.headers?.[traceIdHeader] as string | undefined) ?? shortId();\n    const startMs = Date.now();\n    const baseFields = buildBaseFields(req, traceId, options);\n\n    // Log request start\n    if (requestLevel !== 'silent') {\n      void logger.logLevel(requestLevel, 'request started', {\n        ...baseFields,\n        ...(logBody && req.body ? { body: truncateBody(req.body, bodyMaxBytes) } : {}),\n      });\n    }\n\n    // Hook into the response 'finish' event — fires after headers + body are sent.\n    // This is what Morgan gets wrong for slow requests (it uses 'close' which may\n    // fire before the status code is set on some Node versions).\n    //\n    // BOTH 'finish' and 'close' fire on a normal response, so guard against\n    // logging the completion twice (which would duplicate the completed entry and\n    // the slow-request warning).\n    let completed = false;\n    const onFinish = (): void => {\n      if (completed) return;\n      completed = true;\n\n      const duration = Date.now() - startMs;\n      const status = res.statusCode ?? 0;\n      const level = status >= 500 ? errorLevel : responseLevel;\n\n      void logger.logLevel(level, 'request completed', {\n        ...baseFields,\n        statusCode: status,\n        duration,\n      });\n\n      if (duration > slowRequestThresholdMs) {\n        void logger.warn('slow request detected', {\n          ...baseFields,\n          statusCode: status,\n          duration,\n          threshold: slowRequestThresholdMs,\n        });\n      }\n    };\n\n    res.once?.('finish', onFinish);\n    // Fallback: also covers a client that disconnects before 'finish' fires. The\n    // `completed` guard ensures a normal finish+close pair logs only once.\n    res.once?.('close', onFinish);\n\n    next();\n  };\n}\n\n// ── Fastify plugin ─────────────────────────────────────────────────────────────\n\nexport interface FastifyInstance {\n  addHook: (name: string, fn: (req: unknown, reply: unknown, done: () => void) => void) => void;\n}\n\n/**\n * Create a Fastify plugin (a function you pass to `fastify.register()`).\n *\n * @example\n * ```ts\n * await fastify.register(createFastifyPlugin(logger, { slowRequestThresholdMs: 500 }));\n * ```\n */\nexport function createFastifyPlugin(logger: IBaseLogger, options: HttpLoggerOptions = {}) {\n  const {\n    skip,\n    traceIdHeader = 'x-trace-id',\n    requestLevel = 'debug',\n    responseLevel = 'info',\n    errorLevel = 'error',\n    slowRequestThresholdMs = 1000,\n  } = options;\n\n  function logixiaFastifyPlugin(fastify: FastifyInstance, _opts: unknown, done: () => void): void {\n    fastify.addHook('onRequest', (request: unknown, _reply: unknown, hookDone: () => void) => {\n      const req = request as IncomingRequest & { _logixiaStart?: number; _logixiaId?: string };\n      if (skip?.(req)) {\n        hookDone();\n        return;\n      }\n\n      const traceId = (req.headers?.[traceIdHeader] as string | undefined) ?? shortId();\n      req._logixiaStart = Date.now();\n      req._logixiaId = traceId;\n\n      if (requestLevel !== 'silent') {\n        void logger.logLevel(\n          requestLevel,\n          'request started',\n          buildBaseFields(req, traceId, options)\n        );\n      }\n      hookDone();\n    });\n\n    fastify.addHook('onResponse', (request: unknown, reply: unknown, hookDone: () => void) => {\n      const req = request as IncomingRequest & { _logixiaStart?: number; _logixiaId?: string };\n      if (req._logixiaStart === undefined) {\n        hookDone();\n        return;\n      }\n\n      const rep = reply as { statusCode?: number };\n      const duration = Date.now() - req._logixiaStart;\n      const status = rep.statusCode ?? 0;\n      const traceId = req._logixiaId ?? shortId();\n      const level = status >= 500 ? errorLevel : responseLevel;\n\n      void logger.logLevel(level, 'request completed', {\n        ...buildBaseFields(req, traceId, options),\n        statusCode: status,\n        duration,\n      });\n\n      if (duration > slowRequestThresholdMs) {\n        void logger.warn('slow request detected', {\n          traceId,\n          url: req.url,\n          method: req.method,\n          duration,\n          threshold: slowRequestThresholdMs,\n        });\n      }\n\n      hookDone();\n    });\n\n    done();\n  }\n\n  return Object.assign(logixiaFastifyPlugin, {\n    [Symbol.for('skip-override')]: true,\n    [Symbol.for('fastify.display-name')]: 'logixia',\n  });\n}\n\n// ── Internal helpers ──────────────────────────────────────────────────────────\n\nfunction truncateBody(body: unknown, maxBytes = 4096): unknown {\n  if (typeof body === 'string') {\n    return body.length > maxBytes ? body.slice(0, maxBytes) + '…[truncated]' : body;\n  }\n  if (body && typeof body === 'object') {\n    const str = stringifyForLog(body);\n    if (str.length > maxBytes) {\n      return str.slice(0, maxBytes) + '…[truncated]';\n    }\n  }\n  return body;\n}\n"],"mappings":"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"}
+{"version":3,"file":"middleware.js","names":["out: Record<string, unknown>","internalError","fields: Record<string, unknown>","sanitizeIncomingId","stringifyForLog","items: unknown[]","json: unknown","record: Record<string, unknown>"],"sources":["../src/middleware/http-logger.ts"],"sourcesContent":["/**\n * HTTP request/response logging middleware — Morgan replacement.\n *\n * Fixes every documented Morgan bug:\n *  - statusCode always captured correctly, even for requests > 20 s\n *  - Logs request START (with traceId) and response FINISH (with duration)\n *  - Captures errors before and after response\n *  - Auto-redacts Authorization / Cookie / Set-Cookie headers\n *  - Slow-request warnings\n *  - Skip predicates for health-check routes / static assets\n *\n * @example Express\n * ```ts\n * import { createExpressMiddleware } from 'logixia/middleware';\n * app.use(createExpressMiddleware(logger));\n * ```\n *\n * @example Fastify\n * ```ts\n * import { createFastifyPlugin } from 'logixia/middleware';\n * await fastify.register(createFastifyPlugin(logger));\n * ```\n */\n\nimport type { IBaseLogger } from '../types';\nimport { internalError } from '../utils/internal-log';\nimport { stringifyForLog } from '../utils/safe-stringify';\nimport { sanitizeIncomingId } from '../utils/trace.utils';\n\n// ── Shared types ─────────────────────────────────────────────────────────────\n\nexport interface HttpLoggerOptions {\n  /**\n   * Skip logging for a request. Called before any I/O.\n   * @example `skip: (req) => req.url === '/health'`\n   */\n  skip?: (req: IncomingRequest) => boolean;\n  /**\n   * Log request body (POST/PUT/PATCH). Capped at `bodyMaxBytes` (default: 4096).\n   * Redaction still applies to the captured body.\n   * Default: false.\n   */\n  logBody?: boolean;\n  /** Max bytes of body to capture. Default: 4096. */\n  bodyMaxBytes?: number;\n  /**\n   * Emit a WARN log when a request duration exceeds this threshold (ms).\n   * Default: 1000.\n   */\n  slowRequestThresholdMs?: number;\n  /**\n   * Additional fields to include in every log entry.\n   * @example `extraFields: (req) => ({ tenantId: req.headers['x-tenant-id'] })`\n   */\n  extraFields?: (req: IncomingRequest) => Record<string, unknown>;\n  /**\n   * Trace ID header. Default: 'x-trace-id'.\n   * If the header is absent, a short random ID is generated.\n   */\n  traceIdHeader?: string;\n  /**\n   * Additional headers to redact from logged output. Merged with the defaults\n   * (authorization, cookie, set-cookie, x-api-key, proxy-authorization,\n   * x-auth-token, x-access-token, x-csrf-token, x-amz-security-token).\n   */\n  redactHeaders?: string[];\n  /**\n   * Additional query-string parameter names whose values are redacted from the\n   * logged URL. Merged with the defaults (token, access_token, refresh_token,\n   * code, password, secret, api_key, apikey, key, signature, sig, auth).\n   */\n  redactQueryParams?: string[];\n  /**\n   * Log level for request-start entries. Default: 'debug'.\n   * Set to 'silent' to suppress request-start logs entirely.\n   */\n  requestLevel?: string;\n  /** Log level for successful response entries. Default: 'info'. */\n  responseLevel?: string;\n  /** Log level for error responses (status ≥ 500). Default: 'error'. */\n  errorLevel?: string;\n}\n\n// Minimal structural types so we don't need @types/express / fastify in core\nexport interface IncomingRequest {\n  method?: string;\n  url?: string;\n  headers?: Record<string, string | string[] | undefined>;\n  body?: unknown;\n  socket?: { remoteAddress?: string };\n  ip?: string;\n}\n\nexport interface OutgoingResponse {\n  statusCode?: number;\n  on?: (event: string, cb: () => void) => void;\n  once?: (event: string, cb: () => void) => void;\n  getHeader?: (name: string) => string | number | string[] | undefined;\n}\n\n// ── Helpers ───────────────────────────────────────────────────────────────────\n\nconst DEFAULT_REDACT_HEADERS = [\n  'authorization',\n  'cookie',\n  'set-cookie',\n  'x-api-key',\n  'proxy-authorization',\n  'x-auth-token',\n  'x-access-token',\n  'x-csrf-token',\n  'x-amz-security-token',\n];\n\nconst DEFAULT_REDACT_QUERY_PARAMS = [\n  'token',\n  'access_token',\n  'refresh_token',\n  'code',\n  'password',\n  'secret',\n  'api_key',\n  'apikey',\n  'key',\n  'signature',\n  'sig',\n  'auth',\n];\n\nfunction buildNameSet(defaults: readonly string[], extra: readonly string[] | undefined) {\n  return new Set([...defaults, ...(extra ?? [])].map((n) => n.toLowerCase()));\n}\n\nfunction safeDecode(value: string): string {\n  try {\n    return decodeURIComponent(value.replace(/\\+/g, ' '));\n  } catch {\n    return value;\n  }\n}\n\n/** Replace the values of sensitive query parameters, leaving the rest verbatim. */\nfunction sanitizeUrl(url: string, redactParams: Set<string>): string {\n  const q = url.indexOf('?');\n  if (q === -1) return url;\n  const hashAt = url.indexOf('#', q);\n  const query = url.slice(q + 1, hashAt === -1 ? undefined : hashAt);\n  const hash = hashAt === -1 ? '' : url.slice(hashAt);\n  const cleaned = query\n    .split('&')\n    .map((pair) => {\n      const eq = pair.indexOf('=');\n      const rawKey = eq === -1 ? pair : pair.slice(0, eq);\n      const decoded = safeDecode(rawKey);\n      const bracket = decoded.indexOf('[');\n      const name = (bracket === -1 ? decoded : decoded.slice(0, bracket)).toLowerCase();\n      return redactParams.has(name) && eq !== -1 ? `${rawKey}=[REDACTED]` : pair;\n    })\n    .join('&');\n  return `${url.slice(0, q)}?${cleaned}${hash}`;\n}\n\nfunction sanitizeHeaders(\n  headers: Record<string, string | string[] | undefined> | undefined,\n  redactSet: Set<string>\n): Record<string, unknown> {\n  if (!headers) return {};\n  const out: Record<string, unknown> = {};\n  for (const [k, v] of Object.entries(headers)) {\n    if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;\n    out[k] = redactSet.has(k.toLowerCase()) ? '[REDACTED]' : v;\n  }\n  return out;\n}\n\n/** Fire-and-forget a logger call; a failing log must never become an unhandled rejection. */\nfunction fire(result: unknown): void {\n  if (result && typeof (result as Promise<unknown>).catch === 'function') {\n    (result as Promise<unknown>).catch((error: unknown) =>\n      internalError('http-logger: log call failed', error)\n    );\n  }\n}\n\nfunction shortId(): string {\n  // eslint-disable-next-line sonarjs/pseudo-random -- non-security request ID\n  return Math.random().toString(36).slice(2, 10);\n}\n\ninterface NameSets {\n  headers: Set<string>;\n  queryParams: Set<string>;\n}\n\nfunction resolveNameSets(options: HttpLoggerOptions): NameSets {\n  return {\n    headers: buildNameSet(DEFAULT_REDACT_HEADERS, options.redactHeaders),\n    queryParams: buildNameSet(DEFAULT_REDACT_QUERY_PARAMS, options.redactQueryParams),\n  };\n}\n\nfunction buildBaseFields(\n  req: IncomingRequest,\n  traceId: string,\n  options: HttpLoggerOptions,\n  { headers: redactSet, queryParams: paramSet }: NameSets\n): Record<string, unknown> {\n  const fields: Record<string, unknown> = {\n    traceId,\n    method: req.method?.toUpperCase() ?? 'UNKNOWN',\n    url: sanitizeUrl(req.url ?? '/', paramSet),\n    ip: req.ip ?? req.socket?.remoteAddress ?? 'unknown',\n    headers: sanitizeHeaders(req.headers, redactSet),\n  };\n\n  if (options.extraFields) {\n    Object.assign(fields, options.extraFields(req));\n  }\n\n  return fields;\n}\n\n// ── Express middleware ────────────────────────────────────────────────────────\n\n/**\n * Create an Express / Connect compatible middleware that replaces Morgan.\n */\nexport function createExpressMiddleware(\n  logger: IBaseLogger,\n  options: HttpLoggerOptions = {}\n): (req: IncomingRequest, res: OutgoingResponse, next: () => void) => void {\n  const {\n    skip,\n    logBody,\n    bodyMaxBytes,\n    traceIdHeader = 'x-trace-id',\n    requestLevel = 'debug',\n    responseLevel = 'info',\n    errorLevel = 'error',\n    slowRequestThresholdMs = 1000,\n  } = options;\n  const nameSets = resolveNameSets(options);\n  const traceHeaderName = traceIdHeader.toLowerCase();\n\n  return function logixiaHttpMiddleware(\n    req: IncomingRequest,\n    res: OutgoingResponse,\n    next: () => void\n  ): void {\n    if (skip?.(req)) {\n      next();\n      return;\n    }\n\n    const traceId = sanitizeIncomingId(req.headers?.[traceHeaderName]) ?? shortId();\n    const startMs = Date.now();\n    const baseFields = buildBaseFields(req, traceId, options, nameSets);\n\n    // Log request start\n    if (requestLevel !== 'silent') {\n      fire(\n        logger.logLevel(requestLevel, 'request started', {\n          ...baseFields,\n          ...(logBody && req.body ? { body: truncateBody(req.body, bodyMaxBytes) } : {}),\n        })\n      );\n    }\n\n    // Hook into the response 'finish' event — fires after headers + body are sent.\n    // This is what Morgan gets wrong for slow requests (it uses 'close' which may\n    // fire before the status code is set on some Node versions).\n    //\n    // BOTH 'finish' and 'close' fire on a normal response, so guard against\n    // logging the completion twice (which would duplicate the completed entry and\n    // the slow-request warning).\n    let completed = false;\n    const onFinish = (): void => {\n      if (completed) return;\n      completed = true;\n\n      const duration = Date.now() - startMs;\n      const status = res.statusCode ?? 0;\n      const level = status >= 500 ? errorLevel : responseLevel;\n\n      fire(\n        logger.logLevel(level, 'request completed', {\n          ...baseFields,\n          statusCode: status,\n          duration,\n        })\n      );\n\n      if (duration > slowRequestThresholdMs) {\n        fire(\n          logger.warn('slow request detected', {\n            ...baseFields,\n            statusCode: status,\n            duration,\n            threshold: slowRequestThresholdMs,\n          })\n        );\n      }\n    };\n\n    res.once?.('finish', onFinish);\n    // Fallback: also covers a client that disconnects before 'finish' fires. The\n    // `completed` guard ensures a normal finish+close pair logs only once.\n    res.once?.('close', onFinish);\n\n    next();\n  };\n}\n\n// ── Fastify plugin ─────────────────────────────────────────────────────────────\n\nexport interface FastifyInstance {\n  addHook: (name: string, fn: (req: unknown, reply: unknown, done: () => void) => void) => void;\n}\n\n/**\n * Create a Fastify plugin (a function you pass to `fastify.register()`).\n *\n * @example\n * ```ts\n * await fastify.register(createFastifyPlugin(logger, { slowRequestThresholdMs: 500 }));\n * ```\n */\nexport function createFastifyPlugin(logger: IBaseLogger, options: HttpLoggerOptions = {}) {\n  const {\n    skip,\n    traceIdHeader = 'x-trace-id',\n    requestLevel = 'debug',\n    responseLevel = 'info',\n    errorLevel = 'error',\n    slowRequestThresholdMs = 1000,\n  } = options;\n  const nameSets = resolveNameSets(options);\n  const traceHeaderName = traceIdHeader.toLowerCase();\n\n  function logixiaFastifyPlugin(fastify: FastifyInstance, _opts: unknown, done: () => void): void {\n    fastify.addHook('onRequest', (request: unknown, _reply: unknown, hookDone: () => void) => {\n      const req = request as IncomingRequest & { _logixiaStart?: number; _logixiaId?: string };\n      if (skip?.(req)) {\n        hookDone();\n        return;\n      }\n\n      const traceId = sanitizeIncomingId(req.headers?.[traceHeaderName]) ?? shortId();\n      req._logixiaStart = Date.now();\n      req._logixiaId = traceId;\n\n      if (requestLevel !== 'silent') {\n        fire(\n          logger.logLevel(\n            requestLevel,\n            'request started',\n            buildBaseFields(req, traceId, options, nameSets)\n          )\n        );\n      }\n      hookDone();\n    });\n\n    fastify.addHook('onResponse', (request: unknown, reply: unknown, hookDone: () => void) => {\n      const req = request as IncomingRequest & { _logixiaStart?: number; _logixiaId?: string };\n      if (req._logixiaStart === undefined) {\n        hookDone();\n        return;\n      }\n\n      const rep = reply as { statusCode?: number };\n      const duration = Date.now() - req._logixiaStart;\n      const status = rep.statusCode ?? 0;\n      const traceId = req._logixiaId ?? shortId();\n      const level = status >= 500 ? errorLevel : responseLevel;\n      const baseFields = buildBaseFields(req, traceId, options, nameSets);\n\n      fire(\n        logger.logLevel(level, 'request completed', {\n          ...baseFields,\n          statusCode: status,\n          duration,\n        })\n      );\n\n      if (duration > slowRequestThresholdMs) {\n        fire(\n          logger.warn('slow request detected', {\n            traceId,\n            url: baseFields.url,\n            method: req.method,\n            duration,\n            threshold: slowRequestThresholdMs,\n          })\n        );\n      }\n\n      hookDone();\n    });\n\n    done();\n  }\n\n  return Object.assign(logixiaFastifyPlugin, {\n    [Symbol.for('skip-override')]: true,\n    [Symbol.for('fastify.display-name')]: 'logixia',\n  });\n}\n\n// ── Internal helpers ──────────────────────────────────────────────────────────\n\n/**\n * Bound the captured body without turning it into a string, so the logger's\n * path-based redaction still sees the original keys. Oversized structures are\n * pruned (extra keys/items dropped, long strings cut) rather than serialized.\n */\nfunction truncateBody(body: unknown, maxBytes = 4096): unknown {\n  if (typeof body === 'string') {\n    return body.length > maxBytes ? body.slice(0, maxBytes) + '…[truncated]' : body;\n  }\n  if (body && typeof body === 'object') {\n    const str = stringifyForLog(body);\n    if (str.length <= maxBytes) return body;\n    return pruneValue(body, { left: maxBytes }, 0, new Set());\n  }\n  return body;\n}\n\nconst TRUNCATED = '…[truncated]';\nconst MAX_PRUNE_DEPTH = 8;\n\nfunction pruneValue(\n  value: unknown,\n  budget: { left: number },\n  depth: number,\n  ancestors: Set<object>\n): unknown {\n  if (typeof value === 'string') {\n    const cut = value.slice(0, Math.max(0, budget.left));\n    budget.left -= cut.length;\n    return cut.length < value.length ? cut + TRUNCATED : cut;\n  }\n  if (value === null || typeof value !== 'object') {\n    budget.left -= 8;\n    return value;\n  }\n  if (value instanceof Date) {\n    budget.left -= 24;\n    return Number.isNaN(value.getTime()) ? 'Invalid Date' : value.toISOString();\n  }\n  if (value instanceof ArrayBuffer || ArrayBuffer.isView(value)) {\n    budget.left -= 16;\n    return `[Buffer ${value.byteLength} bytes]`;\n  }\n  if (value instanceof Error) return value;\n  if (ancestors.has(value) || depth >= MAX_PRUNE_DEPTH) return TRUNCATED;\n  ancestors.add(value);\n  try {\n    if (Array.isArray(value) || value instanceof Set || value instanceof Map) {\n      const items: unknown[] = [];\n      for (const item of value instanceof Map ? value.entries() : value) {\n        if (budget.left <= 0) {\n          items.push(TRUNCATED);\n          break;\n        }\n        items.push(pruneValue(item, budget, depth + 1, ancestors));\n      }\n      return items;\n    }\n    const toJSON = (value as { toJSON?: unknown }).toJSON;\n    if (typeof toJSON === 'function') {\n      const json: unknown = toJSON.call(value);\n      if (json !== value) return pruneValue(json, budget, depth + 1, ancestors);\n    }\n    const record: Record<string, unknown> = {};\n    for (const [k, v] of Object.entries(value)) {\n      if (k === '__proto__' || k === 'constructor' || k === 'prototype') continue;\n      if (budget.left <= 0) {\n        record['…'] = TRUNCATED;\n        break;\n      }\n      budget.left -= k.length;\n      record[k] = pruneValue(v, budget, depth + 1, ancestors);\n    }\n    return record;\n  } catch {\n    return TRUNCATED;\n  } finally {\n    ancestors.delete(value);\n  }\n}\n"],"mappings":"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"}

package/dist/middleware.mjs

@@ -1,12 +1,60 @@
+import { t as internalError } from "./internal-log-Cm8SOWSV.mjs";
 import { i as stringifyForLog } from "./safe-stringify-DJ66tW5I.mjs";
+import { d as sanitizeIncomingId } from "./trace.utils-CvXgaiQT.mjs";
 
 //#region src/middleware/http-logger.ts
-const DEFAULT_REDACT_HEADERS = new Set([
+const DEFAULT_REDACT_HEADERS = [
 	"authorization",
 	"cookie",
 	"set-cookie",
-	"x-api-key"
-]);
+	"x-api-key",
+	"proxy-authorization",
+	"x-auth-token",
+	"x-access-token",
+	"x-csrf-token",
+	"x-amz-security-token"
+];
+const DEFAULT_REDACT_QUERY_PARAMS = [
+	"token",
+	"access_token",
+	"refresh_token",
+	"code",
+	"password",
+	"secret",
+	"api_key",
+	"apikey",
+	"key",
+	"signature",
+	"sig",
+	"auth"
+];
+function buildNameSet(defaults, extra) {
+	return new Set([...defaults, ...extra ?? []].map((n) => n.toLowerCase()));
+}
+function safeDecode(value) {
+	try {
+		return decodeURIComponent(value.replace(/\+/g, " "));
+	} catch {
+		return value;
+	}
+}
+/** Replace the values of sensitive query parameters, leaving the rest verbatim. */
+function sanitizeUrl(url, redactParams) {
+	const q = url.indexOf("?");
+	if (q === -1) return url;
+	const hashAt = url.indexOf("#", q);
+	const query = url.slice(q + 1, hashAt === -1 ? void 0 : hashAt);
+	const hash = hashAt === -1 ? "" : url.slice(hashAt);
+	const cleaned = query.split("&").map((pair) => {
+		const eq = pair.indexOf("=");
+		const rawKey = eq === -1 ? pair : pair.slice(0, eq);
+		const decoded = safeDecode(rawKey);
+		const bracket = decoded.indexOf("[");
+		const name = (bracket === -1 ? decoded : decoded.slice(0, bracket)).toLowerCase();
+		return redactParams.has(name) && eq !== -1 ? `${rawKey}=[REDACTED]` : pair;
+	}).join("&");
+	return `${url.slice(0, q)}?${cleaned}${hash}`;
+}
 function sanitizeHeaders(headers, redactSet) {
 	if (!headers) return {};
 	const out = {};
@@ -16,16 +64,25 @@ function sanitizeHeaders(headers, redactSet) {
 	}
 	return out;
 }
+/** Fire-and-forget a logger call; a failing log must never become an unhandled rejection. */
+function fire(result) {
+	if (result && typeof result.catch === "function") result.catch((error) => internalError("http-logger: log call failed", error));
+}
 function shortId() {
 	return Math.random().toString(36).slice(2, 10);
 }
-function buildBaseFields(req, traceId, options) {
+function resolveNameSets(options) {
+	return {
+		headers: buildNameSet(DEFAULT_REDACT_HEADERS, options.redactHeaders),
+		queryParams: buildNameSet(DEFAULT_REDACT_QUERY_PARAMS, options.redactQueryParams)
+	};
+}
+function buildBaseFields(req, traceId, options, { headers: redactSet, queryParams: paramSet }) {
 	var _req$method, _req$socket;
-	const redactSet = options.redactHeaders ? new Set(options.redactHeaders.map((h) => h.toLowerCase())) : DEFAULT_REDACT_HEADERS;
 	const fields = {
 		traceId,
 		method: ((_req$method = req.method) === null || _req$method === void 0 ? void 0 : _req$method.toUpperCase()) ?? "UNKNOWN",
-		url: req.url ?? "/",
+		url: sanitizeUrl(req.url ?? "/", paramSet),
 		ip: req.ip ?? ((_req$socket = req.socket) === null || _req$socket === void 0 ? void 0 : _req$socket.remoteAddress) ?? "unknown",
 		headers: sanitizeHeaders(req.headers, redactSet)
 	};
@@ -37,19 +94,21 @@ function buildBaseFields(req, traceId, options) {
 */
 function createExpressMiddleware(logger, options = {}) {
 	const { skip, logBody, bodyMaxBytes, traceIdHeader = "x-trace-id", requestLevel = "debug", responseLevel = "info", errorLevel = "error", slowRequestThresholdMs = 1e3 } = options;
+	const nameSets = resolveNameSets(options);
+	const traceHeaderName = traceIdHeader.toLowerCase();
 	return function logixiaHttpMiddleware(req, res, next) {
 		var _req$headers, _res$once, _res$once2;
 		if (skip === null || skip === void 0 ? void 0 : skip(req)) {
 			next();
 			return;
 		}
-		const traceId = ((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[traceIdHeader]) ?? shortId();
+		const traceId = sanitizeIncomingId((_req$headers = req.headers) === null || _req$headers === void 0 ? void 0 : _req$headers[traceHeaderName]) ?? shortId();
 		const startMs = Date.now();
-		const baseFields = buildBaseFields(req, traceId, options);
-		if (requestLevel !== "silent") logger.logLevel(requestLevel, "request started", {
+		const baseFields = buildBaseFields(req, traceId, options, nameSets);
+		if (requestLevel !== "silent") fire(logger.logLevel(requestLevel, "request started", {
 			...baseFields,
 			...logBody && req.body ? { body: truncateBody(req.body, bodyMaxBytes) } : {}
-		});
+		}));
 		let completed = false;
 		const onFinish = () => {
 			if (completed) return;
@@ -57,17 +116,17 @@ function createExpressMiddleware(logger, options = {}) {
 			const duration = Date.now() - startMs;
 			const status = res.statusCode ?? 0;
 			const level = status >= 500 ? errorLevel : responseLevel;
-			logger.logLevel(level, "request completed", {
+			fire(logger.logLevel(level, "request completed", {
 				...baseFields,
 				statusCode: status,
 				duration
-			});
-			if (duration > slowRequestThresholdMs) logger.warn("slow request detected", {
+			}));
+			if (duration > slowRequestThresholdMs) fire(logger.warn("slow request detected", {
 				...baseFields,
 				statusCode: status,
 				duration,
 				threshold: slowRequestThresholdMs
-			});
+			}));
 		};
 		(_res$once = res.once) === null || _res$once === void 0 || _res$once.call(res, "finish", onFinish);
 		(_res$once2 = res.once) === null || _res$once2 === void 0 || _res$once2.call(res, "close", onFinish);
@@ -84,6 +143,8 @@ function createExpressMiddleware(logger, options = {}) {
 */
 function createFastifyPlugin(logger, options = {}) {
 	const { skip, traceIdHeader = "x-trace-id", requestLevel = "debug", responseLevel = "info", errorLevel = "error", slowRequestThresholdMs = 1e3 } = options;
+	const nameSets = resolveNameSets(options);
+	const traceHeaderName = traceIdHeader.toLowerCase();
 	function logixiaFastifyPlugin(fastify, _opts, done) {
 		fastify.addHook("onRequest", (request, _reply, hookDone) => {
 			var _req$headers2;
@@ -92,10 +153,10 @@ function createFastifyPlugin(logger, options = {}) {
 				hookDone();
 				return;
 			}
-			const traceId = ((_req$headers2 = req.headers) === null || _req$headers2 === void 0 ? void 0 : _req$headers2[traceIdHeader]) ?? shortId();
+			const traceId = sanitizeIncomingId((_req$headers2 = req.headers) === null || _req$headers2 === void 0 ? void 0 : _req$headers2[traceHeaderName]) ?? shortId();
 			req._logixiaStart = Date.now();
 			req._logixiaId = traceId;
-			if (requestLevel !== "silent") logger.logLevel(requestLevel, "request started", buildBaseFields(req, traceId, options));
+			if (requestLevel !== "silent") fire(logger.logLevel(requestLevel, "request started", buildBaseFields(req, traceId, options, nameSets)));
 			hookDone();
 		});
 		fastify.addHook("onResponse", (request, reply, hookDone) => {
@@ -109,18 +170,19 @@ function createFastifyPlugin(logger, options = {}) {
 			const status = rep.statusCode ?? 0;
 			const traceId = req._logixiaId ?? shortId();
 			const level = status >= 500 ? errorLevel : responseLevel;
-			logger.logLevel(level, "request completed", {
-				...buildBaseFields(req, traceId, options),
+			const baseFields = buildBaseFields(req, traceId, options, nameSets);
+			fire(logger.logLevel(level, "request completed", {
+				...baseFields,
 				statusCode: status,
 				duration
-			});
-			if (duration > slowRequestThresholdMs) logger.warn("slow request detected", {
+			}));
+			if (duration > slowRequestThresholdMs) fire(logger.warn("slow request detected", {
 				traceId,
-				url: req.url,
+				url: baseFields.url,
 				method: req.method,
 				duration,
 				threshold: slowRequestThresholdMs
-			});
+			}));
 			hookDone();
 		});
 		done();
@@ -130,14 +192,76 @@ function createFastifyPlugin(logger, options = {}) {
 		[Symbol.for("fastify.display-name")]: "logixia"
 	});
 }
+/**
+* Bound the captured body without turning it into a string, so the logger's
+* path-based redaction still sees the original keys. Oversized structures are
+* pruned (extra keys/items dropped, long strings cut) rather than serialized.
+*/
 function truncateBody(body, maxBytes = 4096) {
 	if (typeof body === "string") return body.length > maxBytes ? body.slice(0, maxBytes) + "…[truncated]" : body;
 	if (body && typeof body === "object") {
-		const str = stringifyForLog(body);
-		if (str.length > maxBytes) return str.slice(0, maxBytes) + "…[truncated]";
+		if (stringifyForLog(body).length <= maxBytes) return body;
+		return pruneValue(body, { left: maxBytes }, 0, /* @__PURE__ */ new Set());
 	}
 	return body;
 }
+const TRUNCATED = "…[truncated]";
+const MAX_PRUNE_DEPTH = 8;
+function pruneValue(value, budget, depth, ancestors) {
+	if (typeof value === "string") {
+		const cut = value.slice(0, Math.max(0, budget.left));
+		budget.left -= cut.length;
+		return cut.length < value.length ? cut + TRUNCATED : cut;
+	}
+	if (value === null || typeof value !== "object") {
+		budget.left -= 8;
+		return value;
+	}
+	if (value instanceof Date) {
+		budget.left -= 24;
+		return Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
+	}
+	if (value instanceof ArrayBuffer || ArrayBuffer.isView(value)) {
+		budget.left -= 16;
+		return `[Buffer ${value.byteLength} bytes]`;
+	}
+	if (value instanceof Error) return value;
+	if (ancestors.has(value) || depth >= MAX_PRUNE_DEPTH) return TRUNCATED;
+	ancestors.add(value);
+	try {
+		if (Array.isArray(value) || value instanceof Set || value instanceof Map) {
+			const items = [];
+			for (const item of value instanceof Map ? value.entries() : value) {
+				if (budget.left <= 0) {
+					items.push(TRUNCATED);
+					break;
+				}
+				items.push(pruneValue(item, budget, depth + 1, ancestors));
+			}
+			return items;
+		}
+		const toJSON = value.toJSON;
+		if (typeof toJSON === "function") {
+			const json = toJSON.call(value);
+			if (json !== value) return pruneValue(json, budget, depth + 1, ancestors);
+		}
+		const record = {};
+		for (const [k, v] of Object.entries(value)) {
+			if (k === "__proto__" || k === "constructor" || k === "prototype") continue;
+			if (budget.left <= 0) {
+				record["…"] = TRUNCATED;
+				break;
+			}
+			budget.left -= k.length;
+			record[k] = pruneValue(v, budget, depth + 1, ancestors);
+		}
+		return record;
+	} catch {
+		return TRUNCATED;
+	} finally {
+		ancestors.delete(value);
+	}
+}
 
 //#endregion
 export { createExpressMiddleware, createFastifyPlugin };