@rawnodes/logger 2.1.0 → 2.3.0

package/dist/index.mjs

@@ -6,6 +6,7 @@ import { createStream } from 'rotating-file-stream';
 import { EventEmitter } from 'events';
 import { CloudWatchLogsClient, PutLogEventsCommand, CreateLogGroupCommand, CreateLogStreamCommand, DescribeLogStreamsCommand } from '@aws-sdk/client-cloudwatch-logs';
 import { z } from 'zod';
+import { relative, basename } from 'path';
 import { randomUUID } from 'crypto';
 
 // src/state.ts
@@ -671,7 +672,7 @@ function createStreams(config, store) {
       {
         path: fileConfig.dirname,
         size: normalizeSize(fileConfig.maxSize || "20M"),
-        interval: fileConfig.datePattern === "YYYY-MM-DD-HH" ? "1h" : "1d",
+        interval: fileConfig.interval || (fileConfig.datePattern === "YYYY-MM-DD-HH" ? "1h" : "1d"),
         compress: fileConfig.zippedArchive ? "gzip" : false,
         maxFiles: parseInt(fileConfig.maxFiles?.replace("d", "") || "14")
       }
@@ -806,13 +807,20 @@ function createState(config, store) {
     // Disable pid and hostname
   };
   const pinoLogger = pino(options, streams);
+  let callerConfig;
+  if (config.caller === true) {
+    callerConfig = {};
+  } else if (config.caller && typeof config.caller === "object") {
+    callerConfig = config.caller;
+  }
   return {
     pino: pinoLogger,
     store: loggerStore,
     defaultLevel,
     levelOverrides,
     contextIndex,
-    complexRules
+    complexRules,
+    callerConfig
   };
 }
 function rebuildIndexes(state) {
@@ -870,6 +878,7 @@ var FileConfigSchema = z.object({
   dirname: z.string().min(1, "dirname is required"),
   filename: z.string().min(1, "filename is required"),
   datePattern: z.string().optional(),
+  interval: z.string().regex(/^\d+[Mdhms]$/).optional(),
   zippedArchive: z.boolean().optional(),
   maxSize: z.string().optional(),
   maxFiles: z.string().optional()
@@ -935,13 +944,18 @@ var LevelConfigSchema = z.union([
   LogLevelSchema,
   LevelConfigObjectSchema
 ]);
+var CallerConfigSchema = z.object({
+  depth: z.number().int().nonnegative().optional(),
+  fullPath: z.boolean().optional()
+});
 var LoggerConfigSchema = z.object({
   level: LevelConfigSchema,
   console: ConsoleConfigSchema,
   file: FileConfigSchema.optional(),
   discord: z.union([DiscordConfigSchema, z.array(DiscordConfigSchema)]).optional(),
   telegram: z.union([TelegramConfigSchema, z.array(TelegramConfigSchema)]).optional(),
-  cloudwatch: z.union([CloudWatchConfigSchema, z.array(CloudWatchConfigSchema)]).optional()
+  cloudwatch: z.union([CloudWatchConfigSchema, z.array(CloudWatchConfigSchema)]).optional(),
+  caller: z.union([z.boolean(), CallerConfigSchema]).optional()
 });
 function validateConfig(config) {
   return LoggerConfigSchema.parse(config);
@@ -949,6 +963,66 @@ function validateConfig(config) {
 function safeValidateConfig(config) {
   return LoggerConfigSchema.safeParse(config);
 }
+var BASE_STACK_OFFSET = 4;
+var STACK_LINE_REGEX = /^\s*at\s+(?:(.+?)\s+\()?(.+):(\d+):(\d+)\)?$/;
+function getCallerInfo(config, additionalOffset = 0) {
+  const depth = config.depth ?? 0;
+  const targetFrame = BASE_STACK_OFFSET + depth + additionalOffset;
+  const originalPrepare = Error.prepareStackTrace;
+  const originalLimit = Error.stackTraceLimit;
+  try {
+    Error.stackTraceLimit = targetFrame + 5;
+    const err = new Error();
+    const stack = err.stack;
+    if (!stack) {
+      return void 0;
+    }
+    const lines = stack.split("\n");
+    const targetLine = lines[targetFrame];
+    if (!targetLine) {
+      return void 0;
+    }
+    const match = targetLine.match(STACK_LINE_REGEX);
+    if (!match) {
+      return void 0;
+    }
+    const [, fnName, filePath, lineStr, colStr] = match;
+    const line = parseInt(lineStr, 10);
+    const column = parseInt(colStr, 10);
+    let file = filePath;
+    if (file.startsWith("file://")) {
+      file = file.slice(7);
+    }
+    if (!config.fullPath) {
+      try {
+        const relativePath = relative(process.cwd(), file);
+        if (relativePath.startsWith("..") && relativePath.split("/").filter((p) => p === "..").length > 2) {
+          file = basename(file);
+        } else {
+          file = relativePath;
+        }
+      } catch {
+        file = basename(file);
+      }
+    }
+    return {
+      file,
+      line,
+      column: isNaN(column) ? void 0 : column,
+      function: fnName && fnName !== "<anonymous>" ? fnName : void 0
+    };
+  } finally {
+    Error.prepareStackTrace = originalPrepare;
+    Error.stackTraceLimit = originalLimit;
+  }
+}
+function formatCallerInfo(info) {
+  const location = `${info.file}:${info.line}`;
+  if (info.function) {
+    return `${info.function} (${location})`;
+  }
+  return location;
+}
 
 // src/logger.ts
 var Logger = class _Logger {
@@ -1051,13 +1125,19 @@ var Logger = class _Logger {
     this.log("silly", message, meta);
   }
   // Private
-  log(level, message, meta, error) {
+  log(level, message, meta, error, callerOffset = 0) {
     const resolved = typeof meta === "function" ? meta() : meta;
     const logMeta = { context: this.context, ...resolved };
     const storeContext = this.state.store.getStore();
     if (storeContext) {
       Object.assign(logMeta, storeContext);
     }
+    if (this.state.callerConfig) {
+      const callerInfo = getCallerInfo(this.state.callerConfig, callerOffset);
+      if (callerInfo) {
+        logMeta.caller = formatCallerInfo(callerInfo);
+      }
+    }
     if (error instanceof Error) {
       logMeta.errorMessage = error.message;
       logMeta.stack = error.stack;
@@ -1300,6 +1380,6 @@ function formatLogfmt(data) {
   return Object.entries(flattened).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${formatLogfmtValue(value)}`).join(" ");
 }
 
-export { BaseHttpTransport, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatLogfmt, formatLogfmtValue, generateRequestId, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
+export { BaseHttpTransport, CallerConfigSchema, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map