@faapi/faapi 6.32.0 → 6.33.0

package/dist/index.js

@@ -2126,19 +2126,6 @@ var TaskCancelledError = class extends Error {
     this.name = "TaskCancelledError";
   }
 };
-function safeConfig(config) {
-  if (config === void 0 || config === null) return config;
-  try {
-    structuredClone(config);
-    return config;
-  } catch {
-  }
-  try {
-    return JSON.parse(JSON.stringify(config));
-  } catch {
-    return void 0;
-  }
-}
 function reviveError(payload) {
   const err = new Error(payload?.message ?? "task worker error");
   if (payload?.name !== void 0) err.name = payload.name;
@@ -2253,7 +2240,6 @@ async function runTaskInWorker(options) {
         type: "run",
         payload,
         taskCtx: {
-          config: safeConfig(taskCtx.config),
           job: taskCtx.job
         },
         registries: options.registries,
@@ -2262,14 +2248,122 @@ async function runTaskInWorker(options) {
       });
     } catch (err) {
       finish(
-        () => reject(
-          new Error(`Task "${taskCtx.job.name}" payload/config is not cloneable: ${String(err)}`)
-        )
+        () => reject(new Error(`Task "${taskCtx.job.name}" payload is not cloneable: ${String(err)}`))
       );
     }
   });
 }
 
