@faapi/faapi 6.7.0 → 6.8.0

package/dist/cli/index.js

@@ -2260,8 +2260,10 @@ var init_resolveInjection = __esm({
       // Phase 2.3
       agents: "agents",
       // Phase 2.3
-      tasks: "tasks"
+      tasks: "tasks",
       // 任务子系统：TaskClient（入队/查询）
+      log: "log"
+      // 请求级日志器（ctx.log 同一实例：scope http，自动带 requestId 等字段）
     };
     injectionCache = /* @__PURE__ */ new WeakMap();
   }
@@ -6386,7 +6388,131 @@ var init_responseFormatter = __esm({
   }
 });
 
+// src/logger/logger.ts
+function assertLogLevel(value, source) {
+  if (typeof value !== "string" || !VALID_LEVELS.includes(value)) {
+    throw new Error(
+      `[faapi] Invalid log level from ${source}: ${String(value)}. Expected one of: ${VALID_LEVELS.join(", ")}.`
+    );
+  }
+}
+function configureLogging(config) {
+  if (config === void 0) {
+    globalState.level = null;
+    globalState.sink = null;
+    globalState.disabled = false;
+    return;
+  }
+  const objectConfig = typeof config === "object" ? config : {};
+  globalState.disabled = config === false;
+  globalState.sink = objectConfig.sink ?? null;
+  if (objectConfig.level !== void 0) {
+    assertLogLevel(objectConfig.level, "config.log.level");
+    globalState.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;
+  } else {
+    globalState.level = null;
+  }
+}
+function globalThreshold() {
+  return globalState.level ?? "info";
+}
+function getEffectiveLogLevel() {
+  return globalThreshold();
+}
+function serializeFieldValue(value) {
+  if (value instanceof Error) {
+    return { name: value.name, message: value.message, stack: value.stack };
+  }
+  return value;
+}
+function formatEntry(entry) {
+  let line = `[${entry.time}] ${entry.level.toUpperCase()} `;
+  if (entry.scope) line += `[${entry.scope}] `;
+  line += entry.message;
+  if (entry.fields !== void 0) {
+    const plain = Object.fromEntries(
+      Object.entries(entry.fields).map(([k, v]) => [k, serializeFieldValue(v)])
+    );
+    try {
+      line += ` ${JSON.stringify(plain)}`;
+    } catch (err) {
+      line += ` [unserializable fields: ${err instanceof Error ? err.message : String(err)}]`;
+    }
+  }
+  return line;
+}
+function globalDispatch(entry) {
+  if (globalState.disabled) return;
+  (globalState.sink ?? consoleSink)(entry);
+}
+function writeLogEntry(entry) {
+  if (LEVEL_RANK[entry.level] < LEVEL_RANK[globalThreshold()]) return;
+  globalDispatch(entry);
+}
+function createLogger(scope, options) {
+  const baseScope = scope;
+  const baseFields = options?.fields;
+  const write = (level, message, callFields, scopeSuffix) => {
+    const threshold = options?.level ?? globalThreshold();
+    if (LEVEL_RANK[level] < LEVEL_RANK[threshold]) return;
+    const entry = {
+      level,
+      message,
+      time: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    const fullScope = scopeSuffix === void 0 ? baseScope : baseScope === void 0 ? scopeSuffix : `${baseScope}:${scopeSuffix}`;
+    if (fullScope !== void 0) entry.scope = fullScope;
+    if (baseFields !== void 0 || callFields !== void 0) {
+      entry.fields = { ...baseFields, ...callFields };
+    }
+    if (options?.sink) {
+      options.sink(entry);
+    } else {
+      globalDispatch(entry);
+    }
+  };
+  const makeLogger = (scopeSuffix) => ({
+    debug: (message, fields) => write("debug", message, fields, scopeSuffix),
+    info: (message, fields) => write("info", message, fields, scopeSuffix),
+    warn: (message, fields) => write("warn", message, fields, scopeSuffix),
+    error: (message, fields) => write("error", message, fields, scopeSuffix),
+    child: (childScope) => makeLogger(scopeSuffix === void 0 ? childScope : `${scopeSuffix}:${childScope}`)
+  });
+  return makeLogger(void 0);
+}
+var LEVEL_RANK, VALID_LEVELS, globalState, CONSOLE_METHOD, consoleSink;
+var init_logger = __esm({
+  "src/logger/logger.ts"() {
+    "use strict";
+    LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
+    VALID_LEVELS = ["debug", "info", "warn", "error"];
+    globalState = {
+      level: null,
+      sink: null,
+      disabled: false
+    };
+    CONSOLE_METHOD = {
+      debug: "debug",
+      info: "info",
+      warn: "warn",
+      error: "error"
+    };
+    consoleSink = (entry) => {
+      console[CONSOLE_METHOD[entry.level]](formatEntry(entry));
+    };
+  }
+});
+
 // src/runtime/createContext.ts
+function resolveRequestId(request) {
+  const header = request.headers.get("x-request-id");
+  const first = header?.split(",")[0]?.trim();
+  if (first) return first;
+  return crypto.randomUUID();
+}
 function parseCookies(cookieHeader) {
   const cookies = /* @__PURE__ */ new Map();
   if (!cookieHeader) return cookies;
@@ -6420,7 +6546,13 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
   for (const [key, val] of parsedCookies) {
     cookiesObj[key] = val;
   }
+  const requestId = resolveRequestId(request);
+  const log = createLogger("http", {
+    fields: { requestId, method: request.method, path: url.pathname }
+  });
   const ctx = {
+    requestId,
+    log,
     request,
     params,
     query: url.searchParams,
@@ -6525,6 +6657,7 @@ var init_createContext = __esm({
     "use strict";
     init_sse();
     init_responseFormatter();
+    init_logger();
   }
 });
 
@@ -7092,6 +7225,9 @@ function getBuiltinInjectionValue(type, ctx, body) {
     // 任务子系统：注入 TaskClient（入队/查询）；未注册工厂（无 app 编排）时 undefined
     case "tasks":
       return ctx.registries ? ctx.registries.taskHandle.get(ctx) : void 0;
+    // 请求级日志器：与 ctx.log 同一实例（scope http，自动带 requestId/method/path 字段）
+    case "log":
+      return ctx.log;
     default:
       return void 0;
   }
@@ -7716,6 +7852,7 @@ function logger(options = {}) {
       const response = await next();
       const duration = Date.now() - start;
       const entry = {
+        requestId: ctx.requestId,
         method: ctx.method,
         path: ctx.path,
         status: response.status,
@@ -7728,6 +7865,7 @@ function logger(options = {}) {
       const message = err instanceof Error ? err.message : String(err);
       const status = err?.statusCode ?? 500;
       const entry = {
+        requestId: ctx.requestId,
         method: ctx.method,
         path: ctx.path,
         status,
@@ -7739,7 +7877,7 @@ function logger(options = {}) {
     }
   };
 }
-var init_logger = __esm({
+var init_logger2 = __esm({
   "src/middleware/logger.ts"() {
     "use strict";
   }
@@ -8317,7 +8455,7 @@ var init_createServer = __esm({
     init_helmet();
     init_compression();
     init_etag();
-    init_logger();
+    init_logger2();
     init_handleWsUpgrade();
     init_serverUtils();
     init_generateSchemaFiles();
@@ -8386,6 +8524,8 @@ ${BUILD_VIEW_SOURCE}
 
 ${SERIALIZE_ERROR_SOURCE}
 
+${BUILD_LOGGER_SOURCE}
+
 const run = mod.run;
 if (typeof run !== 'function') {
   parentPort.postMessage({
@@ -8405,7 +8545,8 @@ if (typeof run !== 'function') {
     try {
       const registries = buildRegistriesView(msg.registries);
       const progress = (value) => parentPort.postMessage({ type: 'progress', value });
-      const result = await run(payload, { ...taskCtx, signal: controller.signal, registries, progress });
+      const taskLog = msg.log ? createTaskLogger(msg.log.level, msg.log.scope, msg.log.fields) : undefined;
+      const result = await run(payload, { ...taskCtx, signal: controller.signal, registries, progress, log: taskLog });
       parentPort.postMessage({ type: 'done', result });
     } catch (err) {
       const serialized = serializeError(err);
@@ -8513,6 +8654,8 @@ async function runTaskInWorker(options) {
           finish(() => reject(reviveError(msg.error)));
         } else if (msg?.type === "progress") {
           options.onProgress?.(msg.value);
+        } else if (msg?.type === "log") {
+          options.onLog?.(msg.entry);
         }
       }
     );
@@ -8536,7 +8679,8 @@ async function runTaskInWorker(options) {
         type: "run",
         payload,
         taskCtx: { config: safeConfig(taskCtx.config), job: taskCtx.job },
-        registries: options.registries
+        registries: options.registries,
+        log: options.log
       });
     } catch (err) {
       finish(
@@ -8547,7 +8691,7 @@ async function runTaskInWorker(options) {
     }
   });
 }
-var KILL_GRACE_MS, TaskCancelledError, BUILD_VIEW_SOURCE, SERIALIZE_ERROR_SOURCE;
+var KILL_GRACE_MS, TaskCancelledError, BUILD_VIEW_SOURCE, SERIALIZE_ERROR_SOURCE, BUILD_LOGGER_SOURCE;
 var init_taskWorker = __esm({
   "src/task/taskWorker.ts"() {
     "use strict";
@@ -8625,6 +8769,36 @@ function serializeError(err) {
   }
   return { name: 'Error', message: String(err), stack: undefined, props: {} };
 }
+`;
+    BUILD_LOGGER_SOURCE = `
+var LOG_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
+function createTaskLogger(level, scope, fields) {
+  function make(suffix) {
+    function write(lvl, message, callFields) {
+      if (LOG_RANK[lvl] < LOG_RANK[level]) return;
+      var entry = { level: lvl, message: message, time: new Date().toISOString() };
+      var fullScope = suffix === undefined ? scope : scope === undefined ? suffix : scope + ':' + suffix;
+      if (fullScope !== undefined) entry.scope = fullScope;
+      if (fields !== undefined || callFields !== undefined) {
+        entry.fields = Object.assign({}, fields, callFields);
+      }
+      try {
+        parentPort.postMessage({ type: 'log', entry: entry });
+      } catch (_) {
+        entry.fields = { warning: 'log fields not cloneable across worker boundary, dropped' };
+        parentPort.postMessage({ type: 'log', entry: entry });
+      }
+    }
+    return {
+      debug: function (m, f) { write('debug', m, f); },
+      info: function (m, f) { write('info', m, f); },
+      warn: function (m, f) { write('warn', m, f); },
+      error: function (m, f) { write('error', m, f); },
+      child: function (cs) { return make(suffix === undefined ? cs : suffix + ':' + cs); },
+    };
+  }
+  return make(undefined);
+}
 `;
   }
 });
@@ -8731,12 +8905,20 @@ function createTaskQueue(deps) {
             job: { id: job.id, name: job.name, attempt: job.attempt }
           },
           registries: snapshotRegistries(),
+          // 日志配置随 workerData 下发（纯数据），worker 内联重建 taskCtx.log，
+          // 条目回传宿主走统一管道（scope/fields 与进程内路径一致）
+          log: {
+            level: getEffectiveLogLevel(),
+            scope: `task:${job.name}`,
+            fields: { jobId: job.id, task: job.name, attempt: job.attempt }
+          },
           timeoutMs: meta.timeoutMs,
           graceMs: meta.graceMs,
           externalSignal: job.signal,
           onProgress: (value) => {
             if (record.status === "running") record.progress = value;
-          }
+          },
+          onLog: writeLogEntry
         });
       } else {
         let mod = moduleCache2.get(job.name);
@@ -8752,6 +8934,9 @@ function createTaskQueue(deps) {
           config: deps.config,
           job: { id: job.id, name: job.name, attempt: job.attempt },
           registries: registriesView,
+          log: createLogger(`task:${job.name}`, {
+            fields: { jobId: job.id, task: job.name, attempt: job.attempt }
+          }),
           progress: (value) => {
             if (record.status === "running") record.progress = value;
           }
@@ -8906,6 +9091,7 @@ var init_taskQueue = __esm({
     init_httpErrors();
     init_taskWorker();
     init_registries();
+    init_logger();
     TERMINAL_STATUSES = /* @__PURE__ */ new Set(["done", "failed", "cancelled"]);
     MAX_FINISHED_RECORDS = 1e3;
   }
@@ -9253,6 +9439,7 @@ async function createAppBase(options) {
     );
   }
   const config = await loadConfig(rootDir, dist);
+  configureLogging(config?.log);
   const serialized = await importWithCacheBust(routesPath);
   const hydrated = await hydrateRoutes(serialized);
   let sorted = sortRoutes(hydrated.routes);
@@ -9589,6 +9776,7 @@ var init_createAppCore = __esm({
     init_loadTaskDriver();
     init_idleTaskDriver();
     init_cronScheduler();
+    init_logger();
     init_loadPlugins();
     init_importWithCacheBust();
     init_registries();
@@ -9612,6 +9800,7 @@ var init_createAppCore = __esm({
       "etag",
       "bodyLimit",
       "logger",
+      "log",
       "http2",
       "trustedProxy",
       "response",