@rawnodes/logger 2.0.1 → 2.2.0

package/dist/index.d.mts

@@ -77,6 +77,18 @@ interface LevelConfigObject {
     rules?: LevelRule[];
 }
 type LevelConfig = LogLevel | LevelConfigObject;
+interface CallerConfig {
+    /** Stack depth to capture (default: 1). Higher values trace further up the call stack */
+    depth?: number;
+    /** Include full file path (default: false). If false, shows relative or basename only */
+    fullPath?: boolean;
+}
+interface CallerInfo {
+    file: string;
+    line: number;
+    column?: number;
+    function?: string;
+}
 interface LoggerConfig {
     level: LevelConfig;
     console: ConsoleConfig;
@@ -84,6 +96,8 @@ interface LoggerConfig {
     discord?: DiscordConfig | DiscordConfig[];
     telegram?: TelegramConfig | TelegramConfig[];
     cloudwatch?: CloudWatchConfig | CloudWatchConfig[];
+    /** Enable caller info (file:line) in logs. Pass true for defaults or CallerConfig for options */
+    caller?: boolean | CallerConfig;
 }
 type LoggerContext = Record<string, unknown>;
 type LevelOverrideMatch<TContext extends LoggerContext> = Partial<TContext> & {
@@ -264,6 +278,9 @@ interface MaskSecretsOptions {
 declare function maskSecrets(obj: unknown, options?: MaskSecretsOptions): unknown;
 declare function createMasker(options?: MaskSecretsOptions): (obj: unknown) => unknown;
 
+declare function getCallerInfo(config: CallerConfig, additionalOffset?: number): CallerInfo | undefined;
+declare function formatCallerInfo(info: CallerInfo): string;
+
 declare function flattenObject(obj: Record<string, unknown>, prefix?: string): Record<string, unknown>;
 declare function formatLogfmtValue(value: unknown): string;
 declare function formatLogfmt(data: Record<string, unknown>): string;
@@ -279,6 +296,7 @@ declare const TelegramConfigSchema: z.ZodType<TelegramConfig>;
 declare const CloudWatchConfigSchema: z.ZodType<CloudWatchConfig>;
 declare const LevelConfigObjectSchema: z.ZodType<LevelConfigObject>;
 declare const LevelConfigSchema: z.ZodType<LevelConfig>;
+declare const CallerConfigSchema: z.ZodType<CallerConfig>;
 declare const LoggerConfigSchema: z.ZodObject<{
     level: z.ZodType<LevelConfig, unknown, z.core.$ZodTypeInternals<LevelConfig, unknown>>;
     console: z.ZodType<ConsoleConfig, unknown, z.core.$ZodTypeInternals<ConsoleConfig, unknown>>;
@@ -286,6 +304,7 @@ declare const LoggerConfigSchema: z.ZodObject<{
     discord: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<DiscordConfig, unknown, z.core.$ZodTypeInternals<DiscordConfig, unknown>>, z.ZodArray<z.ZodType<DiscordConfig, unknown, z.core.$ZodTypeInternals<DiscordConfig, unknown>>>]>>;
     telegram: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<TelegramConfig, unknown, z.core.$ZodTypeInternals<TelegramConfig, unknown>>, z.ZodArray<z.ZodType<TelegramConfig, unknown, z.core.$ZodTypeInternals<TelegramConfig, unknown>>>]>>;
     cloudwatch: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<CloudWatchConfig, unknown, z.core.$ZodTypeInternals<CloudWatchConfig, unknown>>, z.ZodArray<z.ZodType<CloudWatchConfig, unknown, z.core.$ZodTypeInternals<CloudWatchConfig, unknown>>>]>>;
+    caller: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodType<CallerConfig, unknown, z.core.$ZodTypeInternals<CallerConfig, unknown>>]>>;
 }, z.core.$strip>;
 declare function validateConfig(config: unknown): z.infer<typeof LoggerConfigSchema>;
 declare function safeValidateConfig(config: unknown): z.ZodSafeParseResult<{
@@ -295,6 +314,7 @@ declare function safeValidateConfig(config: unknown): z.ZodSafeParseResult<{
     discord?: DiscordConfig | DiscordConfig[] | undefined;
     telegram?: TelegramConfig | TelegramConfig[] | undefined;
     cloudwatch?: CloudWatchConfig | CloudWatchConfig[] | undefined;
+    caller?: boolean | CallerConfig | undefined;
 }>;
 
-export { BaseHttpTransport, type BaseHttpTransportOptions, type BufferOptions, type BufferedMessage, type CloudWatchConfig, CloudWatchConfigSchema, CloudWatchTransport, type ConsoleConfig, ConsoleConfigSchema, type DiscordConfig, DiscordConfigSchema, DiscordTransport, type FileConfig, FileConfigSchema, type HttpTransportBaseConfig, HttpTransportBaseConfigSchema, LOG_LEVELS, type LevelConfig, type LevelConfigObject, LevelConfigObjectSchema, LevelConfigSchema, type LevelOverride, type LevelOverrideMatch, type LevelRule, LevelRuleSchema, type LogFormat, LogFormatSchema, type LogLevel, LogLevelSchema, Logger, type LoggerConfig, LoggerConfigSchema, type LoggerContext, LoggerStore, type MaskSecretsOptions, MessageBuffer, type Meta, type RequestIdOptions, type SingletonLogger, type TelegramConfig, TelegramConfigSchema, TelegramTransport, type TimingResult, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatLogfmt, formatLogfmtValue, generateRequestId, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
+export { BaseHttpTransport, type BaseHttpTransportOptions, type BufferOptions, type BufferedMessage, type CallerConfig, CallerConfigSchema, type CallerInfo, type CloudWatchConfig, CloudWatchConfigSchema, CloudWatchTransport, type ConsoleConfig, ConsoleConfigSchema, type DiscordConfig, DiscordConfigSchema, DiscordTransport, type FileConfig, FileConfigSchema, type HttpTransportBaseConfig, HttpTransportBaseConfigSchema, LOG_LEVELS, type LevelConfig, type LevelConfigObject, LevelConfigObjectSchema, LevelConfigSchema, type LevelOverride, type LevelOverrideMatch, type LevelRule, LevelRuleSchema, type LogFormat, LogFormatSchema, type LogLevel, LogLevelSchema, Logger, type LoggerConfig, LoggerConfigSchema, type LoggerContext, LoggerStore, type MaskSecretsOptions, MessageBuffer, type Meta, type RequestIdOptions, type SingletonLogger, type TelegramConfig, TelegramConfigSchema, TelegramTransport, type TimingResult, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };

package/dist/index.d.ts

@@ -77,6 +77,18 @@ interface LevelConfigObject {
     rules?: LevelRule[];
 }
 type LevelConfig = LogLevel | LevelConfigObject;
+interface CallerConfig {
+    /** Stack depth to capture (default: 1). Higher values trace further up the call stack */
+    depth?: number;
+    /** Include full file path (default: false). If false, shows relative or basename only */
+    fullPath?: boolean;
+}
+interface CallerInfo {
+    file: string;
+    line: number;
+    column?: number;
+    function?: string;
+}
 interface LoggerConfig {
     level: LevelConfig;
     console: ConsoleConfig;
@@ -84,6 +96,8 @@ interface LoggerConfig {
     discord?: DiscordConfig | DiscordConfig[];
     telegram?: TelegramConfig | TelegramConfig[];
     cloudwatch?: CloudWatchConfig | CloudWatchConfig[];
+    /** Enable caller info (file:line) in logs. Pass true for defaults or CallerConfig for options */
+    caller?: boolean | CallerConfig;
 }
 type LoggerContext = Record<string, unknown>;
 type LevelOverrideMatch<TContext extends LoggerContext> = Partial<TContext> & {
@@ -264,6 +278,9 @@ interface MaskSecretsOptions {
 declare function maskSecrets(obj: unknown, options?: MaskSecretsOptions): unknown;
 declare function createMasker(options?: MaskSecretsOptions): (obj: unknown) => unknown;
 
+declare function getCallerInfo(config: CallerConfig, additionalOffset?: number): CallerInfo | undefined;
+declare function formatCallerInfo(info: CallerInfo): string;
+
 declare function flattenObject(obj: Record<string, unknown>, prefix?: string): Record<string, unknown>;
 declare function formatLogfmtValue(value: unknown): string;
 declare function formatLogfmt(data: Record<string, unknown>): string;
@@ -279,6 +296,7 @@ declare const TelegramConfigSchema: z.ZodType<TelegramConfig>;
 declare const CloudWatchConfigSchema: z.ZodType<CloudWatchConfig>;
 declare const LevelConfigObjectSchema: z.ZodType<LevelConfigObject>;
 declare const LevelConfigSchema: z.ZodType<LevelConfig>;
+declare const CallerConfigSchema: z.ZodType<CallerConfig>;
 declare const LoggerConfigSchema: z.ZodObject<{
     level: z.ZodType<LevelConfig, unknown, z.core.$ZodTypeInternals<LevelConfig, unknown>>;
     console: z.ZodType<ConsoleConfig, unknown, z.core.$ZodTypeInternals<ConsoleConfig, unknown>>;
@@ -286,6 +304,7 @@ declare const LoggerConfigSchema: z.ZodObject<{
     discord: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<DiscordConfig, unknown, z.core.$ZodTypeInternals<DiscordConfig, unknown>>, z.ZodArray<z.ZodType<DiscordConfig, unknown, z.core.$ZodTypeInternals<DiscordConfig, unknown>>>]>>;
     telegram: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<TelegramConfig, unknown, z.core.$ZodTypeInternals<TelegramConfig, unknown>>, z.ZodArray<z.ZodType<TelegramConfig, unknown, z.core.$ZodTypeInternals<TelegramConfig, unknown>>>]>>;
     cloudwatch: z.ZodOptional<z.ZodUnion<readonly [z.ZodType<CloudWatchConfig, unknown, z.core.$ZodTypeInternals<CloudWatchConfig, unknown>>, z.ZodArray<z.ZodType<CloudWatchConfig, unknown, z.core.$ZodTypeInternals<CloudWatchConfig, unknown>>>]>>;
+    caller: z.ZodOptional<z.ZodUnion<readonly [z.ZodBoolean, z.ZodType<CallerConfig, unknown, z.core.$ZodTypeInternals<CallerConfig, unknown>>]>>;
 }, z.core.$strip>;
 declare function validateConfig(config: unknown): z.infer<typeof LoggerConfigSchema>;
 declare function safeValidateConfig(config: unknown): z.ZodSafeParseResult<{
@@ -295,6 +314,7 @@ declare function safeValidateConfig(config: unknown): z.ZodSafeParseResult<{
     discord?: DiscordConfig | DiscordConfig[] | undefined;
     telegram?: TelegramConfig | TelegramConfig[] | undefined;
     cloudwatch?: CloudWatchConfig | CloudWatchConfig[] | undefined;
+    caller?: boolean | CallerConfig | undefined;
 }>;
 
-export { BaseHttpTransport, type BaseHttpTransportOptions, type BufferOptions, type BufferedMessage, type CloudWatchConfig, CloudWatchConfigSchema, CloudWatchTransport, type ConsoleConfig, ConsoleConfigSchema, type DiscordConfig, DiscordConfigSchema, DiscordTransport, type FileConfig, FileConfigSchema, type HttpTransportBaseConfig, HttpTransportBaseConfigSchema, LOG_LEVELS, type LevelConfig, type LevelConfigObject, LevelConfigObjectSchema, LevelConfigSchema, type LevelOverride, type LevelOverrideMatch, type LevelRule, LevelRuleSchema, type LogFormat, LogFormatSchema, type LogLevel, LogLevelSchema, Logger, type LoggerConfig, LoggerConfigSchema, type LoggerContext, LoggerStore, type MaskSecretsOptions, MessageBuffer, type Meta, type RequestIdOptions, type SingletonLogger, type TelegramConfig, TelegramConfigSchema, TelegramTransport, type TimingResult, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatLogfmt, formatLogfmtValue, generateRequestId, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
+export { BaseHttpTransport, type BaseHttpTransportOptions, type BufferOptions, type BufferedMessage, type CallerConfig, CallerConfigSchema, type CallerInfo, type CloudWatchConfig, CloudWatchConfigSchema, CloudWatchTransport, type ConsoleConfig, ConsoleConfigSchema, type DiscordConfig, DiscordConfigSchema, DiscordTransport, type FileConfig, FileConfigSchema, type HttpTransportBaseConfig, HttpTransportBaseConfigSchema, LOG_LEVELS, type LevelConfig, type LevelConfigObject, LevelConfigObjectSchema, LevelConfigSchema, type LevelOverride, type LevelOverrideMatch, type LevelRule, LevelRuleSchema, type LogFormat, LogFormatSchema, type LogLevel, LogLevelSchema, Logger, type LoggerConfig, LoggerConfigSchema, type LoggerContext, LoggerStore, type MaskSecretsOptions, MessageBuffer, type Meta, type RequestIdOptions, type SingletonLogger, type TelegramConfig, TelegramConfigSchema, TelegramTransport, type TimingResult, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };

package/dist/index.js

@@ -8,6 +8,7 @@ var rotatingFileStream = require('rotating-file-stream');
 var events = require('events');
 var clientCloudwatchLogs = require('@aws-sdk/client-cloudwatch-logs');
 var zod = require('zod');
+var path = require('path');
 var crypto = require('crypto');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -664,6 +665,9 @@ function createStreams(config, store) {
     const fileConfig = config.file;
     promises.mkdir(fileConfig.dirname, { recursive: true }).catch(() => {
     });
+    const normalizeSize = (size) => {
+      return size.replace(/([kmg])$/i, (match) => match.toUpperCase());
+    };
     const rotatingStream = rotatingFileStream.createStream(
       (time, index) => {
         const date = time instanceof Date ? time : /* @__PURE__ */ new Date();
@@ -673,7 +677,7 @@ function createStreams(config, store) {
       },
       {
         path: fileConfig.dirname,
-        size: fileConfig.maxSize || "20M",
+        size: normalizeSize(fileConfig.maxSize || "20M"),
         interval: fileConfig.datePattern === "YYYY-MM-DD-HH" ? "1h" : "1d",
         compress: fileConfig.zippedArchive ? "gzip" : false,
         maxFiles: parseInt(fileConfig.maxFiles?.replace("d", "") || "14")
@@ -809,13 +813,20 @@ function createState(config, store) {
     // Disable pid and hostname
   };
   const pinoLogger = pino__default.default(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) {
@@ -938,13 +949,18 @@ var LevelConfigSchema = zod.z.union([
   LogLevelSchema,
   LevelConfigObjectSchema
 ]);
+var CallerConfigSchema = zod.z.object({
+  depth: zod.z.number().int().nonnegative().optional(),
+  fullPath: zod.z.boolean().optional()
+});
 var LoggerConfigSchema = zod.z.object({
   level: LevelConfigSchema,
   console: ConsoleConfigSchema,
   file: FileConfigSchema.optional(),
   discord: zod.z.union([DiscordConfigSchema, zod.z.array(DiscordConfigSchema)]).optional(),
   telegram: zod.z.union([TelegramConfigSchema, zod.z.array(TelegramConfigSchema)]).optional(),
-  cloudwatch: zod.z.union([CloudWatchConfigSchema, zod.z.array(CloudWatchConfigSchema)]).optional()
+  cloudwatch: zod.z.union([CloudWatchConfigSchema, zod.z.array(CloudWatchConfigSchema)]).optional(),
+  caller: zod.z.union([zod.z.boolean(), CallerConfigSchema]).optional()
 });
 function validateConfig(config) {
   return LoggerConfigSchema.parse(config);
@@ -952,6 +968,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 = path.relative(process.cwd(), file);
+        if (relativePath.startsWith("..") && relativePath.split("/").filter((p) => p === "..").length > 2) {
+          file = path.basename(file);
+        } else {
+          file = relativePath;
+        }
+      } catch {
+        file = path.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 {
@@ -1054,13 +1130,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;
@@ -1304,6 +1386,7 @@ function formatLogfmt(data) {
 }
 
 exports.BaseHttpTransport = BaseHttpTransport;
+exports.CallerConfigSchema = CallerConfigSchema;
 exports.CloudWatchConfigSchema = CloudWatchConfigSchema;
 exports.CloudWatchTransport = CloudWatchTransport;
 exports.ConsoleConfigSchema = ConsoleConfigSchema;
@@ -1328,9 +1411,11 @@ exports.createMasker = createMasker;
 exports.createSingletonLogger = createSingletonLogger;
 exports.extractRequestId = extractRequestId;
 exports.flattenObject = flattenObject;
+exports.formatCallerInfo = formatCallerInfo;
 exports.formatLogfmt = formatLogfmt;
 exports.formatLogfmtValue = formatLogfmtValue;
 exports.generateRequestId = generateRequestId;
+exports.getCallerInfo = getCallerInfo;
 exports.getOrGenerateRequestId = getOrGenerateRequestId;
 exports.isValidLogLevel = isValidLogLevel;
 exports.maskSecrets = maskSecrets;