@faapi/faapi 6.11.0 → 6.13.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FaapiMiddleware, A as AppRegistries, R as RouteManifest, a as FaapiContext, C as CorsOptions, T as TaskClient, H as HelmetOptions, L as LogConfig, I as InjectorMap, b as TaskFailedHandler, c as TaskQueueDeps, d as TaskQueue, e as TaskDriver, f as TaskRegistry, g as TaskManifest, h as ToolMetadata, i as AgentCore, j as AgentMetadata, k as CreateLoggerOptions, l as Logger, W as WsRouteManifest } from './routeTypes-m9wZHWyo.js';
-export { m as AgentHandleFactory, n as AgentHandleStore, o as AgentPathMeta, p as AgentRegistry, q as AgentToolDescriptor, r as FaapiContextConfig, s as FaapiTaskMeta, t as FailOptions, u as Injector, v as LogEntry, w as LogLevel, x as LogSink, y as RouteInfo, z as RouteInputSchema, B as RouteOutputSchema, D as RouteParamSchema, S as SkillRegistry, E as SseEvent, G as SseWriter, J as TaskContext, K as TaskDriverJob, M as TaskDriverProcess, N as TaskDriverRecord, O as TaskFailedInfo, P as TaskJob, Q as TaskJobStatus, U as TaskMetadata, V as TaskModule, X as TaskRegistriesSnapshot, Y as TaskRegistriesView, Z as ToolCore, _ as ToolPathMeta, $ as ToolRegistry, a0 as cors, a1 as createAppRegistries, a2 as createTaskRegistriesView, a3 as createTaskRegistry, a4 as helmet } from './routeTypes-m9wZHWyo.js';
+import { F as FaapiMiddleware, A as AppRegistries, R as RouteManifest, a as FaapiContext, C as CorsOptions, T as TaskClient, H as HelmetOptions, L as LogConfig, I as InjectorMap, b as TaskFailedHandler, c as TaskQueueDeps, d as TaskQueue, e as TaskDriver, f as TaskRegistry, g as TaskManifest, h as ToolMetadata, i as AgentCore, j as AgentMetadata, k as CreateLoggerOptions, l as Logger, W as WsRouteManifest } from './routeTypes-CVPV8Yd3.js';
+export { m as AgentHandleFactory, n as AgentHandleStore, o as AgentPathMeta, p as AgentRegistry, q as AgentToolDescriptor, r as FaapiContextConfig, s as FaapiTaskMeta, t as FailOptions, u as Injector, v as LogEntry, w as LogLevel, x as LogSink, y as RouteInfo, z as RouteInputSchema, B as RouteOutputSchema, D as RouteParamSchema, S as SkillRegistry, E as SseEvent, G as SseWriter, J as TaskContext, K as TaskDriverJob, M as TaskDriverProcess, N as TaskDriverRecord, O as TaskFailedInfo, P as TaskJob, Q as TaskJobStatus, U as TaskMetadata, V as TaskModule, X as TaskRegistriesSnapshot, Y as TaskRegistriesView, Z as ToolCore, _ as ToolPathMeta, $ as ToolRegistry, a0 as cors, a1 as createAppRegistries, a2 as createTaskRegistriesView, a3 as createTaskRegistry, a4 as helmet } from './routeTypes-CVPV8Yd3.js';
 import * as node_http from 'node:http';
 import { Server, IncomingMessage, ServerResponse } from 'node:http';
 import { Socket } from 'node:net';
