@faapi/faapi 6.26.0 → 6.27.0

package/dist/cli/index.js

@@ -7080,18 +7080,10 @@ function formatSetCookie(name, value, options) {
   if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
   return cookie;
 }
-function createContext(request, params, config = {}, ip = "", registries, resourcesDir) {
-  return createContextFromUrl(
-    request,
-    new URL(request.url),
-    params,
-    config,
-    ip,
-    registries,
-    resourcesDir
-  );
+function createContext(request, params, config = {}, ip = "", registries) {
+  return createContextFromUrl(request, new URL(request.url), params, config, ip, registries);
 }
-function createContextFromUrl(request, url, params, config = {}, ip = "", registries, resourcesDir) {
+function createContextFromUrl(request, url, params, config = {}, ip = "", registries) {
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
   const cookiesObj = {};
@@ -7119,9 +7111,6 @@ 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;
@@ -8657,7 +8646,6 @@ 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 {
@@ -8689,14 +8677,7 @@ 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,
-      resourcesDir
-    );
+    const ctx = createContext(request, params, config, getClientIp(req, trustedProxy), registries);
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
@@ -8798,7 +8779,6 @@ var init_handleWsUpgrade = __esm({
     "use strict";
     init_matchRoute();
     init_createContext();
-    init_copyResources();
     init_invokeHandler();
     init_importWithCacheBust();
     init_getClientIp();
@@ -8925,7 +8905,6 @@ 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 : {};
@@ -8972,8 +8951,7 @@ function createServer(options) {
       bodyLimit,
       trustedProxy,
       registries,
-      routesRef.wsCurrent,
-      resourcesDir
+      routesRef.wsCurrent
     ).catch((err) => {
       console.error("[faapi] Request pipeline failed after error response attempt:", err);
       try {
@@ -8999,7 +8977,7 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched, resourcesDir) {
+function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched) {
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
@@ -9008,8 +8986,7 @@ function prepareRequest(req, request, url, config, trustedProxy, registries, pre
     preMatched?.params ?? {},
     config,
     getClientIp(req, trustedProxy),
-    registries,
-    resourcesDir
+    registries
   );
   const meta = ctx.meta;
   return { request, url, ctx, meta, method, urlPath };
@@ -9149,7 +9126,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, resourcesDir) {
+async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries, wsRoutes) {
   let meta = { headers: {}, setCookies: [] };
   let ctx;
   let sseEarlySent = false;
@@ -9169,8 +9146,7 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       config,
       trustedProxy,
       registries,
-      preMatched,
-      resourcesDir
+      preMatched
     );
     ctx = prepared.ctx;
     meta = prepared.meta;
@@ -9239,7 +9215,6 @@ var init_createServer = __esm({
     init_handleWsUpgrade();
     init_serverUtils();
     init_generateSchemaFiles();
-    init_copyResources();
     init_compileOnDemand();
     init_loadMiddlewares();
     DEFAULT_BODY_LIMIT = 10 * 1024 * 1024;
@@ -9419,7 +9394,6 @@ async function runTaskInWorker(options) {
         payload,
         taskCtx: {
           config: safeConfig(taskCtx.config),
-          resourcesDir: taskCtx.resourcesDir,
           job: taskCtx.job
         },
         registries: options.registries,
@@ -9578,7 +9552,6 @@ function createTaskQueue(deps) {
         const taskCtx = {
           signal: job.signal,
           config: deps.config,
-          resourcesDir: deps.resourcesDir,
           job: { id: job.id, name: job.name, attempt: job.attempt },
           registries: registriesView,
           log: createLogger(`task:${job.name}`, {
@@ -10297,7 +10270,6 @@ async function createAppBase(options) {
     config?.plugins,
     {
       rootDir,
-      resourcesDir,
       registries,
       routes: sorted,
       getRoutes: () => sorted,
@@ -10328,8 +10300,7 @@ async function createAppBase(options) {
             routes: sorted,
             server,
             registries,
-            tasks: taskQueue,
-            resourcesDir
+            tasks: taskQueue
           });
           console.log("- onBoot hook executed");
         } catch (err) {
@@ -10364,8 +10335,7 @@ async function createAppBase(options) {
               routes: sorted,
               server,
               registries,
-              tasks: taskQueue,
-              resourcesDir
+              tasks: taskQueue
             });
             console.log("- onReady hook executed");
           }
@@ -10389,8 +10359,7 @@ async function createAppBase(options) {
           routes: sorted,
           server,
           registries,
-          tasks: taskQueue,
-          resourcesDir
+          tasks: taskQueue
         });
       }
       registries.tool.clear();