@faapi/faapi 6.9.1 → 6.10.1

package/dist/cli/index.js

@@ -6497,66 +6497,102 @@ 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 ?? objectConfig.dir !== void 0;
-  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");
+    }
+    state2.consoleLevel = objectConfig.consoleLevel;
+  } else {
+    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 globalThreshold() {
-  if (globalState.level) return globalState.level;
-  if (globalState.fileSink) return void 0;
-  return "info";
+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];
 }
 function getEffectiveLogLevel() {
-  return globalThreshold();
+  return pipelineThreshold();
+}
+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,
@@ -6582,7 +6618,7 @@ function createLogger(scope, options) {
   });
   return makeLogger(void 0);
 }
-var LEVEL_RANK, VALID_LEVELS, globalState, consoleSink, CONSOLE_METHOD;
+var LEVEL_RANK, VALID_LEVELS, LOGGING_STATE_KEY, CONSOLE_METHOD;
 var init_logger = __esm({
   "src/logger/logger.ts"() {
     "use strict";
@@ -6590,10 +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, sink: null, fileSink: null, stdout: true, accessLog: false, disabled: false };
-    consoleSink = (entry) => {
-      console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
-    };
+    LOGGING_STATE_KEY = /* @__PURE__ */ Symbol.for("faapi.logger.state");
     CONSOLE_METHOD = {
       debug: "debug",
       info: "info",
@@ -7947,18 +7980,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) => {
@@ -8365,7 +8394,6 @@ function createServer(options) {
     compression: compressionOption,
     etag: etagOption,
     registries,
-    logger: loggerOption,
     bodyLimit = DEFAULT_BODY_LIMIT,
     http2: http2Option,
     trustedProxy = false
@@ -8382,8 +8410,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));
@@ -9611,7 +9638,6 @@ async function createAppBase(options) {
     helmet: config?.helmet,
     compression: config?.compression,
     etag: config?.etag,
-    logger: config?.logger,
     bodyLimit: config?.bodyLimit,
     http2: config?.http2,
     trustedProxy: config?.trustedProxy,
@@ -9916,7 +9942,6 @@ var init_createAppCore = __esm({
       "compression",
       "etag",
       "bodyLimit",
-      "logger",
       "log",
       "http2",
       "trustedProxy",