@faapi/faapi 6.11.0 → 6.13.0

package/dist/cli/index.js

@@ -2511,7 +2511,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":
@@ -6116,6 +6116,85 @@ var init_loadRouteModule = __esm({
   }
 });
 
+// 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;
+}
+var init_isPlainObject = __esm({
+  "src/utils/isPlainObject.ts"() {
+    "use strict";
+  }
+});
+
+// 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;
+}
+var init_stringifyJson = __esm({
+  "src/utils/stringifyJson.ts"() {
+    "use strict";
+    init_isPlainObject();
+  }
+});
+
 // src/runtime/sse.ts
 function encodeSseEvent(event) {
   let out = "";
@@ -6142,7 +6221,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) {
@@ -6173,7 +6252,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 = {
@@ -6223,6 +6304,7 @@ function createSseWriter() {
 var init_sse = __esm({
   "src/runtime/sse.ts"() {
     "use strict";
+    init_stringifyJson();
   }
 });
 
@@ -6318,7 +6400,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;
@@ -6385,6 +6467,7 @@ var init_responseFormatter = __esm({
     "use strict";
     init_FaapiError();
     init_httpErrors();
+    init_stringifyJson();
   }
 });
 
@@ -6931,23 +7014,6 @@ var init_resolveInput = __esm({
   }
 });
 
-// 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;
-}
-var init_isPlainObject = __esm({
-  "src/utils/isPlainObject.ts"() {
-    "use strict";
-  }
-});
-
 // src/response/pendingMeta.ts
 function deferMetaHeaders(response, headers) {
   const existing = pending.get(response);
@@ -7033,7 +7099,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, {
@@ -7057,7 +7123,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, {
@@ -7069,6 +7135,7 @@ var init_toResponse = __esm({
   "src/response/toResponse.ts"() {
     "use strict";
     init_isPlainObject();
+    init_stringifyJson();
     init_pendingMeta();
   }
 });
@@ -7394,9 +7461,6 @@ var init_injectParams = __esm({
 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;
@@ -7465,9 +7529,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;
@@ -7478,9 +7540,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;
@@ -8081,7 +8141,7 @@ var init_serverUtils = __esm({
 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) {
@@ -8095,6 +8155,7 @@ function wrapWsSocket(rawSocket) {
 var init_wsHandler = __esm({
   "src/runtime/wsHandler.ts"() {
     "use strict";
+    init_stringifyJson();
   }
 });
 
@@ -8582,7 +8643,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;
@@ -9799,10 +9859,7 @@ async function createAppBase(options) {
           resolve3({
             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");