@rawnodes/logger 2.6.0 → 2.7.1

package/dist/index.mjs

@@ -596,7 +596,13 @@ function shouldPassTransport(log, level, rules, store) {
   const logLevel = getLevelName(log.level);
   const context = log.context;
   const storeContext = store.getStore();
-  const matchingRule = rules?.find((rule) => matchesContext(storeContext, context, rule.match));
+  const logMeta = {};
+  for (const [key, value] of Object.entries(log)) {
+    if (!["level", "time", "msg", "context"].includes(key)) {
+      logMeta[key] = value;
+    }
+  }
+  const matchingRule = rules?.find((rule) => matchesContext(storeContext, context, rule.match, logMeta));
   const effectiveLevel = matchingRule?.level ?? level ?? "silly";
   if (effectiveLevel === "off") return false;
   return LOG_LEVELS[logLevel] <= LOG_LEVELS[effectiveLevel];
@@ -893,8 +899,8 @@ function getEffectiveLevel(state, loggerContext) {
   }
   return state.defaultLevel;
 }
-function matchesContext(storeContext, loggerContext, match) {
-  const combined = { ...storeContext, context: loggerContext };
+function matchesContext(storeContext, loggerContext, match, logMeta) {
+  const combined = { ...logMeta, ...storeContext, context: loggerContext };
   return Object.entries(match).every(([key, value]) => combined[key] === value);
 }
 var LogLevelSchema = z.enum([
@@ -1141,6 +1147,129 @@ function registerShutdown(logger, options = {}) {
   return shutdown;
 }
 
+// src/utils/error.ts
+function isAxiosError(error) {
+  return error !== null && typeof error === "object" && "isAxiosError" in error && error.isAxiosError === true;
+}
+function sanitizeResponseData(data, maxStringLength = 1e4) {
+  if (data === null || data === void 0) {
+    return data;
+  }
+  if (typeof data === "string") {
+    return data.length > maxStringLength ? `${data.slice(0, maxStringLength)}...[truncated]` : data;
+  }
+  if (typeof data === "number" || typeof data === "boolean") {
+    return data;
+  }
+  if (Array.isArray(data)) {
+    return data.slice(0, 100).map((item) => sanitizeResponseData(item, maxStringLength));
+  }
+  if (typeof data === "object") {
+    const result = {};
+    const entries = Object.entries(data);
+    for (const [key, value] of entries.slice(0, 50)) {
+      result[key] = sanitizeResponseData(value, maxStringLength);
+    }
+    return result;
+  }
+  return String(data);
+}
+function extractAxiosHttpData(error) {
+  const httpData = {};
+  if (error.code) {
+    httpData.code = error.code;
+  }
+  if (error.response) {
+    httpData.status = error.response.status;
+    httpData.statusText = error.response.statusText;
+    if (error.response.data !== void 0) {
+      httpData.responseData = sanitizeResponseData(error.response.data);
+    }
+  }
+  if (error.config) {
+    const { url, baseURL, method } = error.config;
+    if (url) {
+      httpData.url = baseURL && !url.startsWith("http") ? `${baseURL}${url}` : url;
+    }
+    if (method) {
+      httpData.method = method.toUpperCase();
+    }
+  }
+  return httpData;
+}
+function extractGenericHttpData(error) {
+  const httpData = {};
+  let hasData = false;
+  if (typeof error.code === "string") {
+    httpData.code = error.code;
+    hasData = true;
+  }
+  const response = error.response;
+  if (response && typeof response === "object") {
+    if (typeof response.status === "number") {
+      httpData.status = response.status;
+      hasData = true;
+    }
+    if (typeof response.statusText === "string") {
+      httpData.statusText = response.statusText;
+      hasData = true;
+    }
+    if (response.data !== void 0) {
+      httpData.responseData = sanitizeResponseData(response.data);
+      hasData = true;
+    }
+  }
+  const config = error.config;
+  if (config && typeof config === "object") {
+    const url = config.url;
+    const baseURL = config.baseURL;
+    if (typeof url === "string") {
+      httpData.url = baseURL && !url.startsWith("http") ? `${baseURL}${url}` : url;
+      hasData = true;
+    }
+    if (typeof config.method === "string") {
+      httpData.method = config.method.toUpperCase();
+      hasData = true;
+    }
+  }
+  return hasData ? httpData : void 0;
+}
+function serializeError(error) {
+  if (!(error instanceof Error)) {
+    if (error === null || error === void 0) {
+      return { errorMessage: "Unknown error" };
+    }
+    if (typeof error === "string") {
+      return { errorMessage: error };
+    }
+    const httpData2 = typeof error === "object" ? extractGenericHttpData(error) : void 0;
+    return {
+      errorMessage: String(error),
+      http: httpData2
+    };
+  }
+  const serialized = {
+    errorMessage: error.message,
+    stack: error.stack
+  };
+  if (error.name && error.name !== "Error") {
+    serialized.errorName = error.name;
+  }
+  if (isAxiosError(error)) {
+    serialized.http = extractAxiosHttpData(error);
+    return serialized;
+  }
+  const errWithCode = error;
+  if (typeof errWithCode.code === "string") {
+    serialized.code = errWithCode.code;
+  }
+  const httpData = extractGenericHttpData(error);
+  if (httpData) {
+    serialized.http = httpData;
+  }
+  return serialized;
+}
+
 // src/logger.ts
 var Logger = class _Logger {
   constructor(state, context) {
@@ -1269,11 +1398,19 @@ var Logger = class _Logger {
         logMeta.caller = formatCallerInfo(callerInfo);
       }
     }
-    if (error instanceof Error) {
-      logMeta.errorMessage = error.message;
-      logMeta.stack = error.stack;
-    } else if (error !== void 0) {
-      logMeta.error = error;
+    if (error !== void 0) {
+      const serialized = serializeError(error);
+      logMeta.errorMessage = serialized.errorMessage;
+      logMeta.stack = serialized.stack;
+      if (serialized.errorName) {
+        logMeta.errorName = serialized.errorName;
+      }
+      if (serialized.code) {
+        logMeta.errorCode = serialized.code;
+      }
+      if (serialized.http) {
+        logMeta.http = serialized.http;
+      }
     }
     const pinoMethod = this.getPinoMethod(level);
     pinoMethod.call(this.state.pino, logMeta, message);
@@ -1523,6 +1660,6 @@ function formatLogfmt(data) {
   return Object.entries(flattened).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${formatLogfmtValue(value)}`).join(" ");
 }
 
-export { AutoShutdownConfigSchema, BaseHttpTransport, CallerConfigSchema, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, LogStreamNameSchema, LogStreamPatternConfigSchema, LogStreamPatternSchema, LogStreamTemplateConfigSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, registerShutdown, safeValidateConfig, validateConfig };
+export { AutoShutdownConfigSchema, BaseHttpTransport, CallerConfigSchema, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, LogStreamNameSchema, LogStreamPatternConfigSchema, LogStreamPatternSchema, LogStreamTemplateConfigSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, registerShutdown, safeValidateConfig, serializeError, validateConfig };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map