+// src/utils/isPlainObject.ts
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
+  }
+  if (Array.isArray(value)) {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(value);
+  return proto === null || proto === Object.prototype;
+}
+
+// src/utils/stringifyJson.ts
+function stringifyJson(value) {
+  if (!needsConversion(value, /* @__PURE__ */ new Set())) {
+    return JSON.stringify(value);
+  }
+  return JSON.stringify(convertValue(value, /* @__PURE__ */ new Set()));
+}
+function needsConversion(value, ancestors) {
+  if (value === null) return false;
+  const type = typeof value;
+  if (type === "bigint") return true;
+  if (type === "number") return !Number.isFinite(value);
+  if (type !== "object") return false;
+  const obj = value;
+  if (ancestors.has(obj)) {
+    throw new TypeError("[faapi] Converting circular structure to JSON");
+  }
+  if (obj instanceof Date || obj instanceof Map || obj instanceof Set || obj instanceof RegExp) {
+    return true;
+  }
+  if (typeof obj.toJSON === "function") return true;
+  if (Array.isArray(obj)) {
+    ancestors.add(obj);
+    for (let i = 0; i < obj.length; i++) {
+      if (needsConversion(obj[i], ancestors)) {
+        ancestors.delete(obj);
+        return true;
+      }
+    }
+    ancestors.delete(obj);
+    return false;
+  }
+  if (isPlainObject(obj)) {
+    ancestors.add(obj);
+    for (const key in obj) {
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
+      if (needsConversion(obj[key], ancestors)) {
+        ancestors.delete(obj);
+        return true;
+      }
+    }
+    ancestors.delete(obj);
+    return false;
+  }
+  return false;
+}
+function convertValue(value, ancestors) {
+  if (value === null) return value;
+  const type = typeof value;
+  if (type === "bigint") return value.toString();
+  if (type === "number") return Number.isFinite(value) ? value : String(value);
+  if (type !== "object") return value;
+  const obj = value;
+  if (ancestors.has(obj)) {
+    throw new TypeError("[faapi] Converting circular structure to JSON");
+  }
+  if (obj instanceof Date) return obj.getTime();
+  if (obj instanceof Map) {
+    ancestors.add(obj);
+    const entries = Array.from(obj, ([k, v]) => [
+      convertValue(k, ancestors),
+      convertValue(v, ancestors)
+    ]);
+    ancestors.delete(obj);
+    return entries;
+  }
+  if (obj instanceof Set) {
+    ancestors.add(obj);
+    const values = Array.from(obj, (v) => convertValue(v, ancestors));
+    ancestors.delete(obj);
+    return values;
+  }
+  if (obj instanceof RegExp) return obj.toString();
+  const toJSON = obj.toJSON;
+  if (typeof toJSON === "function") {
+    ancestors.add(obj);
+    const result = convertValue(toJSON.call(obj), ancestors);
+    ancestors.delete(obj);
+    return result;
+  }
+  if (Array.isArray(obj)) {
+    ancestors.add(obj);
+    const arr = obj.map((item) => convertValue(item, ancestors));
+    ancestors.delete(obj);
+    return arr;
+  }
+  if (isPlainObject(obj)) {
+    ancestors.add(obj);
+    const out = {};
+    for (const [key, val] of Object.entries(obj)) {
+      out[key] = convertValue(val, ancestors);
+    }
+    ancestors.delete(obj);
+    return out;
+  }
+  return obj;
+}
+
 // src/logger/formatEntry.ts
 function serializeFieldValue(value) {
   if (value instanceof Error) {
@@ -2285,11 +2379,7 @@ function formatEntry(entry) {
     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)}]`;
-    }
+    line += ` ${stringifyJson(plain)}`;
   }
   return line;
 }
@@ -2307,7 +2397,14 @@ function createFileLogSink(options) {
   };
   const openStream = (name) => {
     const stream = fs2.createWriteStream(path3.join(options.dir, `${name}.log`), { flags: "a" });
-    stream.on("error", () => {
+    let streamErrorLogged = false;
+    stream.on("error", (err) => {
+      if (streamErrorLogged) return;
+      streamErrorLogged = true;
+      console.error(
+        `[faapi] log file stream "${name}.log" failed \u2014 file logging on this stream stopped (subsequent errors suppressed). Check disk space / permissions for ${options.dir}:`,
+        err
+      );
     });
     streams.set(name, stream);
   };
@@ -2539,13 +2636,14 @@ function createTaskQueue(deps) {
   const loadTaskModule = deps.loadTaskModule ?? (async (filePath) => await import(filePath));
   const loadPayloadSchema = deps.loadPayloadSchema ?? (async (filePath) => {
     const zodPath = path4.join(path4.dirname(filePath), "zod.js");
-    try {
-      const mod = await import(zodPath);
-      const schemaKey = Object.keys(mod).find((k) => k.endsWith("Schema"));
-      return schemaKey ? mod[schemaKey] : void 0;
-    } catch {
-      return void 0;
+    const mod = await import(zodPath);
+    const schemaKey = Object.keys(mod).find((k) => k.endsWith("Schema"));
+    if (!schemaKey) {
+      throw new Error(
+        `[faapi] Task payload schema artifact has no *Schema export: ${zodPath} \u2014 re-run "faapi dev" / "faapi build" to regenerate task artifacts.`
+      );
     }
+    return mod[schemaKey];
   });
   function assertKnownTask(name) {
     const meta = registry.get(name);
@@ -2564,14 +2662,13 @@ function createTaskQueue(deps) {
   async function validatePayload(name, payload) {
     if (!schemaCache.has(name)) {
       const meta = registry.get(name);
-      schemaCache.set(
-        name,
-        await loadPayloadSchema(path4.resolve(rootDir, meta.filePath)).catch(() => void 0)
-      );
+      schemaCache.set(name, await loadPayloadSchema(path4.resolve(rootDir, meta.filePath)));
     }
     const schema = schemaCache.get(name);
     if (!schema || typeof schema.safeParse !== "function") {
-      return payload;
+      throw new Error(
+        `[faapi] Task "${name}" has no valid payload schema (zod.js missing or no *Schema export). Payload declarations are mandatory: re-run "faapi dev" / "faapi build" to regenerate task artifacts.`
+      );
     }
     const result = schema.safeParse(payload);
     if (!result.success) {
@@ -2605,7 +2702,8 @@ function createTaskQueue(deps) {
           taskModulePath: path4.resolve(rootDir, meta.filePath),
           payload: job.payload,
           taskCtx: {
-            config: deps.config,
+            // 隔离任务不传 config：worker 线程不接收进程配置（config 含函数字段
+            // 不可结构化克隆，框架不做降级传递）——任务数据经 payload 显式传入
             resourcesDir: deps.resourcesDir,
             job: { id: job.id, name: job.name, attempt: job.attempt }
           },
@@ -2672,7 +2770,8 @@ function createTaskQueue(deps) {
             cancelled,
             error: record.error
           })
-        ).catch(() => {
+        ).catch((hookErr) => {
+          console.error(`[faapi] task onFailed hook threw for "${job.name}":`, hookErr);
         });
       }
       throw err;
@@ -2895,25 +2994,27 @@ function detectIgnoredMetaFields(source, strictHit) {
   for (const line of source.split("\n")) {
     const trimmed = line.trim();
     if (trimmed.startsWith("//")) continue;
+    if (trimmed.startsWith("*") || trimmed.startsWith("/*") || trimmed.endsWith("*/")) continue;
     for (const field of ALL_META_FIELDS) {
       if (new RegExp(`\\b${field}\\s*:`).test(trimmed)) declared.add(field);
     }
   }
   return ALL_META_FIELDS.filter((field) => declared.has(field) && !strictHit[field]);
 }
-function warnIgnoredMetaFields(name, fields) {
-  for (const field of fields) {
+function throwIgnoredMetaFields(name, fields) {
+  if (fields.length === 0) return;
+  const details = fields.map((field) => {
     if (STRING_META_FIELDS.includes(field)) {
-      console.warn(
-        `[faapi] Task "${name}" declares "${field}" but its value is not a string literal \u2014 the declaration was ignored and the task will not be cron-scheduled. Meta values are extracted from source code without importing it, so only literal values are recognized: use a quoted literal (cron: '0 3 * * *'), not an expression or a dynamic value.`
-      );
-    } else {
-      const consequence = field === "timeoutMs" ? " and the task will run in-process with no timeout" : "";
-      console.warn(
-        `[faapi] Task "${name}" declares "${field}" but its value is not a numeric literal \u2014 the declaration was ignored${consequence}. Meta values are extracted from source code without importing it, so only literal values are recognized (underscores allowed, e.g. 1_800_000); expressions like 30 * 60_000 or dynamic values are not supported.`
-      );
+      return `"${field}": value is not a string literal \u2014 the declaration would be ignored and the task would not be cron-scheduled. Use a quoted literal (cron: '0 3 * * *'), not an expression or a dynamic value.`;
     }
-  }
+    const consequence = field === "timeoutMs" ? " \u2014 the declaration would be ignored and the task would silently run in-process with no timeout" : " \u2014 the declaration would be ignored";
+    return `"${field}": value is not a numeric literal${consequence}. Only literal values are recognized (underscores allowed, e.g. 1_800_000); expressions like 30 * 60_000 or dynamic values are not supported.`;
+  });
+  throw new Error(
+    `[faapi] Task "${name}" declares meta field(s) with non-literal values:
+  ${details.join("\n  ")}
+Meta values are extracted from source code without importing it, so only literals are recognized. If a matched line is inside a block comment (e.g. a single-line /* ... */ comment containing a meta-like declaration), rewrite the comment so it does not look like a meta declaration.`
+  );
 }
 function parseNumericLiteral(raw) {
   return Number(raw.replace(/_/g, ""));
@@ -2983,7 +3084,7 @@ async function scanTasks(rootDir, patterns) {
       timeoutMs: timeoutMs !== void 0,
       graceMs: graceMs !== void 0
     };
-    warnIgnoredMetaFields(name, detectIgnoredMetaFields(source, strictHit));
+    throwIgnoredMetaFields(name, detectIgnoredMetaFields(source, strictHit));
     tasks.push(manifest);
   }
   return tasks.sort((a, b) => a.name.localeCompare(b.name));
@@ -3583,11 +3684,7 @@ async function ensureMiddlewaresCompiled(middlewarePaths, rootDir) {
   if (!dist) return;
   for (const mwPath of middlewarePaths) {
     const sourcePath = prodPathToSourcePath(mwPath, rootDir, dist);
-    try {
-      await ensureCompiled(sourcePath, rootDir, dist);
-    } catch (err) {
-      console.error(`[faapi] Failed to compile middleware source ${sourcePath}:`, err);
-    }
+    await ensureCompiled(sourcePath, rootDir, dist);
   }
 }
 function prodSourcePathToProductPath(sourceAbsPath, rootDir, dist) {
@@ -4591,116 +4688,6 @@ function hasBufferedBody(response) {
   return bufferedBodyResponses.has(response);
 }
 
-// src/utils/isPlainObject.ts
-function isPlainObject(value) {
-  if (value === null || typeof value !== "object") {
-    return false;
-  }
-  if (Array.isArray(value)) {
-    return false;
-  }
-  const proto = Object.getPrototypeOf(value);
-  return proto === null || proto === Object.prototype;
-}
-
-// src/utils/stringifyJson.ts
-function stringifyJson(value) {
-  if (!needsConversion(value, /* @__PURE__ */ new Set())) {
-    return JSON.stringify(value);
-  }
-  return JSON.stringify(convertValue(value, /* @__PURE__ */ new Set()));
-}
-function needsConversion(value, ancestors) {
-  if (value === null) return false;
-  const type = typeof value;
-  if (type === "bigint") return true;
-  if (type === "number") return !Number.isFinite(value);
-  if (type !== "object") return false;
-  const obj = value;
-  if (ancestors.has(obj)) {
-    throw new TypeError("[faapi] Converting circular structure to JSON");
-  }
-  if (obj instanceof Date || obj instanceof Map || obj instanceof Set || obj instanceof RegExp) {
-    return true;
-  }
-  if (typeof obj.toJSON === "function") return true;
-  if (Array.isArray(obj)) {
-    ancestors.add(obj);
-    for (let i = 0; i < obj.length; i++) {
-      if (needsConversion(obj[i], ancestors)) {
-        ancestors.delete(obj);
-        return true;
-      }
-    }
-    ancestors.delete(obj);
-    return false;
-  }
-  if (isPlainObject(obj)) {
-    ancestors.add(obj);
-    for (const key in obj) {
-      if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
-      if (needsConversion(obj[key], ancestors)) {
-        ancestors.delete(obj);
-        return true;
-      }
-    }
-    ancestors.delete(obj);
-    return false;
-  }
-  return false;
-}
-function convertValue(value, ancestors) {
-  if (value === null) return value;
-  const type = typeof value;
-  if (type === "bigint") return value.toString();
-  if (type === "number") return Number.isFinite(value) ? value : String(value);
-  if (type !== "object") return value;
-  const obj = value;
-  if (ancestors.has(obj)) {
-    throw new TypeError("[faapi] Converting circular structure to JSON");
-  }
-  if (obj instanceof Date) return obj.getTime();
-  if (obj instanceof Map) {
-    ancestors.add(obj);
-    const entries = Array.from(obj, ([k, v]) => [
-      convertValue(k, ancestors),
-      convertValue(v, ancestors)
-    ]);
-    ancestors.delete(obj);
-    return entries;
-  }
-  if (obj instanceof Set) {
-    ancestors.add(obj);
-    const values = Array.from(obj, (v) => convertValue(v, ancestors));
-    ancestors.delete(obj);
-    return values;
-  }
-  if (obj instanceof RegExp) return obj.toString();
-  const toJSON = obj.toJSON;
-  if (typeof toJSON === "function") {
-    ancestors.add(obj);
-    const result = convertValue(toJSON.call(obj), ancestors);
-    ancestors.delete(obj);
-    return result;
-  }
-  if (Array.isArray(obj)) {
-    ancestors.add(obj);
-    const arr = obj.map((item) => convertValue(item, ancestors));
-    ancestors.delete(obj);
-    return arr;
-  }
-  if (isPlainObject(obj)) {
-    ancestors.add(obj);
-    const out = {};
-    for (const [key, val] of Object.entries(obj)) {
-      out[key] = convertValue(val, ancestors);
-    }
-    ancestors.delete(obj);
-    return out;
-  }
-  return obj;
-}
-
 // src/runtime/sse.ts
 function encodeSseEvent(event) {
   let out = "";
@@ -5898,38 +5885,30 @@ function setCachedMiddlewares(absPath, bundle) {
   middlewareCache.set(absPath, bundle);
 }
 async function loadMiddlewaresFile(filePath) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    console.error(
-      `[faapi] Failed to load middlewares from ${filePath}:`,
-      err instanceof Error ? err.stack ?? err.message : err
-    );
-    return { middlewares: [], injectors: {} };
-  }
+  const module = await importWithCacheBust(filePath);
   const middlewares = module.default ?? module.middlewares ?? [];
   if (!Array.isArray(middlewares)) {
-    console.warn(`[faapi] middlewares.ts \u5E94\u5BFC\u51FA\u6570\u7EC4\uFF0C\u5DF2\u5FFD\u7565: ${filePath}`);
-    return { middlewares: [], injectors: {} };
+    throw new TypeError(
+      `[faapi] middlewares.ts must export an array (default or named "middlewares"): ${filePath}`
+    );
   }
-  const validMiddlewares = middlewares.filter((m) => {
+  const validMiddlewares = [];
+  for (const m of middlewares) {
     if (typeof m !== "function") {
-      console.warn(`[faapi] \u65E0\u6548\u7684\u4E2D\u95F4\u4EF6\u9879\uFF08\u5E94\u4E3A\u51FD\u6570\uFF09\uFF0C\u5DF2\u5FFD\u7565: ${typeof m}`);
-      return false;
+      throw new TypeError(
+        `[faapi] every middleware must be a function, got ${typeof m}: ${filePath}`
+      );
     }
-    return true;
-  });
+    validMiddlewares.push(m);
+  }
   const injectors = module.injectors ?? {};
   if (typeof injectors !== "object" || injectors === null) {
-    console.warn(`[faapi] injectors \u5E94\u5BFC\u51FA\u5BF9\u8C61\uFF0C\u5DF2\u5FFD\u7565: ${filePath}`);
-    return { middlewares: validMiddlewares, injectors: {} };
+    throw new TypeError(`[faapi] "injectors" export must be an object: ${filePath}`);
   }
   const validInjectors = {};
   for (const [name, injector] of Object.entries(injectors)) {
     if (typeof injector !== "function") {
-      console.warn(`[faapi] \u6CE8\u5165\u5668 ${name} \u5E94\u4E3A\u51FD\u6570\uFF0C\u5DF2\u5FFD\u7565`);
-      continue;
+      throw new TypeError(`[faapi] injector "${name}" must be a function: ${filePath}`);
     }
     validInjectors[name] = injector;
   }
@@ -5944,10 +5923,16 @@ async function loadMergedMiddlewares(middlewarePaths) {
     if (bundle === void 0) {
       let loading = inFlight.get(absMwPath);
       if (!loading) {
-        loading = loadMiddlewaresFile(absMwPath).then((result) => {
-          setCachedMiddlewares(absMwPath, result);
-          return result;
-        });
+        loading = loadMiddlewaresFile(absMwPath).then(
+          (result) => {
+            setCachedMiddlewares(absMwPath, result);
+            return result;
+          },
+          (err) => {
+            inFlight.delete(absMwPath);
+            throw err;
+          }
+        );
         inFlight.set(absMwPath, loading);
       }
       bundle = await loading;
@@ -6542,7 +6527,8 @@ async function sendErrorResponse(err, meta, res, onError, ctx) {
   if (onError && ctx) {
     try {
       await onError(err, ctx);
-    } catch {
+    } catch (hookErr) {
+      console.error("[faapi] lifecycle onError hook threw:", hookErr);
     }
   }
 }
@@ -6735,7 +6721,7 @@ async function loadPlugins(declarations, ctx, rootDir, dist) {
   const upgradeWrappers = [];
   const failures = [];
   if (!declarations || declarations.length === 0) {
-    return { handlerWrappers, upgradeWrappers, failures };
+    return { handlerWrappers, upgradeWrappers };
   }
   const fullCtx = {
     ...ctx,
@@ -6762,7 +6748,7 @@ async function loadPlugins(declarations, ctx, rootDir, dist) {
     }
     if (enable === false) continue;
     if (loaded.has(specifier)) {
-      console.warn(`! Plugin already loaded: ${specifier}, skipping`);
+      failures.push({ specifier, reason: "duplicate plugin declaration" });
       continue;
     }
     loaded.add(specifier);
@@ -6783,12 +6769,12 @@ async function loadPlugins(declarations, ctx, rootDir, dist) {
     }
   }
   if (failures.length > 0) {
-    console.error(
+    throw new Error(
       `[faapi] ${failures.length} plugin(s) failed to load:
 ` + failures.map((f) => `  - ${f.specifier}: ${f.reason}`).join("\n")
     );
   }
-  return { handlerWrappers, upgradeWrappers, failures };
+  return { handlerWrappers, upgradeWrappers };
 }
 var TS_EXTS = /\.(ts|tsx|mts|cts)$/;
 var JS_EXTS = /\.(js|mjs|cjs|jsx)$/;
@@ -7389,6 +7375,7 @@ function generateTaskSchemaFileSource(sources, resolveType, helpersImportPath) {
 }
 async function generateTaskArtifacts(manifests, rootDir, dist) {
   const metadata = [];
+  const declarationErrors = [];
   if (manifests.length > 0) {
     const programByFile = createPrograms(manifests.map((m) => path25.resolve(rootDir, m.filePath)));
     for (const manifest of manifests) {
@@ -7397,11 +7384,28 @@ async function generateTaskArtifacts(manifests, rootDir, dist) {
         name: manifest.name,
         filePath: manifest.filePath
       });
-      if (result) {
-        metadata.push({ ...result, taskName: manifest.name });
+      if (!result) {
+        declarationErrors.push(
+          `"${manifest.name}" (${manifest.filePath}): no exported run function found`
+        );
+        continue;
       }
+      if (!result.inputTypeName) {
+        declarationErrors.push(
+          `"${manifest.name}" (${manifest.filePath}): run's first parameter has no type name \u2014 declare a Payload type (an empty interface for parameterless tasks), or explicitly opt out of validation with "type Payload = unknown"`
+        );
+        continue;
+      }
+      metadata.push({ ...result, taskName: manifest.name });
     }
   }
+  if (declarationErrors.length > 0) {
+    throw new Error(
+      `[faapi] ${declarationErrors.length} task(s) missing a Payload type declaration \u2014 payload validation must not be silently skipped:
+  ${declarationErrors.join("\n  ")}
+Every task must declare a payload type on run's first parameter; "type Payload = unknown" generates an always-passing schema (explicit no-validation opt-out).`
+    );
+  }
   const serialized = serializeTasks(manifests, dist);
   const tasksPath = path25.resolve(rootDir, dist, TASKS_FILE);
   await writeTasksModule(serialized, tasksPath);
@@ -7679,7 +7683,7 @@ async function createAppBase(options) {
   const taskQueue = createTaskQueue({
     registry: registries.task,
     rootDir,
-    config,
+    config: config ?? {},
     resourcesDir,
     registries: createTaskRegistriesView(registries),
     // 轻量补全通道：进程内路径经 store 惰性读取（插件注册后的活引用）；
@@ -7710,7 +7714,7 @@ async function createAppBase(options) {
     dist,
     cors: config?.cors ?? true,
     onError: config?.lifecycle?.onError,
-    config: config ?? void 0,
+    config,
     wsRoutes,
     middlewares: config?.middlewares,
     injectors: config?.injectors,