@faapi/faapi 3.2.1 → 3.3.0

package/dist/testing.js

@@ -266,7 +266,9 @@ function formatSetCookie(name, value, options) {
   return cookie;
 }
 function createContext(request, params, config = {}, ip = "") {
-  const url = new URL(request.url);
+  return createContextFromUrl(request, new URL(request.url), params, config, ip);
+}
+function createContextFromUrl(request, url, params, config = {}, ip = "") {
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
   const cookiesObj = {};
@@ -758,7 +760,7 @@ async function invokeHandler(handler, ctx, body, middlewares, injectors) {
 // src/testServer.ts
 import path11 from "path";
 import os from "os";
-import fs10 from "fs/promises";
+import fs9 from "fs/promises";
 
 // src/router/scanRoutes.ts
 import fg from "fast-glob";
@@ -1105,6 +1107,45 @@ function createProgram(filePath) {
   if (cached) {
     return cached;
   }
+  const program = buildProgram([filePath], findTsConfig(filePath));
+  programCache.set(filePath, program);
+  return program;
+}
+function createPrograms(filePaths) {
+  const unique = [...new Set(filePaths)];
+  const result = /* @__PURE__ */ new Map();
+  const groups = /* @__PURE__ */ new Map();
+  const noTsconfigFiles = [];
+  for (const filePath of unique) {
+    const tsconfigPath = findTsConfig(filePath);
+    if (!tsconfigPath) {
+      noTsconfigFiles.push(filePath);
+      continue;
+    }
+    const group = groups.get(tsconfigPath);
+    if (group) {
+      group.files.push(filePath);
+    } else {
+      groups.set(tsconfigPath, { tsconfigPath, files: [filePath] });
+    }
+  }
+  for (const { tsconfigPath, files } of groups.values()) {
+    const cacheKey = `shared::${tsconfigPath}::${[...files].sort().join("|")}`;
+    let program = programCache.get(cacheKey);
+    if (!program) {
+      program = buildProgram(files, tsconfigPath);
+      programCache.set(cacheKey, program);
+    }
+    for (const filePath of files) {
+      result.set(filePath, program);
+    }
+  }
+  for (const filePath of noTsconfigFiles) {
+    result.set(filePath, createProgram(filePath));
+  }
+  return result;
+}
+function buildProgram(entryFiles, tsconfigPath) {
   const options = {
     strict: true,
     target: ts2.ScriptTarget.ES2022,
@@ -1113,8 +1154,7 @@ function createProgram(filePath) {
     skipLibCheck: true,
     noEmit: true
   };
-  let rootNames = [filePath];
-  const tsconfigPath = findTsConfig(filePath);
+  const rootNames = [...entryFiles];
   if (tsconfigPath) {
     const tsOptions = parseTsConfig(tsconfigPath);
     if (tsOptions.module !== void 0) {
@@ -1124,16 +1164,14 @@ function createProgram(filePath) {
       options.moduleResolution = tsOptions.moduleResolution;
     }
     if (tsOptions.fileNames.length > 0) {
-      if (!tsOptions.fileNames.includes(filePath)) {
-        rootNames = [filePath, ...tsOptions.fileNames];
-      } else {
-        rootNames = tsOptions.fileNames;
+      for (const fileName of tsOptions.fileNames) {
+        if (!rootNames.includes(fileName)) {
+          rootNames.push(fileName);
+        }
       }
     }
   }
-  const program = ts2.createProgram(rootNames, options);
-  programCache.set(filePath, program);
-  return program;
+  return ts2.createProgram(rootNames, options);
 }
 
 // src/ast/extractHandlerTypes.ts
@@ -1912,12 +1950,11 @@ function collectRouteSchemaSources(routes, rootDir) {
     }
     entry.methods.add(route.method);
   }
-  const programByFile = /* @__PURE__ */ new Map();
+  const programByFile = createPrograms([...methodsByFile.keys()]);
   const allTypesByFile = /* @__PURE__ */ new Map();
   const mergedAllTypes = /* @__PURE__ */ new Map();
   for (const filePath of methodsByFile.keys()) {
-    const program = createProgram(filePath);
-    programByFile.set(filePath, program);
+    const program = programByFile.get(filePath);
     const allTypes = extractAllTypes(program, filePath);
     allTypesByFile.set(filePath, allTypes);
     for (const [name, info] of allTypes) {
@@ -2686,7 +2723,10 @@ async function ensureSchemaGenerated(schemaPath, routeFilePath, routes, rootDir,
     state.inFlightSchemaGenerations.delete(schemaPath);
   }
 }
+var sourcePathCache = /* @__PURE__ */ new Map();
 function prodPathToSourcePath(prodAbsPath, rootDir, dist) {
+  const cached = sourcePathCache.get(prodAbsPath);
+  if (cached) return cached;
   const rel = path8.relative(rootDir, prodAbsPath).replace(/\\/g, "/");
   let relWithoutDist = rel;
   if (relWithoutDist.startsWith(`${dist}/`)) {
@@ -2695,8 +2735,14 @@ function prodPathToSourcePath(prodAbsPath, rootDir, dist) {
   const srcRel = `src/${relWithoutDist}`;
   const tsRel = srcRel.replace(/\.js$/, ".ts");
   const tsAbs = path8.resolve(rootDir, tsRel);
-  if (fs7.existsSync(tsAbs)) return tsAbs;
-  return path8.resolve(rootDir, srcRel);
+  let result;
+  if (fs7.existsSync(tsAbs)) {
+    result = tsAbs;
+  } else {
+    result = path8.resolve(rootDir, srcRel);
+  }
+  sourcePathCache.set(prodAbsPath, result);
+  return result;
 }
 function isDevOnDemandEnabled() {
   return state.enabled;
@@ -2802,15 +2848,50 @@ import { Readable as Readable2 } from "stream";
 import path10 from "path";
 
 // src/router/matchRoute.ts
-function matchRoute(routes, method, path12) {
+var httpIndexCache = /* @__PURE__ */ new WeakMap();
+var wsIndexCache = /* @__PURE__ */ new WeakMap();
+function getHttpIndex(routes) {
+  let index = httpIndexCache.get(routes);
+  if (index) return index;
+  index = { static: /* @__PURE__ */ new Map(), methodsByStaticPath: /* @__PURE__ */ new Map(), dynamics: [] };
   for (const route of routes) {
-    if (route.method !== method) {
-      continue;
-    }
-    if (!route.isDynamic) {
-      if (route.urlPath === path12) {
-        return { route, params: {} };
+    if (route.isDynamic) {
+      index.dynamics.push(route);
+    } else {
+      index.static.set(`${route.method}|${route.urlPath}`, route);
+      let methods = index.methodsByStaticPath.get(route.urlPath);
+      if (!methods) {
+        methods = /* @__PURE__ */ new Set();
+        index.methodsByStaticPath.set(route.urlPath, methods);
       }
+      methods.add(route.method);
+    }
+  }
+  httpIndexCache.set(routes, index);
+  return index;
+}
+function getWsIndex(routes) {
+  let index = wsIndexCache.get(routes);
+  if (index) return index;
+  index = { static: /* @__PURE__ */ new Map(), dynamics: [] };
+  for (const route of routes) {
+    if (route.isDynamic) {
+      index.dynamics.push(route);
+    } else {
+      index.static.set(route.urlPath, route);
+    }
+  }
+  wsIndexCache.set(routes, index);
+  return index;
+}
+function matchRoute(routes, method, path12) {
+  const index = getHttpIndex(routes);
+  const staticHit = index.static.get(`${method}|${path12}`);
+  if (staticHit) {
+    return { route: staticHit, params: {} };
+  }
+  for (const route of index.dynamics) {
+    if (route.method !== method) {
       continue;
     }
     const params = matchDynamicPath(route.urlPath, path12, route.paramNames, route.isCatchAll);
@@ -2821,13 +2902,12 @@ function matchRoute(routes, method, path12) {
   return null;
 }
 function matchWsRoute(wsRoutes, path12) {
-  for (const route of wsRoutes) {
-    if (!route.isDynamic) {
-      if (route.urlPath === path12) {
-        return { route, params: {} };
-      }
-      continue;
-    }
+  const index = getWsIndex(wsRoutes);
+  const staticHit = index.static.get(path12);
+  if (staticHit) {
+    return { route: staticHit, params: {} };
+  }
+  for (const route of index.dynamics) {
     const params = matchDynamicPath(route.urlPath, path12, route.paramNames, route.isCatchAll);
     if (params !== null) {
       return { route, params };
@@ -2835,6 +2915,23 @@ function matchWsRoute(wsRoutes, path12) {
   }
   return null;
 }
+function findAllowedMethods(routes, path12) {
+  const index = getHttpIndex(routes);
+  const methods = /* @__PURE__ */ new Set();
+  const staticMethods = index.methodsByStaticPath.get(path12);
+  if (staticMethods) {
+    for (const method of staticMethods) {
+      methods.add(method);
+    }
+  }
+  for (const route of index.dynamics) {
+    const params = matchDynamicPath(route.urlPath, path12, route.paramNames, route.isCatchAll);
+    if (params !== null) {
+      methods.add(route.method);
+    }
+  }
+  return Array.from(methods);
+}
 function matchDynamicPath(pattern, path12, paramNames, isCatchAll) {
   const patternSegments = pattern.split("/").filter(Boolean);
   const pathSegments = path12.split("/").filter(Boolean);
@@ -2882,9 +2979,6 @@ function matchDynamicPath(pattern, path12, paramNames, isCatchAll) {
   return params;
 }
 
-// src/loader/loadRouteModule.ts
-import fs8 from "fs";
-
 // src/loader/resolveExports.ts
 function resolveExport(module, exportName) {
   if (exportName in module && typeof module[exportName] !== "undefined") {
@@ -2915,7 +3009,7 @@ async function loadRouteModule(filePath, method, rootDir) {
     const dist = getDevDist();
     if (dist) {
       const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs8.existsSync(sourcePath)) {
+      if (sourcePath) {
         try {
           await ensureCompiled(sourcePath, rootDir, dist);
         } catch (compileErr) {
@@ -2980,7 +3074,7 @@ async function parseMultipart(request) {
 }
 
 // src/runtime/resolveInput.ts
-async function resolveInput(method, request) {
+async function resolveInputFromUrl(method, request, url) {
   const inputType = getInputTypeForMethod(method);
   if (inputType === "body") {
     const contentType = request.headers.get("content-type") ?? "";
@@ -3015,7 +3109,6 @@ async function resolveInput(method, request) {
     }
     return result.data;
   }
-  const url = new URL(request.url);
   return queryToObject(url.searchParams);
 }
 
@@ -3044,11 +3137,13 @@ async function sendNodeResponse(response, res) {
 }
 
 // src/utils/getClientIp.ts
-function getClientIp(req) {
-  const xff = req.headers["x-forwarded-for"];
-  if (typeof xff === "string" && xff.length > 0) {
-    const first = xff.split(",")[0]?.trim();
-    if (first) return first;
+function getClientIp(req, trustedProxy = false) {
+  if (trustedProxy) {
+    const xff = req.headers["x-forwarded-for"];
+    if (typeof xff === "string" && xff.length > 0) {
+      const first = xff.split(",")[0]?.trim();
+      if (first) return first;
+    }
   }
   const remote = req.socket?.remoteAddress;
   if (remote) {
@@ -3221,7 +3316,7 @@ function logger(options = {}) {
 }
 
 // src/server/handleWsUpgrade.ts
-import fs9 from "fs";
+import fs8 from "fs";
 import { WebSocketServer, WebSocket } from "ws";
 import path9 from "path";
 
@@ -3279,7 +3374,7 @@ async function loadWsHandler(filePath, ctx, rootDir) {
     const dist = getDevDist();
     if (dist) {
       const sourcePath = prodPathToSourcePath(filePath, rootDir, dist);
-      if (sourcePath && fs9.existsSync(sourcePath)) {
+      if (sourcePath && fs8.existsSync(sourcePath)) {
         await ensureCompiled(sourcePath, rootDir, dist);
       }
     }
@@ -3337,7 +3432,7 @@ async function sendResponseToSocket(socket, response) {
   socket.destroy();
 }
 function attachWebSocket(options) {
-  const { server, routesRef, rootDir, config, globalMiddlewares } = options;
+  const { server, routesRef, rootDir, config, globalMiddlewares, trustedProxy = false } = options;
   const wss = new WebSocketServer({ noServer: true });
   server.on("upgrade", async (req, socket, head) => {
     const currentWsRoutes = routesRef.wsCurrent;
@@ -3353,7 +3448,7 @@ function attachWebSocket(options) {
     const host = req.headers.host ?? "localhost";
     const url = `http://${host}${req.url ?? "/"}`;
     const request = new Request(url, { method: "GET", headers });
-    const ctx = createContext(request, params, config, getClientIp(req));
+    const ctx = createContext(request, params, config, getClientIp(req, trustedProxy));
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
@@ -3422,16 +3517,26 @@ function toWebRequest(req, bodyLimit = DEFAULT_BODY_LIMIT) {
   const headers = nodeHttpToWebHeaders(req);
   const method = req.method ?? "GET";
   if (method === "GET" || method === "HEAD") {
-    return new Request(url.toString(), { method, headers });
+    return { request: new Request(url.toString(), { method, headers }), url };
+  }
+  const contentLength = req.headers["content-length"];
+  if (contentLength !== void 0) {
+    const declared = Number(Array.isArray(contentLength) ? contentLength[0] : contentLength);
+    if (Number.isFinite(declared) && declared > bodyLimit) {
+      throw new PayloadTooLargeError(bodyLimit);
+    }
   }
   const stream = Readable2.toWeb(req);
   const limitedStream = limitStreamSize(stream, bodyLimit);
-  return new Request(url.toString(), {
-    method,
-    headers,
-    body: limitedStream,
-    duplex: "half"
-  });
+  return {
+    request: new Request(url.toString(), {
+      method,
+      headers,
+      body: limitedStream,
+      duplex: "half"
+    }),
+    url
+  };
 }
 function limitStreamSize(stream, maxSize) {
   let totalSize = 0;
@@ -3483,22 +3588,6 @@ function limitStreamSize(stream, maxSize) {
     }
   });
 }
-function findAllowedMethods(routes, path12) {
-  const methods = /* @__PURE__ */ new Set();
-  for (const route of routes) {
-    if (route.urlPath === path12) {
-      methods.add(route.method);
-      continue;
-    }
-    if (route.isDynamic) {
-      const params = matchDynamicPath(route.urlPath, path12, route.paramNames, route.isCatchAll);
-      if (params !== null) {
-        methods.add(route.method);
-      }
-    }
-  }
-  return Array.from(methods);
-}
 function createServer(options) {
   const {
     routes,
@@ -3513,7 +3602,8 @@ function createServer(options) {
     helmet: helmetOption,
     logger: loggerOption,
     bodyLimit = DEFAULT_BODY_LIMIT,
-    http2: http2Option
+    http2: http2Option,
+    trustedProxy = false
   } = options;
   const routesRef = { current: routes, wsCurrent: wsRoutes ?? [] };
   const configMiddlewares = [];
@@ -3525,6 +3615,10 @@ function createServer(options) {
   }
   const loggerMiddlewareInst = loggerOption === false ? null : loggerOption === true || loggerOption === void 0 ? logger() : logger(loggerOption);
   if (loggerMiddlewareInst) configMiddlewares.push(loggerMiddlewareInst);
+  const outerMiddlewares = [...configMiddlewares];
+  if (globalMiddlewares && globalMiddlewares.length > 0) {
+    outerMiddlewares.push(...globalMiddlewares);
+  }
   const server = (() => {
     if (http2Option) {
       const h2Opts = typeof http2Option === "object" ? http2Option : {};
@@ -3544,29 +3638,29 @@ function createServer(options) {
       dist,
       req,
       res,
-      configMiddlewares,
+      outerMiddlewares,
       onError,
       config,
-      globalMiddlewares,
       globalInjectors,
-      bodyLimit
+      bodyLimit,
+      trustedProxy
     ).catch(() => {
       res.statusCode = 500;
       res.end();
     });
   });
   if (routesRef.wsCurrent.length > 0) {
-    attachWebSocket({ server, routesRef, rootDir, config, globalMiddlewares });
+    attachWebSocket({ server, routesRef, rootDir, config, globalMiddlewares, trustedProxy });
   }
   return { server, routesRef };
 }
-function prepareRequest(req, config, bodyLimit) {
-  const request = toWebRequest(req, bodyLimit);
+function prepareRequest(req, config, bodyLimit, trustedProxy) {
+  const { request, url } = toWebRequest(req, bodyLimit);
   const method = request.method.toUpperCase();
-  const urlPath = new URL(request.url).pathname;
-  const ctx = createContext(request, {}, config, getClientIp(req));
+  const urlPath = url.pathname;
+  const ctx = createContextFromUrl(request, url, {}, config, getClientIp(req, trustedProxy));
   const meta = ctx.meta;
-  return { request, ctx, meta, method, urlPath };
+  return { request, url, ctx, meta, method, urlPath };
 }
 function resolveRouteOrThrow(routes, method, urlPath) {
   const match = matchRoute(routes, method, urlPath);
@@ -3578,14 +3672,14 @@ function resolveRouteOrThrow(routes, method, urlPath) {
   throw new RouteNotFoundError(urlPath);
 }
 function createRoutePipeline(opts) {
-  const { routes, method, urlPath, ctx, request, rootDir, dist, globalInjectors } = opts;
+  const { routes, method, urlPath, url, ctx, request, rootDir, dist, globalInjectors } = opts;
   return async () => {
     const match = resolveRouteOrThrow(routes, method, urlPath);
     ctx.params = match.params;
     const { route } = match;
     const absoluteFilePath = path10.resolve(rootDir, route.filePath);
     const routeModule = await loadRouteModule(absoluteFilePath, route.method, rootDir);
-    const input = await resolveInput(route.method, request);
+    const input = await resolveInputFromUrl(route.method, request, url);
     const inputType = getInputTypeForMethod(route.method);
     const schemaPath = getRuntimeSchemaPath(route.filePath, dist, rootDir);
     if (isDevOnDemandEnabled()) {
@@ -3617,33 +3711,33 @@ async function sendSuccessResponse(response, res) {
   await sendNodeResponse(response, res);
 }
 async function sendErrorResponse(err, meta, res, onError, ctx) {
-  await sendNodeResponse(mergeMeta(buildErrorResponse(err, ctx.config), meta), res);
-  if (onError) {
+  await sendNodeResponse(mergeMeta(buildErrorResponse(err, ctx?.config), meta), res);
+  if (onError && ctx) {
     try {
       await onError(err, ctx);
     } catch {
     }
   }
 }
-async function handleRequest(routes, rootDir, dist, req, res, configMiddlewares, onError, config, globalMiddlewares, globalInjectors, bodyLimit) {
-  const { request, ctx, meta, method, urlPath } = prepareRequest(req, config, bodyLimit);
-  const routePipeline = createRoutePipeline({
-    routes,
-    method,
-    urlPath,
-    ctx,
-    request,
-    rootDir,
-    dist,
-    globalMiddlewares,
-    globalInjectors
-  });
-  const outerMiddlewares = [];
-  if (configMiddlewares.length > 0) outerMiddlewares.push(...configMiddlewares);
-  if (globalMiddlewares && globalMiddlewares.length > 0) {
-    outerMiddlewares.push(...globalMiddlewares);
-  }
+async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy) {
+  let meta = { headers: {}, setCookies: [] };
+  let ctx;
   try {
+    const prepared = prepareRequest(req, config, bodyLimit, trustedProxy);
+    ctx = prepared.ctx;
+    meta = prepared.meta;
+    const { request, url, method, urlPath } = prepared;
+    const routePipeline = createRoutePipeline({
+      routes,
+      method,
+      urlPath,
+      url,
+      ctx,
+      request,
+      rootDir,
+      dist,
+      globalInjectors
+    });
     const response = outerMiddlewares.length > 0 ? await compose(outerMiddlewares, ctx, routePipeline) : await routePipeline();
     await sendSuccessResponse(response, res);
   } catch (err) {
@@ -3670,7 +3764,7 @@ async function createTestServer(options) {
   } = options;
   const { routes, wsRoutes } = await scanRoutes(rootDir, patterns);
   const sorted = sortRoutes(routes);
-  const schemaDist = dist ? path11.isAbsolute(dist) ? dist : path11.resolve(rootDir, dist) : await fs10.mkdtemp(path11.join(os.tmpdir(), "faapi-test-schema-"));
+  const schemaDist = dist ? path11.isAbsolute(dist) ? dist : path11.resolve(rootDir, dist) : await fs9.mkdtemp(path11.join(os.tmpdir(), "faapi-test-schema-"));
   await generateSchemaFiles(sorted, rootDir, schemaDist);
   const { server } = createServer({
     routes: sorted,
@@ -3703,7 +3797,7 @@ async function createTestServer(options) {
       await new Promise((resolve) => {
         server.close(() => resolve());
       });
-      await fs10.rm(schemaDist, { recursive: true, force: true }).catch(() => {
+      await fs9.rm(schemaDist, { recursive: true, force: true }).catch(() => {
       });
       invalidateSchemaCache();
     }