@faapi/faapi 6.10.0 → 6.11.0

package/dist/cli/index.js

@@ -6497,42 +6497,63 @@ function assertLogLevel(value, source) {
     );
   }
 }
+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];
@@ -6546,15 +6567,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);
@@ -6563,7 +6585,8 @@ function writeLogEntry(entry) {
   globalDispatch(entry);
 }
 function isAccessLogEnabled() {
-  return !globalState.disabled && globalState.accessLog;
+  const state2 = getLoggingState();
+  return !state2.disabled && state2.accessLog;
 }
 function createLogger(scope, options) {
   const baseScope = scope;
@@ -6595,7 +6618,7 @@ function createLogger(scope, options) {
   });
   return makeLogger(void 0);
 }
-var LEVEL_RANK, VALID_LEVELS, globalState, CONSOLE_METHOD;
+var LEVEL_RANK, VALID_LEVELS, LOGGING_STATE_KEY, CONSOLE_METHOD;
 var init_logger = __esm({
   "src/logger/logger.ts"() {
     "use strict";
@@ -6603,15 +6626,7 @@ var init_logger = __esm({
     init_fileSink();
     LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
     VALID_LEVELS = ["debug", "info", "warn", "error"];
-    globalState = {
-      level: null,
-      consoleLevel: null,
-      sink: null,
-      fileSink: null,
-      stdout: true,
-      accessLog: true,
-      disabled: false
-    };
+    LOGGING_STATE_KEY = /* @__PURE__ */ Symbol.for("faapi.logger.state");
     CONSOLE_METHOD = {
       debug: "debug",
       info: "info",
@@ -7379,6 +7394,9 @@ var init_injectParams = __esm({
 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;
@@ -7447,7 +7465,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;
@@ -7458,7 +7478,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;
@@ -8560,6 +8582,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;
@@ -9776,7 +9799,10 @@ async function createAppBase(options) {
           resolve3({
             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");