@faapi/faapi 6.8.0 → 6.9.1

package/dist/{routeTypes-J5pPbjwR.d.ts → routeTypes-CuGMDCGB.d.ts}

@@ -306,11 +306,25 @@ interface CreateLoggerOptions {
 /**
  * `config.log` 的对象形状（config 侧另接受 boolean：false 全静默、true 默认）
  *
- * level 解析顺序：显式值 > `LOG_LEVEL` 环境变量 > `'info'`（非法值启动报错）。
+ * level 解析顺序：显式值 > `LOG_LEVEL` 环境变量 > 模式默认（`dir` 文件模式不过滤，
+ * 其余模式 `'info'`；非法值启动报错）。`sink` 与 `dir` 互斥，同时配置启动报错。
  */
 interface LogConfig {
+    /** 实例级级别（覆盖全局 level） */
     level?: LogLevel;
+    /** 自定义输出管道（整体接管，与 `dir` 互斥） */
     sink?: LogSink;
+    /**
+     * 文件日志目录（egg 风格）：配置即启用内置文件管道——默认 `app.log` 全量 +
+     * `error.log` 仅 error（dup 语义）；请求日志自动并入（`accessLog` 缺省 true）
+     */
+    dir?: string;
+    /** true 时按级别四文件 `debug.log`/`info.log`/`warn.log`/`error.log`（各只含对应级别） */
+    splitByLevel?: boolean;
+    /** 文件模式下是否保留 console 双写（默认 true；false 纯文件） */
+    stdout?: boolean;
+    /** 请求日志是否并入统一管道；缺省 = `dir` 配置时 true（见 middleware/logger.md） */
+    accessLog?: boolean;
 }
 
 /**
@@ -347,10 +361,11 @@ interface TaskWorkerOptions {
      * 任务日志配置（纯数据，postMessage 传入，worker 内联重建日志器注入 taskCtx.log；
      * 缺省时 taskCtx.log 为 undefined）：scope/fields 与进程内路径一致（`task:<name>`
      * + jobId/task/attempt），level 为宿主侧生效的全局级别（worker 侧预过滤，
-     * 宿主 writeLogEntry 再次过滤）
+     * 宿主 writeLogEntry 再次过滤；undefined = 宿主未配置阈值——文件管道默认全量，
+     * worker 侧同样不过滤）
      */
     log?: {
-        level: LogLevel;
+        level?: LogLevel;
         scope?: string;
         fields?: Record<string, unknown>;
     };
@@ -1133,7 +1148,8 @@ interface LoggerOptions {
  * 错误用 try/catch 捕获，记录后重新抛出（让上层处理）。
  * 成功时从 next() 返回的 Response 读取状态码。
  *
- * log 函数每次请求时读取（options.log ?? console.log），运行时替换 console.log 会生效。
+ * log 函数每次请求时读取（options.log ?? defaultLog），运行时替换 console.log 或
+ * 切换全局日志配置均会生效。
  */
 declare function logger(options?: LoggerOptions): FaapiMiddleware;
 

package/dist/testing.d.ts

@@ -1,4 +1,4 @@
-import { F as FaapiContext, b as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions, L as LoggerOptions } from './routeTypes-J5pPbjwR.js';
+import { F as FaapiContext, b as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions, L as LoggerOptions } from './routeTypes-CuGMDCGB.js';
 import { Server } from 'node:http';
 import { WebSocket } from 'ws';
 

package/dist/testing.js

@@ -245,16 +245,7 @@ function formatErrorResponse(error, config) {
   return jsonOk(body, 500);
 }
 
-// src/logger/logger.ts
-var LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
-var globalState = {
-  level: null,
-  sink: null,
-  disabled: false
-};
-function globalThreshold() {
-  return globalState.level ?? "info";
-}
+// src/logger/formatEntry.ts
 function serializeFieldValue(value) {
   if (value instanceof Error) {
     return { name: value.name, message: value.message, stack: value.stack };
@@ -277,25 +268,53 @@ function formatEntry(entry) {
   }
   return line;
 }
+
+// src/logger/logger.ts
+var LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
+var globalState = { level: null, sink: null, fileSink: null, stdout: true, accessLog: false, disabled: false };
+function globalThreshold() {
+  if (globalState.level) return globalState.level;
+  if (globalState.fileSink) return void 0;
+  return "info";
+}
+function belowThreshold(level, threshold) {
+  return threshold !== void 0 && LEVEL_RANK[level] < LEVEL_RANK[threshold];
+}
+var consoleSink = (entry) => {
+  console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
+};
 var CONSOLE_METHOD = {
   debug: "debug",
   info: "info",
   warn: "warn",
   error: "error"
 };
-var consoleSink = (entry) => {
-  console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
-};
 function globalDispatch(entry) {
   if (globalState.disabled) return;
-  (globalState.sink ?? consoleSink)(entry);
+  if (globalState.sink) {
+    globalState.sink(entry);
+    return;
+  }
+  if (globalState.fileSink) {
+    globalState.fileSink.write(entry);
+    if (globalState.stdout) consoleSink(entry);
+    return;
+  }
+  consoleSink(entry);
+}
+function writeLogEntry(entry) {
+  if (belowThreshold(entry.level, globalThreshold())) return;
+  globalDispatch(entry);
+}
+function isAccessLogPiped() {
+  return !globalState.disabled && globalState.accessLog;
 }
 function createLogger(scope, options) {
   const baseScope = scope;
   const baseFields = options?.fields;
   const write = (level, message, callFields, scopeSuffix) => {
     const threshold = options?.level ?? globalThreshold();
-    if (LEVEL_RANK[level] < LEVEL_RANK[threshold]) return;
+    if (belowThreshold(level, threshold)) return;
     const entry = {
       level,
       message,
@@ -4187,9 +4206,28 @@ function etag(options = {}) {
 }
 
 // src/middleware/logger.ts
+function levelForStatus(status) {
+  if (status >= 500) return "error";
+  if (status >= 400) return "warn";
+  return "info";
+}
+function defaultLog(entry, text) {
+  if (isAccessLogPiped()) {
+    const logEntry = {
+      level: levelForStatus(entry.status),
+      message: text,
+      time: (/* @__PURE__ */ new Date()).toISOString(),
+      scope: "access",
+      fields: entry
+    };
+    writeLogEntry(logEntry);
+    return;
+  }
+  console.log(entry);
+}
 function logger(options = {}) {
   return async (ctx, next) => {
-    const log = options.log ?? console.log;
+    const log = options.log ?? defaultLog;
     const start = Date.now();
     try {
       const response = await next();