@faapi/faapi 6.10.0 → 6.11.0

package/dist/testing.js

@@ -271,20 +271,32 @@ function formatEntry(entry) {
 
 // src/logger/logger.ts
 var LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
-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 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];
@@ -301,15 +313,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);
@@ -318,7 +331,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;
@@ -1022,6 +1036,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;
@@ -1090,7 +1107,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;
@@ -1101,7 +1120,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;
@@ -4774,6 +4795,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;