@faapi/faapi 6.11.0 → 6.13.0

package/dist/{routeTypes-m9wZHWyo.d.ts → routeTypes-CVPV8Yd3.d.ts}

@@ -752,7 +752,9 @@ type TaskFailedHandler = (info: TaskFailedInfo) => Promise<void> | void;
  *
  * 设计要点：
  * - writer 内部用 ReadableStream + TextEncoder，send 时 enqueue，close 时 close controller
- * - response 预设 text/event-stream、no-cache、keep-alive 头，状态码默认 200
+ * - response 预设 text/event-stream、no-cache、keep-alive、X-Accel-Buffering: no 头，状态码默认 200
+ *   （X-Accel-Buffering: no 让 nginx 按响应跳过 proxy_buffering，SSE 小包不被攒到流结束才下发；
+ *   非 nginx 反代不识别该头，当普通自定义头透传）
  * - close 后再 send 静默忽略，避免 handler 异步流程中误写已关闭的流
  * - sendError 向流写入 event: error 后关闭，用于流式输出中报错的优雅终止
  *

package/dist/testing.d.ts

@@ -1,4 +1,4 @@
-import { a as FaapiContext, F as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions } from './routeTypes-m9wZHWyo.js';
+import { a as FaapiContext, F as FaapiMiddleware, I as InjectorMap, R as RouteManifest, W as WsRouteManifest, C as CorsOptions, H as HelmetOptions } from './routeTypes-CVPV8Yd3.js';
 import { Server } from 'node:http';
 import { WebSocket } from 'ws';
 

package/dist/testing.js

@@ -1,3 +1,71 @@
+// 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 = "";
@@ -24,7 +92,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) {
@@ -55,7 +123,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 = {
@@ -182,7 +252,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;
@@ -541,18 +611,6 @@ function createTestContext(options) {
   return createContext(request, params, config, ip, registries);
 }
 
-// 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) {
@@ -632,7 +690,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, {
@@ -656,7 +714,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, {
@@ -1036,9 +1094,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;
@@ -1107,9 +1162,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;
@@ -1120,9 +1173,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;
@@ -2695,7 +2746,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":
@@ -4322,7 +4373,7 @@ function buildErrorResponse(err, config) {
 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) {
@@ -4795,7 +4846,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;