@@ -1622,18 +1622,12 @@ interface InjectOptions {
 interface InjectResponse {
     status: number;
     headers: Headers;
-    /** 响应字节按 JSON 反序列化的结果（非 JSON 回退字符串）——HTTP 语义，与真实客户端一致 */
-    body: unknown;
     /**
-     * handler 原始返回值（自动包裹与 JSON 序列化之前，Date 等富类型不丢）
-     *
-     * 仅当响应体由 handler 数据返回值自动包裹产生时捕获（同进程取数类型保真，
-     * 快路径判断用 `res.raw !== undefined`）；handler 返回 Response 形态
-     * （ctx.ok/ctx.fail/ctx.json）、抛错、中间件拦截、SSE、404/405/校验失败等
-     * handler 未产生数据返回值的场景为 undefined。语义详见 createAppCore.md
-     * 「inject 的 raw 字段」节。
+     * 响应字节按 JSON 反序列化的结果（非 JSON 回退字符串）——HTTP 语义，与真实客户端一致。
+     * 序列化契约（Date → 毫秒时间戳、BigInt → 字符串等，JSON 原生类型之外全部转换）
+     * 见 `src/utils/stringifyJson.md`，与真实 HTTP 响应完全相同
      */
-    raw?: unknown;
+    body: unknown;
 }
 /**
  * 获取当前 faapi app 单例
@@ -1693,9 +1687,8 @@ interface AppBase {
      * 无服务器测试注入
      *
      * 构建一个模拟请求直接走完整请求链路（CORS / helmet / logger / 全局中间件 / 路由匹配 /
-     * schema 校验 / 目录中间件 / handler），不绑定端口，返回已解析的
-     * `{ status, headers, body, raw }`——body 为 JSON 反序列化结果（HTTP 语义），
-     * raw 为 handler 原始返回值（同进程取数类型保真，语义见 InjectResponse.raw）。
+     * schema 校验 / 目录中间件 / handler），不绑定端口，返回已解析的 `{ status, headers, body }`
+     * ——body 为 JSON 反序列化结果，与真实 HTTP 客户端拿到的一致（同一序列化契约）。
      *
      * `listen()` 前后均可调用——`listen()` 后调用常用于 Next.js Server Component 等同进程场景
      * （配合 `getApp()` 拿到 app 实例）。

package/dist/index.js

@@ -1388,7 +1388,7 @@ function baseExpression(type, ctx) {
     case "union":
       return generateUnionExpression(type.members, ctx);
     case "date":
-      return 'z.preprocess((v) => (typeof v === "string" ? new Date(v) : v), z.date())';
+      return 'z.preprocess((v) => (typeof v === "string" || typeof v === "number" ? new Date(v) : v), z.date())';
     case "record":
       return `z.record(${runtimeTypeToZodExpression(type.key, ctx)}, ${runtimeTypeToZodExpression(type.value, ctx)})`;
     case "map":
@@ -4508,6 +4508,74 @@ async function loadRouteModule(filePath, method, rootDir) {
   return { handler, method };
 }
 
+// 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) {
+  return JSON.stringify(convertValue(value, /* @__PURE__ */ new Set()));
+}
+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 = "";
@@ -4534,7 +4602,7 @@ function encodeSseEvent(event) {
     } else if (event.data === null) {
       dataStr = "null";
     } else {
-      dataStr = JSON.stringify(event.data);
+      dataStr = stringifyJson(event.data);
     }
     const lines = dataStr.split("\n");
     for (const line of lines) {
@@ -4565,7 +4633,9 @@ function createSseWriter() {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
-      Connection: "keep-alive"
+      Connection: "keep-alive",
+      // nginx 认到该头后按响应跳过 proxy_buffering；其他反代/客户端忽略，无副作用
+      "X-Accel-Buffering": "no"
     }
   });
   const writer = {
@@ -4640,7 +4710,7 @@ function jsonRaw(body, status, extraHeaders) {
     const extra = new Headers(extraHeaders);
     extra.forEach((value, key) => headers.set(key, value));
   }
-  return new Response(JSON.stringify(body), { status, headers });
+  return new Response(stringifyJson(body), { status, headers });
 }
 function wrapOkResult(result, config) {
   if (result instanceof Response) return result;
@@ -4966,18 +5036,6 @@ async function resolveBodyForQueryMethod(request) {
   return result.data;
 }
 
-// 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/response/pendingMeta.ts
 var pending = /* @__PURE__ */ new WeakMap();
 function deferMetaHeaders(response, headers) {
@@ -5057,7 +5115,7 @@ async function toResponse(value, meta) {
     });
   }
   if (isPlainObject(value) || Array.isArray(value)) {
-    const body2 = JSON.stringify(value);
+    const body2 = stringifyJson(value);
     const headers2 = new Headers({ "Content-Type": "application/json" });
     applyMeta(headers2);
     return new Response(body2, {
@@ -5081,7 +5139,7 @@ async function toResponse(value, meta) {
       headers: headers2
     });
   }
-  const body = JSON.stringify(value);
+  const body = stringifyJson(value);
   const headers = new Headers({ "Content-Type": "application/json" });
   applyMeta(headers);
   return new Response(body, {
@@ -5164,9 +5222,6 @@ 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;
@@ -5235,9 +5290,7 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      const response = await toResponse(wrapResult(result, ctx), meta);
-      if (!(result instanceof Response)) stashHandlerResult(ctx, result);
-      return response;
+      return toResponse(wrapResult(result, ctx), meta);
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -5248,9 +5301,7 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      const response = await toResponse(wrapResult(result, ctx), meta);
-      if (!(result instanceof Response)) stashHandlerResult(ctx, result);
-      return response;
+      return toResponse(wrapResult(result, ctx), meta);
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -5686,7 +5737,7 @@ async function loadMergedMiddlewares(middlewarePaths) {
 function wrapWsSocket(rawSocket) {
   return {
     send(data) {
-      const payload = typeof data === "string" || Buffer.isBuffer(data) ? data : JSON.stringify(data);
+      const payload = typeof data === "string" || Buffer.isBuffer(data) ? data : stringifyJson(data);
       rawSocket.send(payload);
     },
     close(code, reason) {
@@ -6160,7 +6211,6 @@ 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;
@@ -7204,10 +7254,7 @@ async function createAppBase(options) {
           resolve({
             status: mockRes.statusCode,
             headers: new Headers(mockRes._headers),
-            body: parsed,
-            // inject raw 捕获桥（第三跳）：handler 原始返回值（handleRequest 从 ctx
-            // 桥接到 res；未捕获时 undefined——语义见 InjectResponse.raw 注释）
-            raw: mockRes.__faapiHandlerResult
+            body: parsed
           });
         });
         const listeners = server.listeners("request");