@catbee/utils 2.0.4 → 2.1.1

package/logger/index.mjs

@@ -51,57 +51,140 @@ var defaultSensitiveFields = [
   "passphrase",
   "otp",
   "api_secret",
-  "token_secret"
+  "token_secret",
+  "cookie",
+  "cookies",
+  "set-cookie",
+  "session_id",
+  "credit_card",
+  "card_number",
+  "cvv",
+  "cvc",
+  "ssn",
+  "pin"
 ];
-var defaultRedactPaths = [
-  "req.authorization",
-  "req.headers.authorization",
-  "req.headers.cookie",
-  'req.headers["x-api-key"]',
-  'req.headers["x-auth-token"]',
-  'req.headers["x-access-token"]',
-  "req.body.password",
-  "req.body.token",
-  "req.body.secret",
-  "req.query.token",
-  "req.query.api_key",
-  "req.query.apiKey",
-  "res.authorization",
-  "res.headers.authorization",
-  'res.headers["set-cookie"]',
+var requestSubPaths = [
+  "authorization",
   "headers.authorization",
+  "headers.cookie",
   "headers.cookies",
   'headers["set-cookie"]',
   'headers["x-api-key"]',
   'headers["x-auth-token"]',
   'headers["x-access-token"]',
+  "body.password",
+  "body.token",
+  "body.secret",
+  "query.token",
+  "query.api_key",
+  "query.apiKey",
+  "url",
+  "originalUrl"
+];
+var responseSubPaths = [
+  "authorization",
+  "headers.authorization",
+  'headers["set-cookie"]'
+];
+var commonHeaderPaths = [
+  "headers.authorization",
+  "headers.cookie",
+  "headers.cookies",
+  'headers["set-cookie"]',
+  'headers["x-api-key"]',
+  'headers["x-auth-token"]',
+  'headers["x-access-token"]'
+];
+var defaultRedactPaths = [
+  ...[
+    "req",
+    "request"
+  ].flatMap((p) => requestSubPaths.map((sp) => `${p}.${sp}`)),
+  ...[
+    "res",
+    "response"
+  ].flatMap((p) => responseSubPaths.map((sp) => `${p}.${sp}`)),
+  ...commonHeaderPaths,
   "url",
   "uri",
   "href",
   "redirect_uri",
   "redirectUri"
 ];
-var globalRedactCensor = /* @__PURE__ */ __name((value, path, sensitiveFields = getExpandedSensitiveFields()) => {
+var escapeRegExp = /* @__PURE__ */ __name((value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "escapeRegExp");
+function buildUrlRedactRegex(lowerSensitiveFields) {
+  if (lowerSensitiveFields.length === 0) return null;
+  const pattern = lowerSensitiveFields.map(escapeRegExp).join("|");
+  return new RegExp(`([?&](${pattern})=)[^&#]*`, "gi");
+}
+__name(buildUrlRedactRegex, "buildUrlRedactRegex");
+var URL_PATH_KEYS = /* @__PURE__ */ new Set([
+  "url",
+  "uri",
+  "href",
+  "originalurl",
+  "redirect_uri",
+  "redirecturi"
+]);
+var cachedExpandedFields = null;
+var cachedLowerSensitiveFields = null;
+var cachedLowerSensitiveSet = null;
+var cachedNormalizedMultiWordFields = null;
+var cachedUrlRegex = null;
+function invalidateSensitiveFieldsCache() {
+  cachedExpandedFields = null;
+  cachedLowerSensitiveFields = null;
+  cachedLowerSensitiveSet = null;
+  cachedNormalizedMultiWordFields = null;
+  cachedUrlRegex = null;
+}
+__name(invalidateSensitiveFieldsCache, "invalidateSensitiveFieldsCache");
+function extractNormalizedMultiWordFields(fields) {
+  return Array.from(new Set(fields.map((f) => f.replace(/[-]/g, "_")).filter((f) => f.includes("_")).map((f) => `_${f}_`)));
+}
+__name(extractNormalizedMultiWordFields, "extractNormalizedMultiWordFields");
+function isSensitivePathSegment(segment, lowerFieldsSet, multiWordNormalizedList) {
+  if (!segment || typeof segment !== "string") return false;
+  const lower = segment.toLowerCase();
+  if (lowerFieldsSet.has(lower)) return true;
+  const tokens = segment.split(/[_-]+|(?<=[a-z0-9])(?=[A-Z])/g).filter(Boolean);
+  if (tokens.some((t) => lowerFieldsSet.has(t.toLowerCase()))) return true;
+  if (multiWordNormalizedList.length === 0) return false;
+  const normalized = `_${segment.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase().replace(/[-]/g, "_")}_`;
+  return multiWordNormalizedList.some((fNorm) => normalized.includes(fNorm));
+}
+__name(isSensitivePathSegment, "isSensitivePathSegment");
+function getExpandedSensitiveFields() {
+  if (!cachedExpandedFields) {
+    cachedExpandedFields = expandSensitiveFields(defaultSensitiveFields);
+    cachedLowerSensitiveFields = cachedExpandedFields.map((f) => f.toLowerCase());
+    cachedLowerSensitiveSet = new Set(cachedLowerSensitiveFields);
+    cachedNormalizedMultiWordFields = extractNormalizedMultiWordFields(cachedLowerSensitiveFields);
+    cachedUrlRegex = buildUrlRedactRegex(cachedLowerSensitiveFields);
+  }
+  return cachedExpandedFields;
+}
+__name(getExpandedSensitiveFields, "getExpandedSensitiveFields");
+var globalRedactCensor = /* @__PURE__ */ __name((value, path, sensitiveFields) => {
   if (typeof value !== "string") return "***";
-  const lowerPath = path.filter((p) => typeof p === "string").map((p) => p.toLowerCase());
-  const lowerSensitiveFields = sensitiveFields.map((f) => f.toLowerCase());
-  if (lowerPath.some((p) => lowerSensitiveFields.includes(p))) return "***";
-  if (lowerPath[0] === "url" || lowerPath[0] === "uri" || lowerPath[0] === "href" || lowerPath.includes("redirect_uri") || lowerPath.includes("redirecturi")) {
-    return value.replace(new RegExp(`([?&](${lowerSensitiveFields.join("|")})=)[^&#]*`, "gi"), "$1***");
+  const stringPath = path.filter((p) => typeof p === "string");
+  const lowerPath = stringPath.map((p) => p.toLowerCase());
+  const isCustomFields = sensitiveFields !== void 0;
+  if (!isCustomFields) {
+    getExpandedSensitiveFields();
   }
-  if (lowerPath.some((p) => p.includes("authorization") || p.includes("auth"))) {
-    return value.replace(/^(\S+)\s+.+$/, "$1 ***") || "***";
+  const lowerFieldsList = isCustomFields ? sensitiveFields.map((f) => f.toLowerCase()) : cachedLowerSensitiveFields;
+  const lowerFieldsSet = isCustomFields ? new Set(lowerFieldsList) : cachedLowerSensitiveSet;
+  const multiWordList = isCustomFields ? extractNormalizedMultiWordFields(lowerFieldsList) : cachedNormalizedMultiWordFields;
+  if (lowerPath.some((p) => lowerFieldsSet.has(p))) return "***";
+  if (lowerPath.some((p) => URL_PATH_KEYS.has(p) || p.includes("redirect_uri") || p.includes("redirecturi"))) {
+    if (lowerFieldsList.length === 0) return value;
+    const urlRegex = isCustomFields ? buildUrlRedactRegex(lowerFieldsList) : cachedUrlRegex;
+    return urlRegex ? value.replace(urlRegex, "$1***") : value;
   }
-  if (lowerPath.some((p) => lowerSensitiveFields.some((f) => p.includes(f)))) {
+  if (stringPath.some((p) => isSensitivePathSegment(p, lowerFieldsSet, multiWordList))) {
     return "***";
   }
-  if (path.length > 0 && ![
-    "req",
-    "res",
-    "headers"
-  ].includes(lowerPath[0])) {
-    return value;
-  }
   return value;
 }, "globalRedactCensor");
 function setRedactCensor(fn) {
@@ -117,38 +200,36 @@ function redact(value, path, sensitiveFields) {
 }
 __name(redact, "redact");
 function addRedactFields(fields) {
+  addSensitiveFields(fields);
   const prev = globalRedactCensor;
   globalRedactCensor = /* @__PURE__ */ __name((value, path, sensitiveFields = getExpandedSensitiveFields()) => prev(value, path, [
     ...sensitiveFields || [],
     ...fields
   ]), "globalRedactCensor");
-  cachedExpandedFields = null;
 }
 __name(addRedactFields, "addRedactFields");
-var cachedExpandedFields = null;
-function getExpandedSensitiveFields() {
-  cachedExpandedFields ??= expandSensitiveFields(defaultSensitiveFields);
-  return cachedExpandedFields;
-}
-__name(getExpandedSensitiveFields, "getExpandedSensitiveFields");
 function setSensitiveFields(fields) {
   defaultSensitiveFields.splice(0, defaultSensitiveFields.length, ...fields);
-  cachedExpandedFields = null;
+  invalidateSensitiveFieldsCache();
 }
 __name(setSensitiveFields, "setSensitiveFields");
 function addSensitiveFields(fields) {
   defaultSensitiveFields.push(...fields);
-  cachedExpandedFields = null;
+  invalidateSensitiveFieldsCache();
 }
 __name(addSensitiveFields, "addSensitiveFields");
 var _globalThis = typeof globalThis === "object" ? globalThis : global;
 var _global = _globalThis;
+function resetLogger() {
+  delete _global[GLOBAL_LOGGER_KEY];
+}
+__name(resetLogger, "resetLogger");
 function setupLogger(isGlobal = true) {
   const sensitiveFields = getExpandedSensitiveFields();
   const { logger: loggerConfig } = getCatbeeGlobalConfig();
   const paths = /* @__PURE__ */ new Set([
     ...defaultRedactPaths,
-    ...sensitiveFields.flatMap((field) => generateDeepPaths(field, 2))
+    ...sensitiveFields.flatMap((field) => generateDeepPaths(field, 5))
   ]);
   const logParams = {
     name: loggerConfig?.name ?? "@catbee/utils",
@@ -170,56 +251,50 @@ function setupLogger(isGlobal = true) {
   let logger;
   const logDir = loggerConfig?.dir?.trim();
   const hasFileLogging = Boolean(logDir);
+  const destination = logDir ? `${logDir.replace(/[/\\]+$/, "")}/app.log` : "app.log";
+  const prettyOptions = {
+    colorize: loggerConfig?.colorize,
+    translateTime: "SYS:standard",
+    ignore: "pid,hostname",
+    singleLine: loggerConfig?.singleLine,
+    levelFirst: true
+  };
+  const fileOptions = {
+    destination,
+    mkdir: true
+  };
   if (hasFileLogging && loggerConfig?.pretty) {
     logger = pino(logParams, pino.transport({
       targets: [
         {
           target: "pino-pretty",
           level: loggerConfig?.level ?? "info",
-          options: {
-            colorize: loggerConfig?.colorize,
-            translateTime: "SYS:standard",
-            ignore: "pid,hostname",
-            singleLine: loggerConfig?.singleLine,
-            levelFirst: true
-          }
+          options: prettyOptions
         },
         {
           target: "pino/file",
           level: loggerConfig?.level ?? "info",
-          options: {
-            destination: `${logDir}/app.log`,
-            mkdir: true
-          }
+          options: fileOptions
         }
       ]
     }));
   } else if (hasFileLogging) {
     logger = pino(logParams, pino.transport({
       target: "pino/file",
-      options: {
-        destination: `${logDir}/app.log`,
-        mkdir: true
-      }
+      options: fileOptions
     }));
   } else if (loggerConfig?.pretty) {
     logger = pino(logParams, pino.transport({
       target: "pino-pretty",
-      options: {
-        colorize: loggerConfig?.colorize,
-        translateTime: "SYS:standard",
-        ignore: "pid,hostname",
-        singleLine: loggerConfig?.singleLine,
-        levelFirst: true
-      }
+      options: prettyOptions
     }));
   } else {
     logger = pino(logParams);
   }
   if (isGlobal) {
     _global[GLOBAL_LOGGER_KEY] = logger;
-    _global[GLOBAL_LOGGER_KEY]?.debug({
-      logDir
+    logger.debug({
+      logDir: logDir || "none"
     }, "Global Logger Initialized");
   }
   return logger;
@@ -247,9 +322,15 @@ function createRequestLogger(requestId, additionalContext = {}) {
     requestId,
     ...additionalContext
   });
+  let stored = false;
   try {
-    ContextStore.set(StoreKeys.LOGGER, logger);
+    if (typeof ContextStore.getAll !== "function" || ContextStore.getAll() !== void 0) {
+      ContextStore.set(StoreKeys.LOGGER, logger);
+      stored = true;
+    }
   } catch {
+  }
+  if (!stored) {
     logger.debug("Failed to store logger in context - AsyncLocalStorage not initialized");
   }
   return logger;
@@ -276,13 +357,29 @@ function expandSensitiveFields(fields) {
 }
 __name(expandSensitiveFields, "expandSensitiveFields");
 function expandSensitiveField(field) {
-  const parts = field.split(/[_-]/g).filter(Boolean);
-  const camel = parts[0].toLowerCase() + parts.slice(1).map((p) => p.charAt(0).toUpperCase() + p.slice(1).toLowerCase()).join("");
-  const mergedLower = parts.join("").toLowerCase();
-  const mergedUpper = parts.join("").toUpperCase();
-  const kebab = parts.map((p) => p.toLowerCase()).join("-");
-  const snakeLower = parts.map((p) => p.toLowerCase()).join("_");
-  const snakeUpper = parts.map((p) => p.toUpperCase()).join("_");
+  if (!field || typeof field !== "string") {
+    return [];
+  }
+  const trimmed = field.trim();
+  if (!trimmed) {
+    return [
+      field
+    ];
+  }
+  const parts = trimmed.split(/[_-]+|(?<=[a-z0-9])(?=[A-Z])/g).filter(Boolean);
+  if (parts.length === 0) {
+    return [
+      field
+    ];
+  }
+  const lowerParts = parts.map((p) => p.toLowerCase());
+  const upperParts = parts.map((p) => p.toUpperCase());
+  const camel = lowerParts[0] + lowerParts.slice(1).map((p) => p.charAt(0).toUpperCase() + p.slice(1)).join("");
+  const mergedLower = lowerParts.join("");
+  const mergedUpper = upperParts.join("");
+  const kebab = lowerParts.join("-");
+  const snakeLower = lowerParts.join("_");
+  const snakeUpper = upperParts.join("_");
   return Array.from(/* @__PURE__ */ new Set([
     field,
     camel,
@@ -294,7 +391,7 @@ function expandSensitiveField(field) {
   ]));
 }
 __name(expandSensitiveField, "expandSensitiveField");
-function generateDeepPaths(field, depth) {
+function generateDeepPaths(field, depth = 5) {
   const set = /* @__PURE__ */ new Set([
     field
   ]);
@@ -309,4 +406,4 @@ function generateDeepPaths(field, depth) {
 }
 __name(generateDeepPaths, "generateDeepPaths");
 
-export { _globalThis, addRedactFields, addSensitiveFields, createChildLogger, createRequestLogger, defaultSensitiveFields, expandSensitiveField, expandSensitiveFields, generateDeepPaths, getExpandedSensitiveFields, getLogger, getRedactCensor, logError, redact, setRedactCensor, setSensitiveFields };
+export { _globalThis, addRedactFields, addSensitiveFields, createChildLogger, createRequestLogger, defaultSensitiveFields, expandSensitiveField, expandSensitiveFields, generateDeepPaths, getExpandedSensitiveFields, getLogger, getRedactCensor, logError, redact, resetLogger, setRedactCensor, setSensitiveFields };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catbee/utils",
-  "version": "2.0.4",
+  "version": "2.1.1",
   "description": "A modular, production-grade utility toolkit for Node.js and TypeScript, designed for robust, scalable applications (including Express-based services). All utilities are tree-shakable and can be imported independently.",
   "publishConfig": {
     "access": "public"
@@ -20,17 +20,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "pino": "^10.3.1"
+    "pino": "^10.4.0"
   },
   "optionalDependencies": {
-    "@scalar/express-api-reference": "^0.9.6",
+    "@scalar/express-api-reference": "^0.10.26",
     "abort-controller": "^3.0.0",
-    "compression": "^1.8.1",
+    "compression": "^1.8.2",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.6",
-    "dotenv": "^17.4.1",
-    "express-rate-limit": "^8.3.2",
-    "helmet": "^8.1.0",
+    "dotenv": "^18.0.5",
+    "express-rate-limit": "^8.7.0",
+    "helmet": "^8.3.0",
     "pino-pretty": "^13.1.3",
     "reflect-metadata": "^0.2.2"
   },
@@ -145,6 +145,11 @@
       "require": "./fs/index.cjs",
       "types": "./fs/index.d.ts"
     },
+    "./healthz-server": {
+      "import": "./healthz-server/index.mjs",
+      "require": "./healthz-server/index.cjs",
+      "types": "./healthz-server/index.d.ts"
+    },
     "./http-status-codes": {
       "import": "./http-status-codes/index.mjs",
       "require": "./http-status-codes/index.cjs",