@faapi/faapi 1.2.0 → 1.3.0

package/dist/cli/index.js

@@ -545,9 +545,14 @@ function getVitestImportActual() {
   if (typeof vi?.importActual !== "function") return void 0;
   return vi.importActual.bind(vi);
 }
-async function importWithCacheBust(filePath) {
+async function importWithCacheBust(filePath, bustViteCache = false) {
   const importActual = getVitestImportActual();
   if (importActual) {
+    if (bustViteCache) {
+      let url2 = pathToFileURL(filePath).href;
+      url2 += `?t=${Date.now()}`;
+      return await import(url2);
+    }
     return await importActual(filePath);
   }
   let url = pathToFileURL(filePath).href;
@@ -4324,31 +4329,28 @@ var init_compileOnDemand = __esm({
 });
 
 // src/loader/loadRouteModule.ts
+import fs11 from "fs";
 async function loadRouteModule(filePath, method, rootDir) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    if (isDevOnDemandEnabled() && rootDir) {
-      const dist = getDevDist();
-      if (dist) {
-        const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+  if (isDevOnDemandEnabled() && rootDir) {
+    const dist = getDevDist();
+    if (dist) {
+      const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+      if (sourcePath && fs11.existsSync(sourcePath)) {
         try {
-          const compiled = await ensureCompiled(sourcePath, rootDir, dist);
-          if (compiled) {
-            module = await importWithCacheBust(filePath);
-            const handler2 = resolveExport(module, method);
-            validateRouteModule(handler2, method, filePath);
-            return { handler: handler2, method };
-          }
+          await ensureCompiled(sourcePath, rootDir, dist);
         } catch (compileErr) {
-          const compileReason = compileErr instanceof Error ? compileErr.message : String(compileErr);
-          throw new Error(`Failed to compile route module "${sourcePath}": ${compileReason}`, {
+          const reason = compileErr instanceof Error ? compileErr.message : String(compileErr);
+          throw new Error(`Failed to compile route module "${sourcePath}": ${reason}`, {
             cause: compileErr
           });
         }
       }
     }
+  }
+  let module;
+  try {
+    module = await importWithCacheBust(filePath, isDevOnDemandEnabled());
+  } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
     throw new Error(`Failed to load route module "${filePath}": ${reason}`, { cause: err });
   }
@@ -4572,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;
@@ -4936,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;
@@ -5000,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;
@@ -5011,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;
@@ -5063,7 +5106,7 @@ function invalidateSchemaCache() {
 async function loadSchemaModule(schemaPath) {
   let mod = moduleCache.get(schemaPath);
   if (!mod) {
-    mod = await importWithCacheBust(schemaPath);
+    mod = await importWithCacheBust(schemaPath, isDevOnDemandEnabled());
     moduleCache.set(schemaPath, mod);
   }
   return mod;
@@ -5148,6 +5191,7 @@ var init_validateInput = __esm({
     init_schemaName();
     init_httpErrors();
     init_importWithCacheBust();
+    init_compileOnDemand();
     moduleCache = /* @__PURE__ */ new Map();
   }
 });
@@ -5459,6 +5503,7 @@ var init_wsHandler = __esm({
 });
 
 // src/server/handleWsUpgrade.ts
+import fs12 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
 import path13 from "path";
 function getPathname(req) {
@@ -5467,24 +5512,16 @@ function getPathname(req) {
   return idx >= 0 ? url.slice(0, idx) : url;
 }
 async function loadWsHandler(filePath, ctx, rootDir) {
-  let module;
-  try {
-    module = await importWithCacheBust(filePath);
-  } catch (err) {
-    if (isDevOnDemandEnabled() && rootDir) {
-      const dist = getDevDist();
-      if (dist) {
-        const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-        const compiled = await ensureCompiled(sourcePath, rootDir, dist);
-        if (compiled) {
-          module = await importWithCacheBust(filePath);
-        }
+  if (isDevOnDemandEnabled() && rootDir) {
+    const dist = getDevDist();
+    if (dist) {
+      const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
+      if (sourcePath && fs12.existsSync(sourcePath)) {
+        await ensureCompiled(sourcePath, rootDir, dist);
       }
     }
-    if (!module) {
-      throw err;
-    }
   }
+  const module = await importWithCacheBust(filePath, isDevOnDemandEnabled());
   const handler = module["WS"];
   if (typeof handler !== "function") {
     throw new Error(`WS export not found in ${filePath}`);
@@ -5955,7 +5992,7 @@ var init_loadPlugins = __esm({
 });
 
 // src/cli/createAppCore.ts
-import fs11 from "fs";
+import fs13 from "fs";
 import path15 from "path";
 import { PassThrough } from "stream";
 function isFaapiConfigKey(key) {
@@ -5965,7 +6002,7 @@ async function createAppBase(options) {
   const rootDir = options?.rootDir ?? process.cwd();
   const dist = options?.dist ?? process.env.FAAPI_DIST ?? DEFAULT_DIST;
   const routesPath = path15.resolve(rootDir, dist, ROUTES_FILE);
-  if (!fs11.existsSync(routesPath)) {
+  if (!fs13.existsSync(routesPath)) {
     throw new Error(
       `[faapi] ${dist}/${ROUTES_FILE} \u4E0D\u5B58\u5728\uFF0C\u8BF7\u5148\u6267\u884C \`faapi build\`\uFF08\u6216 \`faapi dev\`\uFF09\u751F\u6210\u4EA7\u7269\u3002`
     );
@@ -6062,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") {
@@ -6138,6 +6174,10 @@ async function createAppBase(options) {
       if (config?.lifecycle?.onClose) {
         await config.lifecycle.onClose({ rootDir, routes: sorted, server });
       }
+      if (!server.listening) {
+        app.server = null;
+        return;
+      }
       return new Promise((resolve3) => {
         server.close((err) => {
           if (err) console.error("Error closing server:", err);
@@ -6191,7 +6231,8 @@ var init_createAppCore = __esm({
       "helmet",
       "bodyLimit",
       "logger",
-      "http2"
+      "http2",
+      "response"
     ]);
   }
 });
@@ -6287,7 +6328,7 @@ var init_devCommand = __esm({
 
 // src/cli/compileBuildRoutes.ts
 import path17 from "path";
-import fs12 from "fs";
+import fs14 from "fs";
 import fg3 from "fast-glob";
 async function compileBuildRoutes(options) {
   const { rootDir, dist, files, logLevel = "silent" } = options;
@@ -6301,7 +6342,7 @@ async function compileBuildRoutes(options) {
     return { compiledFiles: [] };
   }
   const absDist = path17.resolve(rootDir, dist);
-  await fs12.promises.mkdir(absDist, { recursive: true });
+  await fs14.promises.mkdir(absDist, { recursive: true });
   const plugins = buildAliasPlugins(rootDir);
   const esbuild = await import("esbuild");
   const outbase = path17.resolve(rootDir, APP_DIR3);
@@ -6336,7 +6377,7 @@ __export(buildCommand_exports, {
   buildCommand: () => buildCommand
 });
 import path18 from "path";
-import fs13 from "fs";
+import fs15 from "fs";
 async function buildCommand(options) {
   const rootDir = options?.rootDir ?? process.cwd();
   const outdir = options?.dist ?? DEFAULT_DIST2;
@@ -6399,7 +6440,7 @@ loadEnv(process.cwd());
 const app = await createProdApp(${createProdAppArgs});
 await app.listen();
 `;
-  await fs13.promises.writeFile(mainPath, mainContent, "utf-8");
+  await fs15.promises.writeFile(mainPath, mainContent, "utf-8");
   console.log(`  Written to ${mainPath}`);
   console.log("\nfaapi build completed");
 }