@faapi/faapi 6.9.1 → 6.10.1

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

@@ -306,24 +306,27 @@ interface CreateLoggerOptions {
 /**
  * `config.log` 的对象形状（config 侧另接受 boolean：false 全静默、true 默认）
  *
- * level 解析顺序：显式值 > `LOG_LEVEL` 环境变量 > 模式默认（`dir` 文件模式不过滤，
- * 其余模式 `'info'`；非法值启动报错）。`sink` 与 `dir` 互斥，同时配置启动报错。
+ * 参考 egg.js 的单管道模型：一条日志管道、两个输出出口（文件/sink 与 console），
+ * 各有独立阈值——`level` 管管道出口（不配不过滤），`consoleLevel` 管 console 出口
+ * （不配 `'info'`）。非法级别值启动报错。`sink` 与 `dir` 互斥，同时配置启动报错。
  */
 interface LogConfig {
-    /** 实例级级别（覆盖全局 level） */
+    /** 管道阈值（文件/sink 收到的条目；不配不过滤，LOG_LEVEL env 同源） */
     level?: LogLevel;
+    /** console 出口阈值（不配 `'info'`；`false` 关闭 console 输出） */
+    consoleLevel?: LogLevel | false;
     /** 自定义输出管道（整体接管，与 `dir` 互斥） */
     sink?: LogSink;
     /**
      * 文件日志目录（egg 风格）：配置即启用内置文件管道——默认 `app.log` 全量 +
-     * `error.log` 仅 error（dup 语义）；请求日志自动并入（`accessLog` 缺省 true）
+     * `error.log` 仅 error（dup 语义）；请求日志自动并入
      */
     dir?: string;
     /** true 时按级别四文件 `debug.log`/`info.log`/`warn.log`/`error.log`（各只含对应级别） */
     splitByLevel?: boolean;
     /** 文件模式下是否保留 console 双写（默认 true；false 纯文件） */
     stdout?: boolean;
-    /** 请求日志是否并入统一管道；缺省 = `dir` 配置时 true（见 middleware/logger.md） */
+    /** 请求日志是否并入管道（默认 true；false 关闭请求日志，不输出） */
     accessLog?: boolean;
 }
 
@@ -1125,34 +1128,6 @@ interface CorsOptions {
  */
 declare function cors(options?: CorsOptions): FaapiMiddleware;
 
-type LoggerFn = (messageOrObj: string | Record<string, unknown>, message?: string) => void;
-interface LoggerOptions {
-    /**
-     * 自定义日志函数
-     *
-     * - 传入 `console.log`（默认）：纯文本格式 `GET /api/users 200 12ms`
-     * - 传入 pino logger：结构化日志 `logger.info({ method, path, status, durationMs }, 'request completed')`
-     * - 传入 winston logger：`logger.info('GET /api/users 200 12ms', { method, path })`
-     */
-    log?: LoggerFn;
-}
-/**
- * 创建请求日志中间件（洋葱模型）
- *
- * 日志格式（文本模式）：GET /api/users 200 12ms
- * 错误格式（文本模式）：POST /api/users 400 45ms - Error: ...
- *
- * 结构化模式：传入 pino/winston 等 logger 实例时，会自动传递结构化字段。
- *
- * before/after 一体，闭包变量共享开始时间，无需污染 ctx。
- * 错误用 try/catch 捕获，记录后重新抛出（让上层处理）。
- * 成功时从 next() 返回的 Response 读取状态码。
- *
- * log 函数每次请求时读取（options.log ?? defaultLog），运行时替换 console.log 或
- * 切换全局日志配置均会生效。
- */
-declare function logger(options?: LoggerOptions): FaapiMiddleware;
-
 interface HelmetOptions {
     contentSecurityPolicy?: string | false;
     xFrameOptions?: 'DENY' | 'SAMEORIGIN' | false;
@@ -1256,4 +1231,4 @@ interface RouteInfo {
     output: RouteOutputSchema | null;
 }
 
-export { type ToolPathMeta as $, type AppRegistries as A, type RouteInputSchema as B, type CorsOptions as C, type RouteOutputSchema as D, type RouteParamSchema as E, type FaapiContext as F, type SseEvent as G, type HelmetOptions as H, type InjectorMap as I, type SseWriter as J, type TaskContext as K, type LoggerOptions as L, type TaskDriverJob as M, type TaskDriverProcess as N, type TaskDriverRecord as O, type TaskFailedInfo as P, type TaskJob as Q, type RouteManifest as R, type SkillRegistry as S, type TaskClient as T, type TaskJobStatus as U, type TaskMetadata as V, type WsRouteManifest as W, type TaskModule as X, type TaskRegistriesSnapshot as Y, type TaskRegistriesView as Z, type ToolCore as _, type LogConfig as a, type ToolRegistry as a0, cors as a1, createAppRegistries as a2, createTaskRegistriesView as a3, createTaskRegistry as a4, helmet as a5, logger as a6, type FaapiMiddleware as b, type TaskFailedHandler as c, type TaskQueueDeps as d, type TaskQueue as e, type TaskDriver as f, type TaskRegistry as g, type TaskManifest as h, type ToolMetadata as i, type AgentCore as j, type AgentMetadata as k, type CreateLoggerOptions as l, type Logger as m, type AgentHandleFactory as n, type AgentHandleStore as o, type AgentPathMeta as p, type AgentRegistry as q, type AgentToolDescriptor as r, type FaapiContextConfig as s, type FaapiTaskMeta as t, type FailOptions as u, type Injector as v, type LogEntry as w, type LogLevel as x, type LogSink as y, type RouteInfo as z };
+export { type ToolRegistry as $, type AppRegistries as A, type RouteOutputSchema as B, type CorsOptions as C, type RouteParamSchema as D, type SseEvent as E, type FaapiMiddleware as F, type SseWriter as G, type HelmetOptions as H, type InjectorMap as I, type TaskContext as J, type TaskDriverJob as K, type LogConfig as L, type TaskDriverProcess as M, type TaskDriverRecord as N, type TaskFailedInfo as O, type TaskJob as P, type TaskJobStatus as Q, type RouteManifest as R, type SkillRegistry as S, type TaskClient as T, type TaskMetadata as U, type TaskModule as V, type WsRouteManifest as W, type TaskRegistriesSnapshot as X, type TaskRegistriesView as Y, type ToolCore as Z, type ToolPathMeta as _, type FaapiContext as a, cors as a0, createAppRegistries as a1, createTaskRegistriesView as a2, createTaskRegistry as a3, helmet as a4, type TaskFailedHandler as b, type TaskQueueDeps as c, type TaskQueue as d, type TaskDriver as e, type TaskRegistry as f, type TaskManifest as g, type ToolMetadata as h, type AgentCore as i, type AgentMetadata as j, type CreateLoggerOptions as k, type Logger as l, type AgentHandleFactory as m, type AgentHandleStore as n, type AgentPathMeta as o, type AgentRegistry as p, type AgentToolDescriptor as q, type FaapiContextConfig as r, type FaapiTaskMeta as s, type FailOptions as t, type Injector as u, type LogEntry as v, type LogLevel as w, type LogSink as x, type RouteInfo as y, type RouteInputSchema as z };

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-CuGMDCGB.js';
+import { a as FaapiContext, F as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions } from './routeTypes-m9wZHWyo.js';
 import { Server } from 'node:http';
 import { WebSocket } from 'ws';
 
@@ -76,8 +76,6 @@ interface TestServerOptions {
     cors?: CorsOptions | boolean;
     /** 安全头配置，默认 false */
     helmet?: HelmetOptions | boolean;
-    /** 请求日志配置，默认 false（避免污染测试输出） */
-    logger?: LoggerOptions | boolean;
     /** 全局中间件（外层洋葱） */
     middlewares?: FaapiMiddleware[];
     /** 全局注入器 */
@@ -126,7 +124,7 @@ interface TestServer {
  * 2. sortRoutes 排序
  * 3. mkdtemp 创建临时 schema 目录（或用传入的 dist）
  * 4. generateSchemaFiles 生成 zod.js
- * 5. createServer 创建 server（默认禁用 CORS/Helmet/Logger，避免污染断言）
+ * 5. createServer 创建 server（默认禁用 CORS/Helmet，避免污染断言）
  * 6. server.listen(0) 随机端口
  * 7. 返回 TestServer
  *

package/dist/testing.js

@@ -271,50 +271,74 @@ function formatEntry(entry) {
 
 // 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";
+var LOGGING_STATE_KEY = /* @__PURE__ */ Symbol.for("faapi.logger.state");
+function createDefaultLoggingState() {
+  return {
+    level: null,
+    consoleLevel: null,
+    sink: null,
+    fileSink: null,
+    stdout: true,
+    accessLog: true,
+    disabled: false
+  };
+}
+function getLoggingState() {
+  const g = globalThis;
+  let state2 = g[LOGGING_STATE_KEY];
+  if (!state2) {
+    state2 = createDefaultLoggingState();
+    g[LOGGING_STATE_KEY] = state2;
+  }
+  return state2;
+}
+function pipelineThreshold() {
+  return getLoggingState().level ?? void 0;
+}
+function consoleThreshold() {
+  return getLoggingState().consoleLevel ?? "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"
 };
+function consoleDispatch(entry) {
+  const threshold = consoleThreshold();
+  if (threshold === false || belowThreshold(entry.level, threshold)) return;
+  console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
+}
 function globalDispatch(entry) {
-  if (globalState.disabled) return;
-  if (globalState.sink) {
-    globalState.sink(entry);
+  const state2 = getLoggingState();
+  if (state2.disabled) return;
+  const pipeThreshold = pipelineThreshold();
+  if (state2.sink) {
+    if (!belowThreshold(entry.level, pipeThreshold)) state2.sink(entry);
     return;
   }
-  if (globalState.fileSink) {
-    globalState.fileSink.write(entry);
-    if (globalState.stdout) consoleSink(entry);
+  if (state2.fileSink) {
+    if (!belowThreshold(entry.level, pipeThreshold)) state2.fileSink.write(entry);
+    if (state2.stdout) consoleDispatch(entry);
     return;
   }
-  consoleSink(entry);
+  consoleDispatch(entry);
 }
 function writeLogEntry(entry) {
-  if (belowThreshold(entry.level, globalThreshold())) return;
   globalDispatch(entry);
 }
-function isAccessLogPiped() {
-  return !globalState.disabled && globalState.accessLog;
+function isAccessLogEnabled() {
+  const state2 = getLoggingState();
+  return !state2.disabled && state2.accessLog;
 }
 function createLogger(scope, options) {
   const baseScope = scope;
   const baseFields = options?.fields;
   const write = (level, message, callFields, scopeSuffix) => {
-    const threshold = options?.level ?? globalThreshold();
-    if (belowThreshold(level, threshold)) return;
+    if (belowThreshold(level, options?.level)) return;
     const entry = {
       level,
       message,
@@ -4212,18 +4236,14 @@ function levelForStatus(status) {
   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);
+  if (!isAccessLogEnabled()) return;
+  writeLogEntry({
+    level: levelForStatus(entry.status),
+    message: text,
+    time: (/* @__PURE__ */ new Date()).toISOString(),
+    scope: "access",
+    fields: entry
+  });
 }
 function logger(options = {}) {
   return async (ctx, next) => {
@@ -4586,7 +4606,6 @@ function createServer(options) {
     compression: compressionOption,
     etag: etagOption,
     registries,
-    logger: loggerOption,
     bodyLimit = DEFAULT_BODY_LIMIT,
     http2: http2Option,
     trustedProxy = false
@@ -4603,8 +4622,7 @@ function createServer(options) {
     const helmOpts = typeof helmetOption === "object" ? helmetOption : {};
     configMiddlewares.push(helmet(helmOpts));
   }
-  const loggerMiddlewareInst = loggerOption === false ? null : loggerOption === true || loggerOption === void 0 ? logger() : logger(loggerOption);
-  if (loggerMiddlewareInst) configMiddlewares.push(loggerMiddlewareInst);
+  configMiddlewares.push(logger());
   if (etagOption) {
     const etagOpts = typeof etagOption === "object" ? etagOption : {};
     configMiddlewares.push(etag(etagOpts));
@@ -4787,7 +4805,6 @@ async function createTestServer(options) {
     dist,
     cors: cors2 = false,
     helmet: helmet2 = false,
-    logger: logger2 = false,
     middlewares,
     injectors,
     onError,
@@ -4804,7 +4821,6 @@ async function createTestServer(options) {
     dist: schemaDist,
     cors: cors2,
     helmet: helmet2,
-    logger: logger2,
     middlewares,
     injectors,
     onError,