@faapi/faapi 6.22.0 → 6.23.0

package/dist/{routeTypes-CXWkRx4W.d.ts → routeTypes-CJV5M90s.d.ts}

@@ -1025,6 +1025,14 @@ interface FaapiContext {
     cookies: Record<string, string>;
     /** 配置文件中的自定义业务配置（类型可通过 declare module '@faapi/faapi' 增强 FaapiContextConfig） */
     config: FaapiContextConfig;
+    /**
+     * 运行时资源根目录绝对路径（<rootDir>/<dist>/resources）
+     *
+     * `src/resources/` 经 dev/build 复制进产物后的位置，handler 读静态文件用：
+     * `await fs.readFile(path.join(ctx.resourcesDir, 'prompts/foo.md'))`。
+     * HTTP/WS 请求链路恒有值；testing 直调（createTestContext）未传时为 undefined。
+     */
+    resourcesDir?: string;
     /**
      * 设置响应状态码
      */

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-CXWkRx4W.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-CJV5M90s.js';
 import { Server } from 'node:http';
 import { WebSocket } from 'ws';
 
@@ -25,6 +25,8 @@ declare function createTestContext(options: CreateTestContextOptions): FaapiCont
 interface CreateTestContextOptions {
     /** app 级注册表（测试 handler 声明 agent/agents 参数时注入用，可选） */
     registries?: FaapiContext['registries'];
+    /** 运行时资源根目录（测试 handler 读 ctx.resourcesDir 时传入，可选） */
+    resourcesDir?: string;
     /** 请求方法，默认 'GET' */
     method?: string;
     /** 请求路径，必填，如 '/api/user'（无需写 host） */

package/dist/testing.js

@@ -312,14 +312,14 @@ var ValidationError = class extends FaapiError {
   issues;
 };
 var RouteNotFoundError = class extends FaapiError {
-  constructor(path16) {
-    super("ROUTE_NOT_FOUND", `Route not found: ${path16}`, 404);
+  constructor(path17) {
+    super("ROUTE_NOT_FOUND", `Route not found: ${path17}`, 404);
     this.name = "RouteNotFoundError";
   }
 };
 var MethodNotAllowedError = class extends FaapiError {
-  constructor(method, path16, allowedMethods) {
-    super("METHOD_NOT_ALLOWED", `Method ${method} not allowed for ${path16}`, 405);
+  constructor(method, path17, allowedMethods) {
+    super("METHOD_NOT_ALLOWED", `Method ${method} not allowed for ${path17}`, 405);
     this.allowedMethods = allowedMethods;
     this.name = "MethodNotAllowedError";
   }
@@ -584,10 +584,18 @@ function formatSetCookie(name, value, options) {
   if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
   return cookie;
 }
-function createContext(request, params, config = {}, ip = "", registries) {
-  return createContextFromUrl(request, new URL(request.url), params, config, ip, registries);
+function createContext(request, params, config = {}, ip = "", registries, resourcesDir) {
+  return createContextFromUrl(
+    request,
+    new URL(request.url),
+    params,
+    config,
+    ip,
+    registries,
+    resourcesDir
+  );
 }
-function createContextFromUrl(request, url, params, config = {}, ip = "", registries) {
+function createContextFromUrl(request, url, params, config = {}, ip = "", registries, resourcesDir) {
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
   const cookiesObj = {};
@@ -615,6 +623,9 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
     ua: request.headers.get("user-agent") ?? "",
     cookies: cookiesObj,
     config,
+    // 运行时资源根目录（HTTP/WS 链路由 createServer/handleWsUpgrade 传入；
+    // testing 直调未传时为 undefined，见 contextTypes.resourcesDir 注释）
+    resourcesDir,
     meta,
     setStatus(status) {
       meta.status = status;
@@ -720,15 +731,16 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
 function createTestContext(options) {
   const {
     method = "GET",
-    path: path16,
+    path: path17,
     query,
     headers,
     params = {},
     config = {},
     ip = "",
-    registries
+    registries,
+    resourcesDir
   } = options;
-  const url = new URL(`http://localhost${path16}`);
+  const url = new URL(`http://localhost${path17}`);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (Array.isArray(value)) {
@@ -744,7 +756,7 @@ function createTestContext(options) {
     method,
     headers
   });
-  return createContext(request, params, config, ip, registries);
+  return createContext(request, params, config, ip, registries, resourcesDir);
 }
 
 // src/response/pendingMeta.ts
@@ -1327,9 +1339,9 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
 }
 
 // src/testServer.ts
-import path15 from "path";
+import path16 from "path";
 import os from "os";
-import fs12 from "fs/promises";
+import fs13 from "fs/promises";
 
 // src/router/scanRoutes.ts
 import fg from "fast-glob";
@@ -1341,9 +1353,9 @@ var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"];
 var HTTP_METHOD_SET = new Set(HTTP_METHODS);
 
 // src/utils/normalizePath.ts
-function normalizePath(path16) {
-  if (!path16) return "";
-  let result = path16.replace(/\\/g, "/");
+function normalizePath(path17) {
+  if (!path17) return "";
+  let result = path17.replace(/\\/g, "/");
   result = result.replace(/\/+/g, "/");
   result = result.replace(/\/+$/, "");
   if (result && !result.startsWith("/")) {
@@ -3511,13 +3523,14 @@ function buildAliasPlugins(rootDir) {
 }
 
 // src/cli/compileSourceFiles.ts
+var SOURCE_IGNORE = ["**/*.test.ts", "**/*.e2e.test.ts", "**/*.d.ts", `${APP_DIR}/resources/**`];
 async function compileSourceFiles(options) {
   const { rootDir, dist, files, logLevel = "silent", production, atomicWrite } = options;
   const entryPoints = files ?? await fg2([`${APP_DIR}/**/*.ts`], {
     cwd: rootDir,
     onlyFiles: true,
     absolute: true,
-    ignore: ["**/*.test.ts", "**/*.e2e.test.ts", "**/*.d.ts"]
+    ignore: SOURCE_IGNORE
   });
   if (entryPoints.length === 0) {
     return { compiledFiles: [] };
@@ -3821,9 +3834,9 @@ async function validateInput(schemaPath, method, inputType, input) {
 function mapZodIssues(error) {
   return error.issues.map((issue) => {
     const code = mapZodCode(issue);
-    const path16 = issue.path.map(String).join(".") || "";
+    const path17 = issue.path.map(String).join(".") || "";
     return {
-      path: path16,
+      path: path17,
       code,
       expected: issue.expected ?? mapExpectedFromMessage(issue.message),
       received: issue.received ?? mapReceivedFromMessage(issue.message),
@@ -3873,7 +3886,7 @@ import {
 import { createSecureServer as createHttp2SecureServer } from "http2";
 import { readFileSync } from "fs";
 import { Readable as Readable2 } from "stream";
-import path14 from "path";
+import path15 from "path";
 
 // src/router/matchRoute.ts
 var httpIndexCache = /* @__PURE__ */ new WeakMap();
@@ -3915,25 +3928,25 @@ function getWsIndex(routes) {
   wsIndexCache.set(routes, index);
   return index;
 }
-function matchRoute(routes, method, path16) {
+function matchRoute(routes, method, path17) {
   const index = getHttpIndex(routes);
   const upper = method.toUpperCase();
-  const hit = matchByMethod(index, upper, path16);
+  const hit = matchByMethod(index, upper, path17);
   if (hit) return hit;
   if (upper === "HEAD") {
-    return matchByMethod(index, "GET", path16);
+    return matchByMethod(index, "GET", path17);
   }
   return null;
 }
-function matchByMethod(index, method, path16) {
-  const staticHit = index.static.get(`${method}|${path16}`);
+function matchByMethod(index, method, path17) {
+  const staticHit = index.static.get(`${method}|${path17}`);
   if (staticHit) {
     return { route: staticHit, params: {} };
   }
   if (index.dynamics.length === 0) {
     return null;
   }
-  const pathSegments = path16.split("/").filter(Boolean);
+  const pathSegments = path17.split("/").filter(Boolean);
   for (const entry of index.dynamics) {
     const route = entry.route;
     if (route.method !== method) {
@@ -3946,31 +3959,31 @@ function matchByMethod(index, method, path16) {
   }
   return null;
 }
-function matchWsRoute(wsRoutes, path16) {
+function matchWsRoute(wsRoutes, path17) {
   const index = getWsIndex(wsRoutes);
-  const staticHit = index.static.get(path16);
+  const staticHit = index.static.get(path17);
   if (staticHit) {
     return { route: staticHit, params: {} };
   }
   for (const route of index.dynamics) {
-    const params = matchDynamicPath(route.urlPath, path16, route.paramNames, route.isCatchAll);
+    const params = matchDynamicPath(route.urlPath, path17, route.paramNames, route.isCatchAll);
     if (params !== null) {
       return { route, params };
     }
   }
   return null;
 }
-function findAllowedMethods(routes, path16) {
+function findAllowedMethods(routes, path17) {
   const index = getHttpIndex(routes);
   const methods = /* @__PURE__ */ new Set();
-  const staticMethods = index.methodsByStaticPath.get(path16);
+  const staticMethods = index.methodsByStaticPath.get(path17);
   if (staticMethods) {
     for (const method of staticMethods) {
       methods.add(method);
     }
   }
   if (index.dynamics.length > 0) {
-    const pathSegments = path16.split("/").filter(Boolean);
+    const pathSegments = path17.split("/").filter(Boolean);
     for (const entry of index.dynamics) {
       const params = matchSegments(
         entry.segments,
@@ -3988,10 +4001,10 @@ function findAllowedMethods(routes, path16) {
   }
   return Array.from(methods);
 }
-function matchDynamicPath(pattern, path16, paramNames, isCatchAll) {
+function matchDynamicPath(pattern, path17, paramNames, isCatchAll) {
   return matchSegments(
     pattern.split("/").filter(Boolean),
-    path16.split("/").filter(Boolean),
+    path17.split("/").filter(Boolean),
     paramNames,
     isCatchAll
   );
@@ -4613,9 +4626,17 @@ function logger(options = {}) {
 }
 
 // src/server/handleWsUpgrade.ts
-import fs11 from "fs";
+import fs12 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
+import path14 from "path";
+
+// src/cli/copyResources.ts
 import path13 from "path";
+import fs11 from "fs";
+var RESOURCES_OUTPUT_DIR = "resources";
+function resolveResourcesDir(rootDir, dist) {
+  return path13.resolve(rootDir, dist, RESOURCES_OUTPUT_DIR);
+}
 
 // src/server/serverUtils.ts
 function nodeHttpToWebHeaders(req) {
@@ -4673,7 +4694,7 @@ async function loadWsHandler(filePath, ctx, rootDir) {
     const dist = getDevDist();
     if (dist) {
       const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs11.existsSync(sourcePath)) {
+      if (sourcePath && fs12.existsSync(sourcePath)) {
         await ensureCompiled(sourcePath, rootDir, dist);
       }
     }
@@ -4771,6 +4792,7 @@ function attachWebSocket(options) {
     trustedProxy = false,
     registries
   } = options;
+  const resourcesDir = resolveResourcesDir(rootDir, dist);
   const wss = new WebSocketServer({ noServer: true });
   server.on("upgrade", async (req, socket, head) => {
     try {
@@ -4802,12 +4824,19 @@ function attachWebSocket(options) {
     const host = req.headers.host ?? "localhost";
     const fullUrl = new URL(`http://${host}${req.url ?? "/"}`);
     const request = new Request(fullUrl.toString(), { method: "GET", headers });
-    const ctx = createContext(request, params, config, getClientIp(req, trustedProxy), registries);
+    const ctx = createContext(
+      request,
+      params,
+      config,
+      getClientIp(req, trustedProxy),
+      registries,
+      resourcesDir
+    );
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
       const schemaPath = getRuntimeSchemaPath(route.filePath, dist, rootDir);
-      if (fs11.existsSync(schemaPath)) {
+      if (fs12.existsSync(schemaPath)) {
         if (isDevOnDemandEnabled()) {
           const devDist = getDevDist();
           if (devDist) {
@@ -4846,7 +4875,7 @@ function attachWebSocket(options) {
       }
       let handlers;
       try {
-        const absoluteFilePath = path13.resolve(rootDir, route.filePath);
+        const absoluteFilePath = path14.resolve(rootDir, route.filePath);
         handlers = await loadWsHandler(absoluteFilePath, ctx, rootDir);
       } catch (err) {
         const reason = err instanceof Error ? err.message : String(err);
@@ -5005,6 +5034,7 @@ function createServer(options) {
     trustedProxy = false
   } = options;
   const routesRef = { current: routes, wsCurrent: wsRoutes ?? [] };
+  const resourcesDir = resolveResourcesDir(rootDir, dist);
   const configMiddlewares = [];
   if (compressionOption) {
     const compOpts = typeof compressionOption === "object" ? compressionOption : {};
@@ -5051,7 +5081,8 @@ function createServer(options) {
       bodyLimit,
       trustedProxy,
       registries,
-      routesRef.wsCurrent
+      routesRef.wsCurrent,
+      resourcesDir
     ).catch((err) => {
       console.error("[faapi] Request pipeline failed after error response attempt:", err);
       try {
@@ -5077,7 +5108,7 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched) {
+function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched, resourcesDir) {
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
@@ -5086,7 +5117,8 @@ function prepareRequest(req, request, url, config, trustedProxy, registries, pre
     preMatched?.params ?? {},
     config,
     getClientIp(req, trustedProxy),
-    registries
+    registries,
+    resourcesDir
   );
   const meta = ctx.meta;
   return { request, url, ctx, meta, method, urlPath };
@@ -5105,7 +5137,7 @@ function getRoutePaths(route, rootDir, dist) {
   let cached = routePathCache.get(route);
   if (!cached) {
     cached = {
-      absFilePath: path14.resolve(rootDir, route.filePath),
+      absFilePath: path15.resolve(rootDir, route.filePath),
       schemaPath: getRuntimeSchemaPath(route.filePath, dist, rootDir)
     };
     routePathCache.set(route, cached);
@@ -5228,7 +5260,7 @@ async function sendErrorResponse(err, meta, res, onError, ctx) {
     }
   }
 }
-async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes) {
+async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes, resourcesDir) {
   let meta = { headers: {}, setCookies: [] };
   let ctx;
   let sseEarlySent = false;
@@ -5248,7 +5280,8 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       config,
       trustedProxy,
       registries,
-      preMatched
+      preMatched,
+      resourcesDir
     );
     ctx = prepared.ctx;
     meta = prepared.meta;
@@ -5313,7 +5346,7 @@ async function createTestServer(options) {
   } = options;
   const { routes, wsRoutes } = await scanRoutes(rootDir, patterns);
   const sorted = sortRoutes(routes);
-  const schemaDist = dist ? path15.isAbsolute(dist) ? dist : path15.resolve(rootDir, dist) : await fs12.mkdtemp(path15.join(os.tmpdir(), "faapi-test-schema-"));
+  const schemaDist = dist ? path16.isAbsolute(dist) ? dist : path16.resolve(rootDir, dist) : await fs13.mkdtemp(path16.join(os.tmpdir(), "faapi-test-schema-"));
   await generateSchemaFiles(sorted, rootDir, schemaDist);
   const { server } = createServer({
     routes: sorted,
@@ -5345,7 +5378,7 @@ async function createTestServer(options) {
       await new Promise((resolve) => {
         server.close(() => resolve());
       });
-      await fs12.rm(schemaDist, { recursive: true, force: true }).catch(() => {
+      await fs13.rm(schemaDist, { recursive: true, force: true }).catch(() => {
       });
       invalidateSchemaCache();
     }