@spfn/core 0.1.0-alpha.88 → 0.2.0-beta.2

package/dist/middleware/index.js

@@ -1,718 +1,61 @@
-import { existsSync, mkdirSync, createWriteStream, statSync, readdirSync, renameSync, unlinkSync, accessSync, constants, writeFileSync } from 'fs';
-import { join } from 'path';
+import { SerializableError } from '@spfn/core/errors';
+import { logger } from '@spfn/core/logger';
+import { env } from '@spfn/core/config';
 import { randomBytes } from 'crypto';
 
-// src/logger/types.ts
-var LOG_LEVEL_PRIORITY = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3,
-  fatal: 4
-};
-
-// src/logger/formatters.ts
-var SENSITIVE_KEYS = [
-  "password",
-  "passwd",
-  "pwd",
-  "secret",
-  "token",
-  "apikey",
-  "api_key",
-  "accesstoken",
-  "access_token",
-  "refreshtoken",
-  "refresh_token",
-  "authorization",
-  "auth",
-  "cookie",
-  "session",
-  "sessionid",
-  "session_id",
-  "privatekey",
-  "private_key",
-  "creditcard",
-  "credit_card",
-  "cardnumber",
-  "card_number",
-  "cvv",
-  "ssn",
-  "pin"
-];
-var MASKED_VALUE = "***MASKED***";
-function isSensitiveKey(key) {
-  const lowerKey = key.toLowerCase();
-  return SENSITIVE_KEYS.some((sensitive) => lowerKey.includes(sensitive));
-}
-function maskSensitiveData(data) {
-  if (data === null || data === void 0) {
-    return data;
-  }
-  if (Array.isArray(data)) {
-    return data.map((item) => maskSensitiveData(item));
-  }
-  if (typeof data === "object") {
-    const masked = {};
-    for (const [key, value] of Object.entries(data)) {
-      if (isSensitiveKey(key)) {
-        masked[key] = MASKED_VALUE;
-      } else if (typeof value === "object" && value !== null) {
-        masked[key] = maskSensitiveData(value);
-      } else {
-        masked[key] = value;
-      }
-    }
-    return masked;
-  }
-  return data;
-}
-var COLORS = {
-  reset: "\x1B[0m",
-  bright: "\x1B[1m",
-  dim: "\x1B[2m",
-  // 로그 레벨 컬러
-  debug: "\x1B[36m",
-  // cyan
-  info: "\x1B[32m",
-  // green
-  warn: "\x1B[33m",
-  // yellow
-  error: "\x1B[31m",
-  // red
-  fatal: "\x1B[35m",
-  // magenta
-  // 추가 컬러
-  gray: "\x1B[90m"
-};
-function formatTimestamp(date) {
-  return date.toISOString();
-}
-function formatTimestampHuman(date) {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, "0");
-  const day = String(date.getDate()).padStart(2, "0");
-  const hours = String(date.getHours()).padStart(2, "0");
-  const minutes = String(date.getMinutes()).padStart(2, "0");
-  const seconds = String(date.getSeconds()).padStart(2, "0");
-  const ms = String(date.getMilliseconds()).padStart(3, "0");
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${ms}`;
-}
-function formatError(error) {
-  const lines = [];
-  lines.push(`${error.name}: ${error.message}`);
-  if (error.stack) {
-    const stackLines = error.stack.split("\n").slice(1);
-    lines.push(...stackLines);
-  }
-  return lines.join("\n");
-}
-function formatConsole(metadata, colorize = true) {
-  const parts = [];
-  const timestamp = formatTimestampHuman(metadata.timestamp);
-  if (colorize) {
-    parts.push(`${COLORS.gray}[${timestamp}]${COLORS.reset}`);
-  } else {
-    parts.push(`[${timestamp}]`);
-  }
-  if (metadata.module) {
-    if (colorize) {
-      parts.push(`${COLORS.dim}[module=${metadata.module}]${COLORS.reset}`);
-    } else {
-      parts.push(`[module=${metadata.module}]`);
-    }
-  }
-  if (metadata.context && Object.keys(metadata.context).length > 0) {
-    Object.entries(metadata.context).forEach(([key, value]) => {
-      let valueStr;
-      if (typeof value === "string") {
-        valueStr = value;
-      } else if (typeof value === "object" && value !== null) {
-        try {
-          valueStr = JSON.stringify(value);
-        } catch (error) {
-          valueStr = "[circular]";
-        }
-      } else {
-        valueStr = String(value);
-      }
-      if (colorize) {
-        parts.push(`${COLORS.dim}[${key}=${valueStr}]${COLORS.reset}`);
-      } else {
-        parts.push(`[${key}=${valueStr}]`);
-      }
-    });
-  }
-  const levelStr = metadata.level.toUpperCase();
-  if (colorize) {
-    const color = COLORS[metadata.level];
-    parts.push(`${color}(${levelStr})${COLORS.reset}:`);
-  } else {
-    parts.push(`(${levelStr}):`);
-  }
-  if (colorize) {
-    parts.push(`${COLORS.bright}${metadata.message}${COLORS.reset}`);
+// src/middleware/error-handler.ts
+var errorLogger = logger.child("@spfn/core:error-handler");
+function logError(err, logData, includeStack) {
+  const logLevel = logData.statusCode >= 500 ? "error" : "warn";
+  if (includeStack) {
+    errorLogger[logLevel]("Error occurred", err, logData);
   } else {
-    parts.push(metadata.message);
+    errorLogger[logLevel]("Error occurred", logData);
   }
-  let output = parts.join(" ");
-  if (metadata.error) {
-    output += "\n" + formatError(metadata.error);
-  }
-  return output;
 }
-function formatJSON(metadata) {
-  const obj = {
-    timestamp: formatTimestamp(metadata.timestamp),
-    level: metadata.level,
-    message: metadata.message
-  };
-  if (metadata.module) {
-    obj.module = metadata.module;
-  }
-  if (metadata.context) {
-    obj.context = metadata.context;
-  }
-  if (metadata.error) {
-    obj.error = {
-      name: metadata.error.name,
-      message: metadata.error.message,
-      stack: metadata.error.stack
-    };
-  }
-  return JSON.stringify(obj);
+function isSerializableError(err) {
+  return err instanceof SerializableError || typeof err.toJSON === "function" && typeof err.statusCode === "number";
 }
-
-// src/logger/logger.ts
-var Logger = class _Logger {
-  config;
-  module;
-  constructor(config) {
-    this.config = config;
-    this.module = config.module;
-  }
-  /**
-   * Get current log level
-   */
-  get level() {
-    return this.config.level;
-  }
-  /**
-   * Create child logger (per module)
-   */
-  child(module) {
-    return new _Logger({
-      ...this.config,
-      module
-    });
-  }
-  /**
-   * Debug log
-   */
-  debug(message, context) {
-    this.log("debug", message, void 0, context);
-  }
-  /**
-   * Info log
-   */
-  info(message, context) {
-    this.log("info", message, void 0, context);
-  }
-  warn(message, errorOrContext, context) {
-    if (errorOrContext instanceof Error) {
-      this.log("warn", message, errorOrContext, context);
-    } else {
-      this.log("warn", message, void 0, errorOrContext);
-    }
-  }
-  error(message, errorOrContext, context) {
-    if (errorOrContext instanceof Error) {
-      this.log("error", message, errorOrContext, context);
-    } else {
-      this.log("error", message, void 0, errorOrContext);
-    }
-  }
-  fatal(message, errorOrContext, context) {
-    if (errorOrContext instanceof Error) {
-      this.log("fatal", message, errorOrContext, context);
-    } else {
-      this.log("fatal", message, void 0, errorOrContext);
-    }
-  }
-  /**
-   * Log processing (internal)
-   */
-  log(level, message, error, context) {
-    if (LOG_LEVEL_PRIORITY[level] < LOG_LEVEL_PRIORITY[this.config.level]) {
-      return;
-    }
-    const metadata = {
-      timestamp: /* @__PURE__ */ new Date(),
-      level,
-      message,
-      module: this.module,
-      error,
-      // Mask sensitive information in context to prevent credential leaks
-      context: context ? maskSensitiveData(context) : void 0
-    };
-    this.processTransports(metadata);
-  }
-  /**
-   * Process Transports
-   */
-  processTransports(metadata) {
-    const promises = this.config.transports.filter((transport) => transport.enabled).map((transport) => this.safeTransportLog(transport, metadata));
-    Promise.all(promises).catch((error) => {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[Logger] Transport error: ${errorMessage}
-`);
-    });
-  }
-  /**
-   * Transport log (error-safe)
-   */
-  async safeTransportLog(transport, metadata) {
-    try {
-      await transport.log(metadata);
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[Logger] Transport "${transport.name}" failed: ${errorMessage}
-`);
-    }
-  }
-  /**
-   * Close all Transports
-   */
-  async close() {
-    const closePromises = this.config.transports.filter((transport) => transport.close).map((transport) => transport.close());
-    await Promise.all(closePromises);
-  }
-};
-
-// src/logger/transports/console.ts
-var ConsoleTransport = class {
-  name = "console";
-  level;
-  enabled;
-  colorize;
-  constructor(config) {
-    this.level = config.level;
-    this.enabled = config.enabled;
-    this.colorize = config.colorize ?? true;
-  }
-  async log(metadata) {
-    if (!this.enabled) {
-      return;
-    }
-    if (LOG_LEVEL_PRIORITY[metadata.level] < LOG_LEVEL_PRIORITY[this.level]) {
-      return;
-    }
-    const message = formatConsole(metadata, this.colorize);
-    if (metadata.level === "warn" || metadata.level === "error" || metadata.level === "fatal") {
-      console.error(message);
-    } else {
-      console.log(message);
-    }
-  }
-};
-var FileTransport = class {
-  name = "file";
-  level;
-  enabled;
-  logDir;
-  maxFileSize;
-  maxFiles;
-  currentStream = null;
-  currentFilename = null;
-  constructor(config) {
-    this.level = config.level;
-    this.enabled = config.enabled;
-    this.logDir = config.logDir;
-    this.maxFileSize = config.maxFileSize ?? 10 * 1024 * 1024;
-    this.maxFiles = config.maxFiles ?? 10;
-    if (!existsSync(this.logDir)) {
-      mkdirSync(this.logDir, { recursive: true });
-    }
-  }
-  async log(metadata) {
-    if (!this.enabled) {
-      return;
-    }
-    if (LOG_LEVEL_PRIORITY[metadata.level] < LOG_LEVEL_PRIORITY[this.level]) {
-      return;
-    }
-    const message = formatJSON(metadata);
-    const filename = this.getLogFilename(metadata.timestamp);
-    if (this.currentFilename !== filename) {
-      await this.rotateStream(filename);
-      await this.cleanOldFiles();
-    } else if (this.currentFilename) {
-      await this.checkAndRotateBySize();
-    }
-    if (this.currentStream) {
-      return new Promise((resolve, reject) => {
-        this.currentStream.write(message + "\n", "utf-8", (error) => {
-          if (error) {
-            process.stderr.write(`[FileTransport] Failed to write log: ${error.message}
-`);
-            reject(error);
-          } else {
-            resolve();
-          }
-        });
-      });
-    }
-  }
-  /**
-   * 스트림 교체 (날짜 변경 시)
-   */
-  async rotateStream(filename) {
-    if (this.currentStream) {
-      await this.closeStream();
-    }
-    const filepath = join(this.logDir, filename);
-    this.currentStream = createWriteStream(filepath, {
-      flags: "a",
-      // append mode
-      encoding: "utf-8"
-    });
-    this.currentFilename = filename;
-    this.currentStream.on("error", (error) => {
-      process.stderr.write(`[FileTransport] Stream error: ${error.message}
-`);
-      this.currentStream = null;
-      this.currentFilename = null;
-    });
-  }
-  /**
-   * 현재 스트림 닫기
-   */
-  async closeStream() {
-    if (!this.currentStream) {
-      return;
-    }
-    return new Promise((resolve, reject) => {
-      this.currentStream.end((error) => {
-        if (error) {
-          reject(error);
-        } else {
-          this.currentStream = null;
-          this.currentFilename = null;
-          resolve();
-        }
-      });
-    });
-  }
-  /**
-   * 파일 크기 체크 및 크기 기반 로테이션
-   */
-  async checkAndRotateBySize() {
-    if (!this.currentFilename) {
-      return;
-    }
-    const filepath = join(this.logDir, this.currentFilename);
-    if (!existsSync(filepath)) {
-      return;
-    }
-    try {
-      const stats = statSync(filepath);
-      if (stats.size >= this.maxFileSize) {
-        await this.rotateBySize();
-      }
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[FileTransport] Failed to check file size: ${errorMessage}
-`);
-    }
-  }
-  /**
-   * 크기 기반 로테이션 수행
-   * 예: 2025-01-01.log -> 2025-01-01.1.log, 2025-01-01.1.log -> 2025-01-01.2.log
-   */
-  async rotateBySize() {
-    if (!this.currentFilename) {
-      return;
-    }
-    await this.closeStream();
-    const baseName = this.currentFilename.replace(/\.log$/, "");
-    const files = readdirSync(this.logDir);
-    const relatedFiles = files.filter((file) => file.startsWith(baseName) && file.endsWith(".log")).sort().reverse();
-    for (const file of relatedFiles) {
-      const match = file.match(/\.(\d+)\.log$/);
-      if (match) {
-        const oldNum = parseInt(match[1], 10);
-        const newNum = oldNum + 1;
-        const oldPath = join(this.logDir, file);
-        const newPath2 = join(this.logDir, `${baseName}.${newNum}.log`);
-        try {
-          renameSync(oldPath, newPath2);
-        } catch (error) {
-          const errorMessage = error instanceof Error ? error.message : String(error);
-          process.stderr.write(`[FileTransport] Failed to rotate file: ${errorMessage}
-`);
-        }
-      }
-    }
-    const currentPath = join(this.logDir, this.currentFilename);
-    const newPath = join(this.logDir, `${baseName}.1.log`);
-    try {
-      if (existsSync(currentPath)) {
-        renameSync(currentPath, newPath);
-      }
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[FileTransport] Failed to rotate current file: ${errorMessage}
-`);
-    }
-    await this.rotateStream(this.currentFilename);
-  }
-  /**
-   * 오래된 로그 파일 정리
-   * maxFiles 개수를 초과하는 로그 파일 삭제
-   */
-  async cleanOldFiles() {
-    try {
-      if (!existsSync(this.logDir)) {
-        return;
-      }
-      const files = readdirSync(this.logDir);
-      const logFiles = files.filter((file) => file.endsWith(".log")).map((file) => {
-        const filepath = join(this.logDir, file);
-        const stats = statSync(filepath);
-        return { file, mtime: stats.mtime };
-      }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
-      if (logFiles.length > this.maxFiles) {
-        const filesToDelete = logFiles.slice(this.maxFiles);
-        for (const { file } of filesToDelete) {
-          const filepath = join(this.logDir, file);
-          try {
-            unlinkSync(filepath);
-          } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            process.stderr.write(`[FileTransport] Failed to delete old file "${file}": ${errorMessage}
-`);
-          }
-        }
-      }
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      process.stderr.write(`[FileTransport] Failed to clean old files: ${errorMessage}
-`);
-    }
-  }
-  /**
-   * 날짜별 로그 파일명 생성
-   */
-  getLogFilename(date) {
-    const year = date.getFullYear();
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${year}-${month}-${day}.log`;
-  }
-  async close() {
-    await this.closeStream();
-  }
-};
-function isFileLoggingEnabled() {
-  return process.env.LOGGER_FILE_ENABLED === "true";
-}
-function getDefaultLogLevel() {
-  const isProduction = process.env.NODE_ENV === "production";
-  const isDevelopment = process.env.NODE_ENV === "development";
-  if (isDevelopment) {
-    return "debug";
-  }
-  if (isProduction) {
-    return "info";
-  }
-  return "warn";
-}
-function getConsoleConfig() {
-  const isProduction = process.env.NODE_ENV === "production";
-  return {
-    level: "debug",
-    enabled: true,
-    colorize: !isProduction
-    // Dev: colored output, Production: plain text
-  };
-}
-function getFileConfig() {
-  const isProduction = process.env.NODE_ENV === "production";
-  return {
-    level: "info",
-    enabled: isProduction,
-    // File logging in production only
-    logDir: process.env.LOG_DIR || "./logs",
-    maxFileSize: 10 * 1024 * 1024,
-    // 10MB
-    maxFiles: 10
-  };
-}
-function validateDirectoryWritable(dirPath) {
-  if (!existsSync(dirPath)) {
-    try {
-      mkdirSync(dirPath, { recursive: true });
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      throw new Error(`Failed to create log directory "${dirPath}": ${errorMessage}`);
-    }
-  }
-  try {
-    accessSync(dirPath, constants.W_OK);
-  } catch {
-    throw new Error(`Log directory "${dirPath}" is not writable. Please check permissions.`);
-  }
-  const testFile = join(dirPath, ".logger-write-test");
-  try {
-    writeFileSync(testFile, "test", "utf-8");
-    unlinkSync(testFile);
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Cannot write to log directory "${dirPath}": ${errorMessage}`);
-  }
-}
-function validateFileConfig() {
-  if (!isFileLoggingEnabled()) {
-    return;
-  }
-  const logDir = process.env.LOG_DIR;
-  if (!logDir) {
-    throw new Error(
-      "LOG_DIR environment variable is required when LOGGER_FILE_ENABLED=true. Example: LOG_DIR=/var/log/myapp"
-    );
-  }
-  validateDirectoryWritable(logDir);
-}
-function validateSlackConfig() {
-  const webhookUrl = process.env.SLACK_WEBHOOK_URL;
-  if (!webhookUrl) {
-    return;
-  }
-  if (!webhookUrl.startsWith("https://hooks.slack.com/")) {
-    throw new Error(
-      `Invalid SLACK_WEBHOOK_URL: "${webhookUrl}". Slack webhook URLs must start with "https://hooks.slack.com/"`
-    );
-  }
-}
-function validateEmailConfig() {
-  const smtpHost = process.env.SMTP_HOST;
-  const smtpPort = process.env.SMTP_PORT;
-  const emailFrom = process.env.EMAIL_FROM;
-  const emailTo = process.env.EMAIL_TO;
-  const hasAnyEmailConfig = smtpHost || smtpPort || emailFrom || emailTo;
-  if (!hasAnyEmailConfig) {
-    return;
-  }
-  const missingFields = [];
-  if (!smtpHost) missingFields.push("SMTP_HOST");
-  if (!smtpPort) missingFields.push("SMTP_PORT");
-  if (!emailFrom) missingFields.push("EMAIL_FROM");
-  if (!emailTo) missingFields.push("EMAIL_TO");
-  if (missingFields.length > 0) {
-    throw new Error(
-      `Email transport configuration incomplete. Missing: ${missingFields.join(", ")}. Either set all required fields or remove all email configuration.`
-    );
-  }
-  const port = parseInt(smtpPort, 10);
-  if (isNaN(port) || port < 1 || port > 65535) {
-    throw new Error(
-      `Invalid SMTP_PORT: "${smtpPort}". Must be a number between 1 and 65535.`
-    );
-  }
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-  if (!emailRegex.test(emailFrom)) {
-    throw new Error(`Invalid EMAIL_FROM format: "${emailFrom}"`);
-  }
-  const recipients = emailTo.split(",").map((e) => e.trim());
-  for (const email of recipients) {
-    if (!emailRegex.test(email)) {
-      throw new Error(`Invalid email address in EMAIL_TO: "${email}"`);
-    }
-  }
-}
-function validateEnvironment() {
-  const nodeEnv = process.env.NODE_ENV;
-  if (!nodeEnv) {
-    process.stderr.write(
-      "[Logger] Warning: NODE_ENV is not set. Defaulting to test environment.\n"
-    );
-  }
-}
-function validateConfig() {
-  try {
-    validateEnvironment();
-    validateFileConfig();
-    validateSlackConfig();
-    validateEmailConfig();
-  } catch (error) {
-    if (error instanceof Error) {
-      throw new Error(`[Logger] Configuration validation failed: ${error.message}`);
-    }
-    throw error;
-  }
-}
-
-// src/logger/factory.ts
-function initializeTransports() {
-  const transports = [];
-  const consoleConfig = getConsoleConfig();
-  transports.push(new ConsoleTransport(consoleConfig));
-  const fileConfig = getFileConfig();
-  if (fileConfig.enabled) {
-    transports.push(new FileTransport(fileConfig));
-  }
-  return transports;
-}
-function initializeLogger() {
-  validateConfig();
-  return new Logger({
-    level: getDefaultLogLevel(),
-    transports: initializeTransports()
-  });
-}
-var logger = initializeLogger();
-
-// src/middleware/error-handler.ts
-var errorLogger = logger.child("error-handler");
 function ErrorHandler(options = {}) {
   const {
-    includeStack = process.env.NODE_ENV !== "production",
+    includeStack = env.NODE_ENV !== "production",
     enableLogging = true
   } = options;
   return (err, c) => {
+    if (isSerializableError(err)) {
+      const { statusCode: statusCode2 } = err;
+      if (enableLogging) {
+        logError(err, {
+          type: err.constructor.name,
+          message: err.message,
+          statusCode: statusCode2,
+          path: c.req.path,
+          method: c.req.method
+        }, includeStack);
+      }
+      const serialized = err.toJSON();
+      if (includeStack && err.stack) {
+        serialized.stack = err.stack;
+      }
+      return c.json(serialized, statusCode2);
+    }
     const errorWithCode = err;
     const statusCode = errorWithCode.statusCode || 500;
-    const errorType = err.name || "Error";
     if (enableLogging) {
-      const logLevel = statusCode >= 500 ? "error" : "warn";
-      const logData = {
-        type: errorType,
+      logError(err, {
+        type: err.name || "Error",
         message: err.message,
         statusCode,
         path: c.req.path,
         method: c.req.method
-      };
-      if (errorWithCode.details) {
-        logData.details = errorWithCode.details;
-      }
-      if (statusCode >= 500 && includeStack) {
-        logData.stack = err.stack;
-      }
-      errorLogger[logLevel]("Error occurred", logData);
+      }, includeStack);
     }
     const response = {
-      success: false,
-      error: {
-        message: err.message || "Internal Server Error",
-        type: errorType,
-        statusCode
-      }
+      __type: "Error",
+      message: err.message || "Internal Server Error"
     };
-    if (errorWithCode.details) {
-      response.error.details = errorWithCode.details;
-    }
-    if (includeStack) {
-      response.error.stack = err.stack;
+    if (includeStack && err.stack) {
+      response.stack = err.stack;
     }
     return c.json(response, statusCode);
   };
@@ -727,7 +70,7 @@ function generateRequestId() {
   const randomPart = randomBytes(6).toString("hex");
   return `req_${timestamp}_${randomPart}`;
 }
-function maskSensitiveData2(obj, sensitiveFields, seen = /* @__PURE__ */ new WeakSet()) {
+function maskSensitiveData(obj, sensitiveFields, seen = /* @__PURE__ */ new WeakSet()) {
   if (!obj || typeof obj !== "object") return obj;
   if (seen.has(obj)) return "[Circular]";
   seen.add(obj);
@@ -738,24 +81,28 @@ function maskSensitiveData2(obj, sensitiveFields, seen = /* @__PURE__ */ new Wea
     if (lowerFields.some((field) => lowerKey.includes(field))) {
       masked[key] = "***MASKED***";
     } else if (typeof masked[key] === "object" && masked[key] !== null) {
-      masked[key] = maskSensitiveData2(masked[key], sensitiveFields, seen);
+      masked[key] = maskSensitiveData(masked[key], sensitiveFields, seen);
     }
   }
   return masked;
 }
 function RequestLogger(config) {
   const cfg = { ...DEFAULT_CONFIG, ...config };
-  const apiLogger = logger.child("api");
+  const apiLogger = logger.child("@spfn/core:api");
   return async (c, next) => {
     const path = new URL(c.req.url).pathname;
-    if (cfg.excludePaths.includes(path)) {
+    const isExcluded = cfg.excludePaths.some(
+      (excludePath) => path === excludePath || path.startsWith(excludePath + "/")
+    );
+    if (isExcluded) {
       return next();
     }
     const requestId = generateRequestId();
     c.set("requestId", requestId);
     const method = c.req.method;
     const userAgent = c.req.header("user-agent");
-    const ip = c.req.header("x-forwarded-for") || c.req.header("x-real-ip") || "unknown";
+    const forwardedFor = c.req.header("x-forwarded-for");
+    const ip = forwardedFor?.split(",")[0]?.trim() || c.req.header("x-real-ip") || "unknown";
     const startTime = Date.now();
     apiLogger.info("Request received", {
       requestId,
@@ -781,14 +128,13 @@ function RequestLogger(config) {
       }
       if (status >= 400) {
         try {
-          const responseBody = await c.res.clone().json();
-          logData.response = responseBody;
+          logData.response = await c.res.clone().json();
         } catch {
         }
         if (["POST", "PUT", "PATCH"].includes(method)) {
           try {
             const requestBody = await c.req.json();
-            logData.request = maskSensitiveData2(requestBody, cfg.sensitiveFields);
+            logData.request = maskSensitiveData(requestBody, cfg.sensitiveFields);
           } catch {
           }
         }
@@ -808,6 +154,6 @@ function RequestLogger(config) {
   };
 }
 
-export { ErrorHandler, RequestLogger, maskSensitiveData2 as maskSensitiveData };
+export { ErrorHandler, RequestLogger, maskSensitiveData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map