@faapi/faapi 6.10.0 → 6.11.0

package/dist/index.d.ts

@@ -1622,7 +1622,18 @@ interface InjectOptions {
 interface InjectResponse {
     status: number;
     headers: Headers;
+    /** 响应字节按 JSON 反序列化的结果（非 JSON 回退字符串）——HTTP 语义，与真实客户端一致 */
     body: unknown;
+    /**
+     * handler 原始返回值（自动包裹与 JSON 序列化之前，Date 等富类型不丢）
+     *
+     * 仅当响应体由 handler 数据返回值自动包裹产生时捕获（同进程取数类型保真，
+     * 快路径判断用 `res.raw !== undefined`）；handler 返回 Response 形态
+     * （ctx.ok/ctx.fail/ctx.json）、抛错、中间件拦截、SSE、404/405/校验失败等
+     * handler 未产生数据返回值的场景为 undefined。语义详见 createAppCore.md
+     * 「inject 的 raw 字段」节。
+     */
+    raw?: unknown;
 }
 /**
  * 获取当前 faapi app 单例
@@ -1682,7 +1693,9 @@ interface AppBase {
      * 无服务器测试注入
      *
      * 构建一个模拟请求直接走完整请求链路（CORS / helmet / logger / 全局中间件 / 路由匹配 /
-     * schema 校验 / 目录中间件 / handler），不绑定端口，返回已解析的 `{ status, headers, body }`。
+     * schema 校验 / 目录中间件 / handler），不绑定端口，返回已解析的
+     * `{ status, headers, body, raw }`——body 为 JSON 反序列化结果（HTTP 语义），
+     * raw 为 handler 原始返回值（同进程取数类型保真，语义见 InjectResponse.raw）。
      *
      * `listen()` 前后均可调用——`listen()` 后调用常用于 Next.js Server Component 等同进程场景
      * （配合 `getApp()` 拿到 app 实例）。

package/dist/index.js

@@ -2374,51 +2374,64 @@ function assertLogLevel(value, source) {
     );
   }
 }
-var globalState = {
-  level: null,
-  consoleLevel: null,
-  sink: null,
-  fileSink: null,
-  stdout: true,
-  accessLog: true,
-  disabled: false
-};
+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 configureLogging(config) {
+  const state2 = getLoggingState();
   const objectConfig = typeof config === "object" ? config : {};
   if (objectConfig.sink && objectConfig.dir) {
     throw new Error(
       "[faapi] config.log.sink and config.log.dir are mutually exclusive: pick one output pipeline (custom sink OR built-in file logs)."
     );
   }
-  void globalState.fileSink?.close();
-  globalState.disabled = config === false;
-  globalState.sink = objectConfig.sink ?? null;
-  globalState.accessLog = objectConfig.accessLog ?? true;
-  globalState.stdout = objectConfig.stdout ?? true;
-  globalState.fileSink = objectConfig.dir ? createFileLogSink({ dir: objectConfig.dir, splitByLevel: objectConfig.splitByLevel }) : null;
+  void state2.fileSink?.close();
+  state2.disabled = config === false;
+  state2.sink = objectConfig.sink ?? null;
+  state2.accessLog = objectConfig.accessLog ?? true;
+  state2.stdout = objectConfig.stdout ?? true;
+  state2.fileSink = objectConfig.dir ? createFileLogSink({ dir: objectConfig.dir, splitByLevel: objectConfig.splitByLevel }) : null;
   if (objectConfig.consoleLevel !== void 0) {
     if (objectConfig.consoleLevel !== false) {
       assertLogLevel(objectConfig.consoleLevel, "config.log.consoleLevel");
     }
-    globalState.consoleLevel = objectConfig.consoleLevel;
+    state2.consoleLevel = objectConfig.consoleLevel;
   } else {
-    globalState.consoleLevel = null;
+    state2.consoleLevel = null;
   }
   if (objectConfig.level !== void 0) {
     assertLogLevel(objectConfig.level, "config.log.level");
-    globalState.level = objectConfig.level;
+    state2.level = objectConfig.level;
   } else if (process.env.LOG_LEVEL !== void 0) {
     assertLogLevel(process.env.LOG_LEVEL, "LOG_LEVEL env");
-    globalState.level = process.env.LOG_LEVEL;
+    state2.level = process.env.LOG_LEVEL;
   } else {
-    globalState.level = null;
+    state2.level = null;
   }
 }
 function pipelineThreshold() {
-  return globalState.level ?? void 0;
+  return getLoggingState().level ?? void 0;
 }
 function consoleThreshold() {
-  return globalState.consoleLevel ?? "info";
+  return getLoggingState().consoleLevel ?? "info";
 }
 function belowThreshold(level, threshold) {
   return threshold !== void 0 && LEVEL_RANK[level] < LEVEL_RANK[threshold];
@@ -2438,15 +2451,16 @@ function consoleDispatch(entry) {
   console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
 }
 function globalDispatch(entry) {
-  if (globalState.disabled) return;
+  const state2 = getLoggingState();
+  if (state2.disabled) return;
   const pipeThreshold = pipelineThreshold();
-  if (globalState.sink) {
-    if (!belowThreshold(entry.level, pipeThreshold)) globalState.sink(entry);
+  if (state2.sink) {
+    if (!belowThreshold(entry.level, pipeThreshold)) state2.sink(entry);
     return;
   }
-  if (globalState.fileSink) {
-    if (!belowThreshold(entry.level, pipeThreshold)) globalState.fileSink.write(entry);
-    if (globalState.stdout) consoleDispatch(entry);
+  if (state2.fileSink) {
+    if (!belowThreshold(entry.level, pipeThreshold)) state2.fileSink.write(entry);
+    if (state2.stdout) consoleDispatch(entry);
     return;
   }
   consoleDispatch(entry);
@@ -2455,10 +2469,12 @@ function writeLogEntry(entry) {
   globalDispatch(entry);
 }
 function flushLogging() {
-  return globalState.fileSink ? globalState.fileSink.flush() : Promise.resolve();
+  const state2 = getLoggingState();
+  return state2.fileSink ? state2.fileSink.flush() : Promise.resolve();
 }
 function isAccessLogEnabled() {
-  return !globalState.disabled && globalState.accessLog;
+  const state2 = getLoggingState();
+  return !state2.disabled && state2.accessLog;
 }
 function createLogger(scope, options) {
   const baseScope = scope;
@@ -5148,6 +5164,9 @@ async function injectParamsAsync(handler, ctx, body, injectors) {
 function wrapResult(result, ctx) {
   return wrapOkResult(result, ctx.config);
 }
+function stashHandlerResult(ctx, result) {
+  ctx.__faapiHandlerResult = result;
+}
 function mergeMeta(response, meta) {
   const hasMeta = meta.status !== void 0 || Object.keys(meta.headers).length > 0 || meta.setCookies.length > 0;
   if (!hasMeta) return response;
@@ -5216,7 +5235,9 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      return toResponse(wrapResult(result, ctx), meta);
+      const response = await toResponse(wrapResult(result, ctx), meta);
+      if (!(result instanceof Response)) stashHandlerResult(ctx, result);
+      return response;
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -5227,7 +5248,9 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      return toResponse(wrapResult(result, ctx), meta);
+      const response = await toResponse(wrapResult(result, ctx), meta);
+      if (!(result instanceof Response)) stashHandlerResult(ctx, result);
+      return response;
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -6137,6 +6160,7 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       globalInjectors
     });
     const response = outerMiddlewares.length > 0 ? await compose(outerMiddlewares, ctx, routePipeline) : await routePipeline();
+    res.__faapiHandlerResult = ctx.__faapiHandlerResult;
     await sendSuccessResponse(response, res);
   } catch (err) {
     if (res.destroyed || res.writableEnded) return;
@@ -7180,7 +7204,10 @@ async function createAppBase(options) {
           resolve({
             status: mockRes.statusCode,
             headers: new Headers(mockRes._headers),
-            body: parsed
+            body: parsed,
+            // inject raw 捕获桥（第三跳）：handler 原始返回值（handleRequest 从 ctx
+            // 桥接到 res；未捕获时 undefined——语义见 InjectResponse.raw 注释）
+            raw: mockRes.__faapiHandlerResult
           });
         });
         const listeners = server.listeners("request");