@catbee/utils 0.0.3 → 0.0.5

package/build/esm/utils/logger.utils.js

@@ -9,13 +9,202 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import pino, { stdTimeFunctions } from 'pino';
-import { Config } from '../config';
+import { config } from '../config';
 import { ContextStore, StoreKeys } from './context-store.utils';
+import { Env } from './env.utils';
 /**
  * Symbol used to store the root logger in the Node.js global object.
  */
 var GLOBAL_LOGGER_KEY = Symbol.for('logger');
+// Default sensitive fields
+export var defaultSensitiveFields = [
+    'password',
+    'secret',
+    'token',
+    'apiKey',
+    'api_key',
+    'auth',
+    'jwt',
+    'access_token',
+    'client_secret',
+    'session_token',
+    'refresh_token'
+];
+/**
+ * The global censor function used by the logger.
+ */
+var globalRedactCensor = function (value, path, sensitiveFields) {
+    if (sensitiveFields === void 0) { sensitiveFields = defaultSensitiveFields; }
+    if (typeof value !== 'string')
+        return '***';
+    var lowerPath = path.map(function (p) { return p.toLowerCase(); });
+    var lowerSensitiveFields = sensitiveFields.map(function (f) { return f.toLowerCase(); });
+    if (lowerPath.some(function (p) { return lowerSensitiveFields.includes(p); }))
+        return '***';
+    // Redact URLs
+    if (lowerPath[0] === 'url') {
+        return value.replace(new RegExp("([?&](".concat(lowerSensitiveFields.join('|'), ")=)[^&#]*"), 'gi'), '$1***');
+    }
+    if (lowerPath.some(function (p) { return p.includes('authorization') || p.includes('auth'); })) {
+        return value.replace(/^(\S+)\s+.+$/, '$1 ***') || '***';
+    }
+    // Redact sensitive fields - check each path segment against each sensitive field
+    if (lowerPath.some(function (pathPart) { return lowerSensitiveFields.some(function (field) { return pathPart.includes(field); }); })) {
+        return '***';
+    }
+    if (path.length > 0 && !['req', 'res', 'headers'].includes(lowerPath[0])) {
+        return value;
+    }
+    return value;
+};
+/**
+ * Sets the global redaction censor function used throughout the application for log redaction.
+ *
+ * Use this function to customize how sensitive data is redacted in logs. The provided function
+ * will replace the default censor implementation.
+ *
+ * @example
+ * ```typescript
+ * // Custom censor that redacts only specific values
+ * setRedactCensor((value, path, sensitiveFields) => {
+ *   if (path.includes('password')) return '***';
+ *   return value;
+ * });
+ * ```
+ *
+ * @param fn - The redaction censor function to use globally. This function receives:
+ *   - value: The data value to potentially redact
+ *   - path: Array of strings representing the path to the value in the object
+ *   - sensitiveFields: Optional array of field names to consider sensitive
+ * @returns void
+ */
+export function setRedactCensor(fn) {
+    globalRedactCensor = fn;
+}
+/**
+ * Gets the current global redaction censor function used for log redaction.
+ *
+ * This function is called internally by the logger when determining how to redact
+ * sensitive information. It can also be used to access the current censor implementation
+ * for composition or extension.
+ *
+ * @example
+ * ```typescript
+ * const currentCensor = getRedactCensor();
+ * // Create an enhanced censor that extends the current one
+ * setRedactCensor((value, path, fields) => {
+ *   // Add custom logic before delegating to current censor
+ *   if (someCondition) return customHandling();
+ *   return currentCensor(value, path, fields);
+ * });
+ * ```
+ *
+ * @returns The current redaction censor function
+ */
+export function getRedactCensor() {
+    return globalRedactCensor;
+}
+/**
+ * Convenience function to redact sensitive data using the current global redact censor.
+ *
+ * This is a direct wrapper around the global censor function that simplifies usage
+ * in application code without needing to access the censor function directly.
+ *
+ * @example
+ * ```typescript
+ * // Redact a potential sensitive value
+ * const safeValue = redact(value, ['user', 'apiKey']);
+ * ```
+ *
+ * @param value - The value to potentially redact
+ * @param path - Array of strings representing the path to the value in the object
+ * @param sensitiveFields - Optional array of field names to consider sensitive
+ * @returns The redacted string value or "***" for redacted content
+ */
+export function redact(value, path, sensitiveFields) {
+    return globalRedactCensor(value, path, sensitiveFields);
+}
+/**
+ * Extends the current redaction function with additional fields to redact.
+ *
+ * This function wraps the existing censor while adding more fields to be considered
+ * sensitive without replacing the entire redaction logic.
+ *
+ * @example
+ * ```typescript
+ * // Add custom fields to be redacted in all future redaction operations
+ * addRedactFields(['customerId', 'accountNumber']);
+ * ```
+ *
+ * @param fields - Array of additional field names to redact
+ */
+export function addRedactFields(fields) {
+    var prev = globalRedactCensor;
+    globalRedactCensor = function (value, path, sensitiveFields) {
+        if (sensitiveFields === void 0) { sensitiveFields = defaultSensitiveFields; }
+        return prev(value, path, __spreadArray(__spreadArray([], __read((sensitiveFields || [])), false), __read(fields), false));
+    };
+}
+/**
+ * Replaces the default list of sensitive fields with a new list.
+ *
+ * This is useful when you want complete control over what fields are considered
+ * sensitive by default, rather than using the library's built-in list.
+ *
+ * @example
+ * ```typescript
+ * // Replace default sensitive fields with a custom list
+ * setSensitiveFields(['password', 'ssn', 'creditCard']);
+ * ```
+ *
+ * @param fields - Array of field names to set as the new default sensitive fields
+ */
+export function setSensitiveFields(fields) {
+    defaultSensitiveFields.splice.apply(defaultSensitiveFields, __spreadArray([0, defaultSensitiveFields.length], __read(fields), false));
+}
+/**
+ * Adds additional field names to the default sensitive fields list.
+ *
+ * This preserves the existing sensitive fields while adding new ones for
+ * application-specific sensitive data.
+ *
+ * @example
+ * ```typescript
+ * // Add domain-specific sensitive fields to the default list
+ * addSensitiveFields(['socialSecurityNumber', 'medicalRecordNumber']);
+ * ```
+ *
+ * @param fields - Array of additional field names to add to the sensitive fields list
+ */
+export function addSensitiveFields(fields) {
+    defaultSensitiveFields.push.apply(defaultSensitiveFields, __spreadArray([], __read(fields), false));
+}
 /**
  * Use an object compatible with either modern or legacy global scopes.
  */
