@faapi/faapi 1.2.1 → 1.3.0

package/dist/cli/index.js

@@ -4574,6 +4574,41 @@ function createContext(request, params, config = {}, ip = "") {
       ctxWithSse.__sseResponse = writer.response;
       ctxWithSse.__sseWriter = writer;
       return writer;
+    },
+    /**
+     * 显式包装成功响应(返回 Response,不会被自动包裹再次包装)
+     *
+     * 用 config.response.ok(或默认 (data) => ({ data })) 包裹 data 并返回 JSON Response。
+     * handler 也可直接 return data,框架会自动用 ok 包裹,两者等价。
+     */
+    ok(data) {
+      const responseConfig = config.response;
+      const okFn = responseConfig?.ok ?? ((d) => ({ data: d }));
+      const body = okFn(data);
+      return ctx.json(body);
+    },
+    /**
+     * 返回错误响应(对象形式参数,status 和 code 均可省略)
+     *
+     * - status 省略时 HTTP 状态码默认 500
+     * - code 省略时响应 body 里不含 code 字段(默认 fail 函数只放非 undefined 的字段)
+     * - status 和 code 独立无关联
+     *
+     * body 用 config.response.fail(或默认实现)包装。
+     */
+    fail(options) {
+      const responseConfig = config.response;
+      const failFn = responseConfig?.fail ?? ((e) => {
+        const error = { message: e.message };
+        if (e.code !== void 0) error.code = e.code;
+        return { error };
+      });
+      const body = failFn({
+        status: options.status,
+        code: options.code,
+        message: options.message
+      });
+      return ctx.json(body, options.status ?? 500);
     }
   };
   const extend = config?.extendContext;
@@ -4938,6 +4973,12 @@ var init_injectParams = __esm({
 });
 
 // src/runtime/invokeHandler.ts
+function wrapResult(result, ctx) {
+  if (result instanceof Response) return result;
+  const responseConfig = ctx.config.response;
+  const okFn = responseConfig?.ok ?? ((d) => ({ data: d }));
+  return okFn(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;
@@ -5002,7 +5043,7 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      return toResponse(result, meta);
+      return toResponse(wrapResult(result, ctx), meta);
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -5013,7 +5054,7 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
       const result = await injectParamsAsync(handler, ctx, body, injectors);
       const sseResponse = pickSseAndAutoClose();
       if (sseResponse) return sseResponse;
-      return toResponse(result, meta);
+      return toResponse(wrapResult(result, ctx), meta);
     } catch (err) {
       autoCloseSseOnError();
       throw err;
@@ -6058,41 +6099,40 @@ async function createAppBase(options) {
       } = injectOpts ?? {};
       const queryStr = query ? "?" + new URLSearchParams(Object.entries(query).map(([k, v]) => [k, String(v)])).toString() : "";
       return new Promise((resolve3, reject) => {
-        const mockRes = {
-          statusCode: 200,
-          _headers: {},
-          _body: Buffer.alloc(0),
-          setHeader(name, value) {
-            this._headers[name.toLowerCase()] = value;
-          },
-          appendHeader(name, value) {
-            const key = name.toLowerCase();
-            const existing = this._headers[key];
-            this._headers[key] = existing ? `${existing}, ${value}` : value;
-          },
-          writeHead(status, headers) {
-            this.statusCode = status;
-            if (headers) {
-              Object.assign(this._headers, headers);
-            }
-          },
-          end(data) {
-            const buf = Buffer.isBuffer(data) ? data : Buffer.from(data ?? "");
-            this._body = buf;
-            resolve3({
-              status: this.statusCode,
-              headers: new Headers(this._headers),
-              body: this.parseBody()
-            });
-          },
-          parseBody() {
-            try {
-              return JSON.parse(this._body.toString());
-            } catch {
-              return this._body.toString();
-            }
+        const chunks = [];
+        const mockRes = new PassThrough();
+        mockRes.statusCode = 200;
+        mockRes._headers = {};
+        mockRes.setHeader = function(name, value) {
+          this._headers[name.toLowerCase()] = value;
+        };
+        mockRes.appendHeader = function(name, value) {
+          const key = name.toLowerCase();
+          const existing = this._headers[key];
+          this._headers[key] = existing ? `${existing}, ${value}` : value;
+        };
+        mockRes.writeHead = function(status, headers) {
+          this.statusCode = status;
+          if (headers) {
+            Object.assign(this._headers, headers);
           }
         };
+        mockRes.on("data", (chunk) => chunks.push(chunk));
+        mockRes.on("error", reject);
+        mockRes.on("finish", () => {
+          const body2 = Buffer.concat(chunks);
+          let parsed;
+          try {
+            parsed = JSON.parse(body2.toString());
+          } catch {
+            parsed = body2.toString();
+          }
+          resolve3({
+            status: mockRes.statusCode,
+            headers: new Headers(mockRes._headers),
+            body: parsed
+          });
+        });
         const listeners = server.listeners("request");
         const handler = listeners[listeners.length - 1];
         if (typeof handler !== "function") {
@@ -6191,7 +6231,8 @@ var init_createAppCore = __esm({
       "helmet",
       "bodyLimit",
       "logger",
-      "http2"
+      "http2",
+      "response"
     ]);
   }
 });