@@ -29,25 +218,27 @@ var _global = _globalThis;
  */
 function setupLogger() {
     var logParams = {
-        name: Config.Logger.name,
-        level: Config.Logger.level,
+        name: config.logger.name || '@catbee/utils',
+        level: config.logger.level || 'info',
         redact: {
-            paths: ['req.authorization', 'url'],
-            censor: function (value, path) {
-                if (path[0] === 'url') {
-                    return value.replace(/access_token=[a-zA-Z0-9_-]*/, 'access_token=***');
-                }
-                else if (path[1] === 'authorization') {
-                    return value.replace(/\s+(\S+)$/, ' ***');
-                }
-                return '***';
-            }
-        }
+            paths: ['req.authorization', 'res.authorization', 'url', 'headers.authorization'],
+            censor: function (value, path) { return redact(value, path); }
+        },
+        timestamp: stdTimeFunctions.isoTime
     };
-    if (Config.Logger.isoTimestamp) {
-        logParams.timestamp = stdTimeFunctions.isoTime;
-    }
-    _global[GLOBAL_LOGGER_KEY] = pino(logParams);
+    var logger = config.logger.pretty && Env.isDev()
+        ? pino(logParams, pino.transport({
+            target: 'pino-pretty',
+            options: {
+                colorize: true,
+                translateTime: 'SYS:standard',
+                ignore: 'pid,hostname',
+                singleLine: false, // multi-line errors
+                levelFirst: true
+            }
+        }))
+        : pino(logParams);
+    _global[GLOBAL_LOGGER_KEY] = logger;
     _global[GLOBAL_LOGGER_KEY].debug('Logger initialized');
 }
 /**
@@ -107,7 +298,7 @@ export function createRequestLogger(requestId, additionalContext) {
 export function logError(error, message, context) {
     var logger = getLogger();
     var errObj = error instanceof Error ? error : new Error(String(error));
-    var logContext = __assign(__assign({}, context), { err: errObj });
+    var logContext = __assign(__assign({}, context), { error: errObj });
     logger.error(logContext, message || errObj.message);
 }
 //# sourceMappingURL=logger.utils.js.map

package/build/esm/utils/logger.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.utils.js","sourceRoot":"","sources":["../../../src/utils/logger.utils.ts"],"names":[],"mappings":"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","sourcesContent":["import pino, { LoggerOptions, stdTimeFunctions } from 'pino';\nimport type { Logger as PinoLogger } from 'pino'; // Type-only import\nimport { Config } from '../config';\nimport { ContextStore, StoreKeys } from './context-store.utils';\n\n/**\n * Symbol used to store the root logger in the Node.js global object.\n */\nconst GLOBAL_LOGGER_KEY = Symbol.for('logger');\n\n/**\n * Logger type for application-wide logging.\n */\nexport type Logger = pino.Logger;\n\n/**\n * Logger levels for application-wide logging.\n */\nexport type LoggerLevels = pino.Level;\n\n/**\n * Use an object compatible with either modern or legacy global scopes.\n */\nexport const _globalThis = typeof globalThis === 'object' ? globalThis : global;\nconst _global = _globalThis as unknown as { [GLOBAL_LOGGER_KEY]: PinoLogger };\n\n/**\n * Initializes the global root logger according to app configuration.\n *\n * - Sets log name, level, timestamp, and redaction for sensitive fields.\n * - Uses singleton in global symbol registry.\n */\nfunction setupLogger(): void {\n  const logParams: LoggerOptions = {\n    name: Config.Logger.name,\n    level: Config.Logger.level,\n    redact: {\n      paths: ['req.authorization', 'url'],\n      censor(value, path) {\n        if (path[0] === 'url') {\n          return value.replace(/access_token=[a-zA-Z0-9_-]*/, 'access_token=***');\n        } else if (path[1] === 'authorization') {\n          return value.replace(/\\s+(\\S+)$/, ' ***');\n        }\n        return '***';\n      }\n    }\n  };\n\n  if (Config.Logger.isoTimestamp) {\n    logParams.timestamp = stdTimeFunctions.isoTime;\n  }\n\n  _global[GLOBAL_LOGGER_KEY] = pino(logParams);\n  _global[GLOBAL_LOGGER_KEY].debug('Logger initialized');\n}\n\n/**\n * Retrieves the current logger instance:\n * - Returns a request-scoped logger from AsyncLocalStorage if available\n * - Falls back to the global (singleton) logger\n * - Initializes the global logger if not created yet\n *\n * @returns {Logger} The logger instance (request-bound or global root logger)\n */\nexport function getLogger(): PinoLogger {\n  const logger = ContextStore.get<PinoLogger>(StoreKeys.LOGGER);\n  if (logger) return logger;\n\n  if (!_global[GLOBAL_LOGGER_KEY]) {\n    setupLogger();\n  }\n\n  return _global[GLOBAL_LOGGER_KEY];\n}\n\n/**\n * Creates a child logger with additional context.\n *\n * @param {Record<string, any>} bindings - Properties to attach to all log records\n * @param {Logger} [parentLogger] - Parent logger (defaults to current context logger or global)\n * @returns {Logger} Child logger with merged context\n */\nexport function createChildLogger(bindings: Record<string, any>, parentLogger?: PinoLogger): PinoLogger {\n  const logger = parentLogger || getLogger();\n  return logger.child(bindings);\n}\n\n/**\n * Creates a request-scoped logger with request ID and stores it in context\n *\n * @param {string} requestId - Unique request identifier\n * @param {object} [additionalContext] - Additional context to include in logs\n * @returns {Logger} Request-scoped logger instance\n */\nexport function createRequestLogger(requestId: string, additionalContext: Record<string, any> = {}): PinoLogger {\n  const logger = createChildLogger({\n    requestId,\n    ...additionalContext\n  });\n\n  try {\n    ContextStore.set(StoreKeys.LOGGER, logger);\n  } catch {\n    // Context not initialized, can't store logger\n    logger.debug('Failed to store logger in context - AsyncLocalStorage not initialized');\n  }\n\n  return logger;\n}\n\n/**\n * Utility to safely log errors with proper stack trace extraction\n *\n * @param {Error|unknown} error - Error object to log\n * @param {string} [message] - Optional message to include\n * @param {Record<string, any>} [context] - Additional context properties\n */\nexport function logError(error: Error | unknown, message?: string, context?: Record<string, any>): void {\n  const logger = getLogger();\n\n  const errObj = error instanceof Error ? error : new Error(String(error));\n  const logContext = {\n    ...context,\n    err: errObj\n  };\n\n  logger.error(logContext, message || errObj.message);\n}\n"]}
+{"version":3,"file":"logger.utils.js","sourceRoot":"","sources":["../../../src/utils/logger.utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,IAAI,EAAE,EAAiB,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC;;GAEG;AACH,IAAM,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAY/C,2BAA2B;AAC3B,MAAM,CAAC,IAAM,sBAAsB,GAAG;IACpC,UAAU;IACV,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,SAAS;IACT,MAAM;IACN,KAAK;IACL,cAAc;IACd,eAAe;IACf,eAAe;IACf,eAAe;CAChB,CAAC;AAEF;;GAEG;AACH,IAAI,kBAAkB,GAA2E,UAC/F,KAAK,EACL,IAAI,EACJ,eAAwC;IAAxC,gCAAA,EAAA,wCAAwC;IAExC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5C,IAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,WAAW,EAAE,EAAf,CAAe,CAAC,CAAC;IACjD,IAAM,oBAAoB,GAAG,eAAe,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,WAAW,EAAE,EAAf,CAAe,CAAC,CAAC;IAEvE,IAAI,SAAS,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAhC,CAAgC,CAAC;QAAE,OAAO,KAAK,CAAC;IAExE,cAAc;IACd,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,gBAAS,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAW,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACtG,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAjD,CAAiD,CAAC,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC;IAC1D,CAAC;IAED,iFAAiF;IACjF,IAAI,SAAS,CAAC,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,oBAAoB,CAAC,IAAI,CAAC,UAAA,KAAK,IAAI,OAAA,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAxB,CAAwB,CAAC,EAA5D,CAA4D,CAAC,EAAE,CAAC;QAC7F,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,eAAe,CAAC,EAA0E;IACxG,kBAAkB,GAAG,EAAE,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,MAAM,CAAC,KAAc,EAAE,IAAc,EAAE,eAA0B;IAC/E,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,eAAe,CAAC,MAAgB;IAC9C,IAAM,IAAI,GAAG,kBAAkB,CAAC;IAChC,kBAAkB,GAAG,UAAC,KAAK,EAAE,IAAI,EAAE,eAAwC;QAAxC,gCAAA,EAAA,wCAAwC;QACzE,OAAA,IAAI,CAAC,KAAK,EAAE,IAAI,yCAAM,CAAC,eAAe,IAAI,EAAE,CAAC,kBAAK,MAAM,UAAE;IAA1D,CAA0D,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAgB;IACjD,sBAAsB,CAAC,MAAM,OAA7B,sBAAsB,iBAAQ,CAAC,EAAE,sBAAsB,CAAC,MAAM,UAAK,MAAM,WAAE;AAC7E,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAgB;IACjD,sBAAsB,CAAC,IAAI,OAA3B,sBAAsB,2BAAS,MAAM,WAAE;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;AAChF,IAAM,OAAO,GAAG,WAA6D,CAAC;AAE9E;;;;;GAKG;AACH,SAAS,WAAW;IAClB,IAAM,SAAS,GAAkB;QAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,eAAe;QAC3C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,KAAK,EAAE,uBAAuB,CAAC;YACjF,MAAM,EAAE,UAAC,KAAK,EAAE,IAAI,IAAK,OAAA,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,EAAnB,CAAmB;SAC7C;QACD,SAAS,EAAE,gBAAgB,CAAC,OAAO;KACpC,CAAC;IAEF,IAAM,MAAM,GACV,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE;QACjC,CAAC,CAAC,IAAI,CACF,SAAS,EACT,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE;gBACP,QAAQ,EAAE,IAAI;gBACd,aAAa,EAAE,cAAc;gBAC7B,MAAM,EAAE,cAAc;gBACtB,UAAU,EAAE,KAAK,EAAE,oBAAoB;gBACvC,UAAU,EAAE,IAAI;aACjB;SACF,CAAC,CACH;QACH,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEtB,OAAO,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;IACpC,OAAO,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS;IACvB,IAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAa,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9D,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAChC,WAAW,EAAE,CAAC;IAChB,CAAC;IAED,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACpC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAA6B,EAAE,YAAyB;IACxF,IAAM,MAAM,GAAG,YAAY,IAAI,SAAS,EAAE,CAAC;IAC3C,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAChC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,SAAiB,EAAE,iBAA2C;IAA3C,kCAAA,EAAA,sBAA2C;IAChG,IAAM,MAAM,GAAG,iBAAiB,YAC9B,SAAS,WAAA,IACN,iBAAiB,EACpB,CAAC;IAEH,IAAI,CAAC;QACH,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAAC,WAAM,CAAC;QACP,8CAA8C;QAC9C,MAAM,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;IACxF,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAsB,EAAE,OAAgB,EAAE,OAA6B;IAC9F,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,IAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE,IAAM,UAAU,yBACX,OAAO,KACV,KAAK,EAAE,MAAM,GACd,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC","sourcesContent":["import pino, { LoggerOptions, stdTimeFunctions } from 'pino';\nimport type { Logger as PinoLogger } from 'pino'; // Type-only import\nimport { config } from '../config';\nimport { ContextStore, StoreKeys } from './context-store.utils';\nimport { Env } from './env.utils';\n\n/**\n * Symbol used to store the root logger in the Node.js global object.\n */\nconst GLOBAL_LOGGER_KEY = Symbol.for('logger');\n\n/**\n * Logger type for application-wide logging.\n */\nexport type Logger = pino.Logger;\n\n/**\n * Logger levels for application-wide logging.\n */\nexport type LoggerLevels = pino.Level;\n\n// Default sensitive fields\nexport const defaultSensitiveFields = [\n  'password',\n  'secret',\n  'token',\n  'apiKey',\n  'api_key',\n  'auth',\n  'jwt',\n  'access_token',\n  'client_secret',\n  'session_token',\n  'refresh_token'\n];\n\n/**\n * The global censor function used by the logger.\n */\nlet globalRedactCensor: (value: unknown, path: string[], sensitiveFields?: string[]) => string = (\n  value,\n  path,\n  sensitiveFields = defaultSensitiveFields\n) => {\n  if (typeof value !== 'string') return '***';\n\n  const lowerPath = path.map(p => p.toLowerCase());\n  const lowerSensitiveFields = sensitiveFields.map(f => f.toLowerCase());\n\n  if (lowerPath.some(p => lowerSensitiveFields.includes(p))) return '***';\n\n  // Redact URLs\n  if (lowerPath[0] === 'url') {\n    return value.replace(new RegExp(`([?&](${lowerSensitiveFields.join('|')})=)[^&#]*`, 'gi'), '$1***');\n  }\n\n  if (lowerPath.some(p => p.includes('authorization') || p.includes('auth'))) {\n    return value.replace(/^(\\S+)\\s+.+$/, '$1 ***') || '***';\n  }\n\n  // Redact sensitive fields - check each path segment against each sensitive field\n  if (lowerPath.some(pathPart => lowerSensitiveFields.some(field => pathPart.includes(field)))) {\n    return '***';\n  }\n\n  if (path.length > 0 && !['req', 'res', 'headers'].includes(lowerPath[0])) {\n    return value;\n  }\n\n  return value;\n};\n\n/**\n * Sets the global redaction censor function used throughout the application for log redaction.\n *\n * Use this function to customize how sensitive data is redacted in logs. The provided function\n * will replace the default censor implementation.\n *\n * @example\n * ```typescript\n * // Custom censor that redacts only specific values\n * setRedactCensor((value, path, sensitiveFields) => {\n *   if (path.includes('password')) return '***';\n *   return value;\n * });\n * ```\n *\n * @param fn - The redaction censor function to use globally. This function receives:\n *   - value: The data value to potentially redact\n *   - path: Array of strings representing the path to the value in the object\n *   - sensitiveFields: Optional array of field names to consider sensitive\n * @returns void\n */\nexport function setRedactCensor(fn: (value: unknown, path: string[], sensitiveFields?: string[]) => string) {\n  globalRedactCensor = fn;\n}\n\n/**\n * Gets the current global redaction censor function used for log redaction.\n *\n * This function is called internally by the logger when determining how to redact\n * sensitive information. It can also be used to access the current censor implementation\n * for composition or extension.\n *\n * @example\n * ```typescript\n * const currentCensor = getRedactCensor();\n * // Create an enhanced censor that extends the current one\n * setRedactCensor((value, path, fields) => {\n *   // Add custom logic before delegating to current censor\n *   if (someCondition) return customHandling();\n *   return currentCensor(value, path, fields);\n * });\n * ```\n *\n * @returns The current redaction censor function\n */\nexport function getRedactCensor() {\n  return globalRedactCensor;\n}\n\n/**\n * Convenience function to redact sensitive data using the current global redact censor.\n *\n * This is a direct wrapper around the global censor function that simplifies usage\n * in application code without needing to access the censor function directly.\n *\n * @example\n * ```typescript\n * // Redact a potential sensitive value\n * const safeValue = redact(value, ['user', 'apiKey']);\n * ```\n *\n * @param value - The value to potentially redact\n * @param path - Array of strings representing the path to the value in the object\n * @param sensitiveFields - Optional array of field names to consider sensitive\n * @returns The redacted string value or \"***\" for redacted content\n */\nexport function redact(value: unknown, path: string[], sensitiveFields?: string[]) {\n  return globalRedactCensor(value, path, sensitiveFields);\n}\n\n/**\n * Extends the current redaction function with additional fields to redact.\n *\n * This function wraps the existing censor while adding more fields to be considered\n * sensitive without replacing the entire redaction logic.\n *\n * @example\n * ```typescript\n * // Add custom fields to be redacted in all future redaction operations\n * addRedactFields(['customerId', 'accountNumber']);\n * ```\n *\n * @param fields - Array of additional field names to redact\n */\nexport function addRedactFields(fields: string[]) {\n  const prev = globalRedactCensor;\n  globalRedactCensor = (value, path, sensitiveFields = defaultSensitiveFields) =>\n    prev(value, path, [...(sensitiveFields || []), ...fields]);\n}\n\n/**\n * Replaces the default list of sensitive fields with a new list.\n *\n * This is useful when you want complete control over what fields are considered\n * sensitive by default, rather than using the library's built-in list.\n *\n * @example\n * ```typescript\n * // Replace default sensitive fields with a custom list\n * setSensitiveFields(['password', 'ssn', 'creditCard']);\n * ```\n *\n * @param fields - Array of field names to set as the new default sensitive fields\n */\nexport function setSensitiveFields(fields: string[]) {\n  defaultSensitiveFields.splice(0, defaultSensitiveFields.length, ...fields);\n}\n\n/**\n * Adds additional field names to the default sensitive fields list.\n *\n * This preserves the existing sensitive fields while adding new ones for\n * application-specific sensitive data.\n *\n * @example\n * ```typescript\n * // Add domain-specific sensitive fields to the default list\n * addSensitiveFields(['socialSecurityNumber', 'medicalRecordNumber']);\n * ```\n *\n * @param fields - Array of additional field names to add to the sensitive fields list\n */\nexport function addSensitiveFields(fields: string[]) {\n  defaultSensitiveFields.push(...fields);\n}\n\n/**\n * Use an object compatible with either modern or legacy global scopes.\n */\nexport const _globalThis = typeof globalThis === 'object' ? globalThis : global;\nconst _global = _globalThis as unknown as { [GLOBAL_LOGGER_KEY]: PinoLogger };\n\n/**\n * Initializes the global root logger according to app configuration.\n *\n * - Sets log name, level, timestamp, and redaction for sensitive fields.\n * - Uses singleton in global symbol registry.\n */\nfunction setupLogger(): void {\n  const logParams: LoggerOptions = {\n    name: config.logger.name || '@catbee/utils',\n    level: config.logger.level || 'info',\n    redact: {\n      paths: ['req.authorization', 'res.authorization', 'url', 'headers.authorization'],\n      censor: (value, path) => redact(value, path)\n    },\n    timestamp: stdTimeFunctions.isoTime\n  };\n\n  const logger =\n    config.logger.pretty && Env.isDev()\n      ? pino(\n          logParams,\n          pino.transport({\n            target: 'pino-pretty',\n            options: {\n              colorize: true,\n              translateTime: 'SYS:standard',\n              ignore: 'pid,hostname',\n              singleLine: false, // multi-line errors\n              levelFirst: true\n            }\n          })\n        )\n      : pino(logParams);\n\n  _global[GLOBAL_LOGGER_KEY] = logger;\n  _global[GLOBAL_LOGGER_KEY].debug('Logger initialized');\n}\n\n/**\n * Retrieves the current logger instance:\n * - Returns a request-scoped logger from AsyncLocalStorage if available\n * - Falls back to the global (singleton) logger\n * - Initializes the global logger if not created yet\n *\n * @returns {Logger} The logger instance (request-bound or global root logger)\n */\nexport function getLogger(): PinoLogger {\n  const logger = ContextStore.get<PinoLogger>(StoreKeys.LOGGER);\n  if (logger) return logger;\n\n  if (!_global[GLOBAL_LOGGER_KEY]) {\n    setupLogger();\n  }\n\n  return _global[GLOBAL_LOGGER_KEY];\n}\n\n/**\n * Creates a child logger with additional context.\n *\n * @param {Record<string, any>} bindings - Properties to attach to all log records\n * @param {Logger} [parentLogger] - Parent logger (defaults to current context logger or global)\n * @returns {Logger} Child logger with merged context\n */\nexport function createChildLogger(bindings: Record<string, any>, parentLogger?: PinoLogger): PinoLogger {\n  const logger = parentLogger || getLogger();\n  return logger.child(bindings);\n}\n\n/**\n * Creates a request-scoped logger with request ID and stores it in context\n *\n * @param {string} requestId - Unique request identifier\n * @param {object} [additionalContext] - Additional context to include in logs\n * @returns {Logger} Request-scoped logger instance\n */\nexport function createRequestLogger(requestId: string, additionalContext: Record<string, any> = {}): PinoLogger {\n  const logger = createChildLogger({\n    requestId,\n    ...additionalContext\n  });\n\n  try {\n    ContextStore.set(StoreKeys.LOGGER, logger);\n  } catch {\n    // Context not initialized, can't store logger\n    logger.debug('Failed to store logger in context - AsyncLocalStorage not initialized');\n  }\n\n  return logger;\n}\n\n/**\n * Utility to safely log errors with proper stack trace extraction\n *\n * @param {Error|unknown} error - Error object to log\n * @param {string} [message] - Optional message to include\n * @param {Record<string, any>} [context] - Additional context properties\n */\nexport function logError(error: Error | unknown, message?: string, context?: Record<string, any>): void {\n  const logger = getLogger();\n\n  const errObj = error instanceof Error ? error : new Error(String(error));\n  const logContext = {\n    ...context,\n    error: errObj\n  };\n\n  logger.error(logContext, message || errObj.message);\n}\n"]}

package/build/esm/utils/middleware.utils.d.ts

@@ -1,27 +1,5 @@
-/**
- * Type definitions for Express-compatible middleware
- */
-type Request = {
-    headers: Record<string, string | string[] | undefined>;
-    method: string;
-    url: string;
-    ip?: string;
-    body?: any;
-    query?: Record<string, any>;
-    params?: Record<string, any>;
-    [key: string]: any;
-};
-type Response = {
-    status: (code: number) => Response;
-    json: (data: any) => void;
-    send: (data: any) => void;
-    setHeader: (name: string, value: string | string[]) => void;
-    end: (data?: any) => void;
-    on: (event: string, callback: (...args: any[]) => void) => void;
-    [key: string]: any;
-};
-type NextFunction = (err?: Error | any) => void;
-type Middleware = (req: Request, res: Response, next: NextFunction) => void | Promise<void>;
+import type { Request, Response, NextFunction } from 'express';
+export type Middleware = (req: Request, res: Response, next: NextFunction) => void | Promise<void>;
 /**
  * Attaches a unique request ID to each request.
  * Useful for request tracing and correlation between logs.
@@ -46,7 +24,7 @@ export declare function requestId(options?: {
 export declare function responseTime(options?: {
     addHeader?: boolean;
     logOnComplete?: boolean;
-}): Middleware;
+}): (req: Request, res: Response, next: NextFunction) => void;
 /**
  * Request timeout middleware.
  * Aborts requests that take too long to process.
@@ -55,19 +33,49 @@ export declare function responseTime(options?: {
  * @returns {Middleware} Express-compatible middleware
  */
 export declare function timeout(timeoutMs?: number): Middleware;
+/**
+ * Creates an Express middleware that initializes a per-request context.
+ *
+ * @param {object} [options] - Optional configuration
+ * @param {string} [options.headerName='x-request-id'] - Header to look for request ID
+ * @param {boolean} [options.autoLog=true] - Whether to log automatically when context is initialized
+ * @returns {(req: Request, res: Response, next: NextFunction) => void} Express middleware function
+ */
+export declare function setupRequestContext(options?: {
+    headerName?: string;
+    autoLog?: boolean;
+}): Middleware;
+export interface ErrorHandlerOptions {
+    /** Whether to log errors (default: true) */
+    logErrors?: boolean;
+    /** Whether to include error details in non-production (default: false) */
+    includeDetails?: boolean;
+}
 /**
  * Global error handling middleware with enhanced features.
  *
- * @param {object} [options] - Error handler options
+ * @param {ErrorHandlerOptions} options - Error handler options
  * @param {boolean} [options.logErrors=true] - Whether to log errors
  * @param {boolean} [options.includeDetails=false] - Whether to include error details in non-production
- * @param {Function} [options.logger=getLogger().error] - Custom logging function
- * @returns {(err: any, req: Request, res: Response, next: NextFunction) => void} Error middleware
+ * @returns Error middleware
+ *
+ * @example
+ * import express from 'express';
+ * import { errorHandler } from '@catbee/utils';
+ *
+ * const app = express();
+ *
+ * // Your routes
+ * app.get('/ping', (req, res) => {
+ *   throw new Error('Something went wrong');
+ * });
+ *
+ * // Error handler (must be last middleware)
+ * app.use(errorHandler({ includeDetails: true }));
+ *
+ * app.listen(3000, () => {
+ *   console.log('Server running on port 3000');
+ * });
  */
-export declare function errorHandler(options?: {
-    logErrors?: boolean;
-    includeDetails?: boolean;
-    logger?: (message: string, error: any) => void;
-}): (err: any, req: Request, res: Response, _next: NextFunction) => void;
-export {};
+export declare function errorHandler(options?: ErrorHandlerOptions): (err: any, req: Request, res: Response, _next: NextFunction) => Response<any, Record<string, any>>;
 //# sourceMappingURL=middleware.utils.d.ts.map

package/build/esm/utils/middleware.utils.js

@@ -1,10 +1,10 @@
-import { randomUUID } from 'crypto';
-import { Config } from '../config';
+import { config } from '../config';
 import { uuid } from './id.utils';
 import { HttpStatusCodes } from './http-status-codes';
 import { ErrorResponse } from './response.utils';
 import { Env } from './env.utils';
 import { getLogger } from './logger.utils';
+import { ContextStore, StoreKeys } from './context-store.utils';
 /**
  * Attaches a unique request ID to each request.
  * Useful for request tracing and correlation between logs.
@@ -20,7 +20,7 @@ export function requestId(options) {
     return function (req, res, next) {
         // Use existing request ID from header or generate a new one
         var existingId = req.headers[headerName.toLowerCase()];
-        var id = existingId || randomUUID();
+        var id = existingId || uuid();
         // Attach ID to request object
         req.id = id;
         // Add ID to response headers
@@ -43,22 +43,23 @@ export function responseTime(options) {
     var logOnComplete = (options === null || options === void 0 ? void 0 : options.logOnComplete) === true;
     return function (req, res, next) {
         var start = process.hrtime();
-        // Function to calculate elapsed time
-        var calculateDuration = function () {
-            var diff = process.hrtime(start);
-            return diff[0] * 1e3 + diff[1] * 1e-6; // Convert to ms
-        };
-        // Handle response completion
-        res.on('finish', function () {
-            var duration = calculateDuration();
-            if (addHeader) {
+        if (addHeader) {
+            // Wrap res.end to set header just before sending response
+            var originalEnd_1 = res.end;
+            res.end = function (chunk, encoding, cb) {
+                var diff = process.hrtime(start);
+                var duration = diff[0] * 1e3 + diff[1] * 1e-6;
                 res.setHeader('X-Response-Time', "".concat(duration.toFixed(2), "ms"));
-            }
-            if (logOnComplete) {
-                var method = req.method, url = req.url;
-                getLogger().info("".concat(method, " ").concat(url, " - ").concat(duration.toFixed(2), "ms"));
-            }
-        });
+                return originalEnd_1.call(this, chunk, encoding, cb);
+            };
+        }
+        if (logOnComplete) {
+            res.on('finish', function () {
+                var diff = process.hrtime(start);
+                var duration = diff[0] * 1e3 + diff[1] * 1e-6;
+                getLogger().info("".concat(req.method, " ").concat(req.url, " - ").concat(duration.toFixed(2), "ms"));
+            });
+        }
         next();
     };
 }
@@ -70,7 +71,7 @@ export function responseTime(options) {
  * @returns {Middleware} Express-compatible middleware
  */
 export function timeout(timeoutMs) {
-    if (timeoutMs === void 0) { timeoutMs = Config.Http.timeout; }
+    if (timeoutMs === void 0) { timeoutMs = config.http.timeout; }
     return function (req, res, next) {
         // Set timeout for the request
         var timer = setTimeout(function () {
@@ -89,55 +90,71 @@ export function timeout(timeoutMs) {
     };
 }
 /**
- * Creates a standardized error response object for API errors.
+ * Creates an Express middleware that initializes a per-request context.
  *
- * @param {string} message - Error message
- * @param {Request} req - Express request object
- * @param {any} error - Original error object
- * @param {object} [options] - Additional options
- * @param {boolean} [options.includeDetails=false] - Whether to include error details in non-production
- * @returns {object} Formatted error response
+ * @param {object} [options] - Optional configuration
+ * @param {string} [options.headerName='x-request-id'] - Header to look for request ID
+ * @param {boolean} [options.autoLog=true] - Whether to log automatically when context is initialized
+ * @returns {(req: Request, res: Response, next: NextFunction) => void} Express middleware function
  */
-var createErrorResponse = function (message, req, error, options) {
-    var isDev = Env.isDev();
-    var includeDetails = (options === null || options === void 0 ? void 0 : options.includeDetails) && isDev;
-    var response = {
-        error: true,
-        message: message,
-        timestamp: new Date().toISOString(),
-        requestId: (error === null || error === void 0 ? void 0 : error.requestId) || req.id || uuid(),
-        path: req.originalUrl || req.url
+export function setupRequestContext(options) {
+    if (options === void 0) { options = {}; }
+    var _a = options.headerName, headerName = _a === void 0 ? 'x-request-id' : _a, _b = options.autoLog, autoLog = _b === void 0 ? true : _b;
+    return function (req, _res, next) {
+        var _a;
+        // Generate or use existing request ID
+        var requestId = req.headers[headerName] || (req === null || req === void 0 ? void 0 : req['id']) || uuid();
+        ContextStore.run((_a = {}, _a[StoreKeys.REQUEST_ID] = requestId, _a), function () {
+            // Create a child logger for this request
+            var childLogger = getLogger().child({
+                requestId: requestId,
+                method: req.method,
+                url: req.originalUrl || req.url
+            });
+            // Store logger in context
+            ContextStore.set(StoreKeys.LOGGER, childLogger);
+            if (autoLog) {
+                childLogger.info('Request context initialized');
+            }
+            next();
+        });
     };
-    // Include error code if present
-    if (error === null || error === void 0 ? void 0 : error.code) {
-        response.code = error.code;
-    }
-    // Include stack trace in development mode if requested
-    if (includeDetails && (error === null || error === void 0 ? void 0 : error.stack)) {
-        response.stack = error.stack.split('\n').map(function (line) { return line.trim(); });
-    }
-    return response;
-};
+}
 /**
  * Global error handling middleware with enhanced features.
  *
- * @param {object} [options] - Error handler options
+ * @param {ErrorHandlerOptions} options - Error handler options
  * @param {boolean} [options.logErrors=true] - Whether to log errors
  * @param {boolean} [options.includeDetails=false] - Whether to include error details in non-production
- * @param {Function} [options.logger=getLogger().error] - Custom logging function
- * @returns {(err: any, req: Request, res: Response, next: NextFunction) => void} Error middleware
+ * @returns Error middleware
+ *
+ * @example
+ * import express from 'express';
+ * import { errorHandler } from '@catbee/utils';
+ *
+ * const app = express();
+ *
+ * // Your routes
+ * app.get('/ping', (req, res) => {
+ *   throw new Error('Something went wrong');
+ * });
+ *
+ * // Error handler (must be last middleware)
+ * app.use(errorHandler({ includeDetails: true }));
+ *
+ * app.listen(3000, () => {
+ *   console.log('Server running on port 3000');
+ * });
  */
 export function errorHandler(options) {
     var logErrors = (options === null || options === void 0 ? void 0 : options.logErrors) !== false;
     var includeDetails = (options === null || options === void 0 ? void 0 : options.includeDetails) === true;
-    var logger = (options === null || options === void 0 ? void 0 : options.logger) || getLogger().error;
     return function (err, req, res, _next) {
         // Determine status code
         var status = (err === null || err === void 0 ? void 0 : err.status) || (err === null || err === void 0 ? void 0 : err.statusCode) || HttpStatusCodes.INTERNAL_SERVER_ERROR;
         // Log error if enabled
         if (logErrors) {
-            var logMessage = "[ERROR] ".concat(req.method, " ").concat(req.originalUrl || req.url, ": ").concat(err.message || 'Unknown error');
-            logger(logMessage, err);
+            getLogger().error({ error: err }, "".concat(err.message || 'Unknown error'));
         }
         // Handle ErrorResponse instances (our custom error class)
         if (err instanceof ErrorResponse) {
@@ -149,6 +166,26 @@ export function errorHandler(options) {
                 path: req.originalUrl || req.url
             });
         }
+        var createErrorResponse = function (message, req, error, options) {
+            var isDev = Env.isDev();
+            var includeDetails = (options === null || options === void 0 ? void 0 : options.includeDetails) && isDev;
+            var response = {
+                error: true,
+                message: message,
+                timestamp: new Date().toISOString(),
+                requestId: (error === null || error === void 0 ? void 0 : error.requestId) || req.id || uuid(),
+                path: req.originalUrl || req.url
+            };
+            // Include error code if present
+            if (error === null || error === void 0 ? void 0 : error.code) {
+                response.code = error.code;
+            }
+            // Include stack trace in development mode if requested
+            if (includeDetails && (error === null || error === void 0 ? void 0 : error.stack)) {
+                response.stack = error.stack.split('\n').map(function (line) { return line.trim(); });
+            }
+            return response;
+        };
         // Handle any other errors
         return res.status(status).json(createErrorResponse((err === null || err === void 0 ? void 0 : err.message) || 'Internal Server Error', req, err, {
             includeDetails: includeDetails