@faapi/faapi 6.19.0 → 6.21.0

package/dist/index.js

@@ -1124,8 +1124,16 @@ var init_resolveInjection = __esm({
       // Phase 2.3
       tasks: "tasks",
       // 任务子系统：TaskClient（入队/查询）
-      log: "log"
+      log: "log",
       // 请求级日志器（ctx.log 同一实例：scope http，自动带 requestId 等字段）
+      // raw 系：恒原始输入（无 schema、无校验、管线永不转换），与 query/params/body
+      // 的「校验转换后」口径二分互补
+      rawQuery: "rawQuery",
+      // URLSearchParams（原始查询参数）
+      rawParams: "rawParams",
+      // Record<string, string>（URL 原始路径段）
+      rawBody: "rawBody"
+      // string | undefined（请求体原始文本）
     };
     injectionCache = /* @__PURE__ */ new WeakMap();
   }
@@ -1183,7 +1191,19 @@ var init_analyzeInjection = __esm({
 
 // src/cli/collectRouteSchemaSources.ts
 import path2 from "path";
-function collectRouteSchemaSources(routes, rootDir) {
+import ts6 from "typescript";
+function findExportedTypeName(sourceFile, name) {
+  for (const statement of sourceFile.statements) {
+    const modifiers = ts6.canHaveModifiers(statement) ? ts6.getModifiers(statement) : void 0;
+    const isExported = modifiers?.some((m) => m.kind === ts6.SyntaxKind.ExportKeyword);
+    if (!isExported) continue;
+    if ((ts6.isInterfaceDeclaration(statement) || ts6.isTypeAliasDeclaration(statement)) && statement.name?.text === name) {
+      return true;
+    }
+  }
+  return false;
+}
+function collectRouteSchemaSources(routes, rootDir, wsRoutes) {
   const methodsByFile = /* @__PURE__ */ new Map();
   for (const route of routes) {
     const filePath = rootDir ? path2.resolve(rootDir, route.filePath) : route.filePath;
@@ -1194,9 +1214,17 @@ function collectRouteSchemaSources(routes, rootDir) {
     }
     entry.methods.add(route.method);
   }
-  const programByFile = createPrograms([...methodsByFile.keys()]);
+  const wsFiles = [];
+  for (const wsRoute of wsRoutes ?? []) {
+    wsFiles.push({
+      filePath: rootDir ? path2.resolve(rootDir, wsRoute.filePath) : wsRoute.filePath,
+      urlPath: wsRoute.urlPath
+    });
+  }
+  const allFiles = [.../* @__PURE__ */ new Set([...methodsByFile.keys(), ...wsFiles.map((f) => f.filePath)])];
+  const programByFile = createPrograms(allFiles);
   const resolversByFile = /* @__PURE__ */ new Map();
-  for (const filePath of methodsByFile.keys()) {
+  for (const filePath of allFiles) {
     resolversByFile.set(filePath, createLazyTypeResolver(programByFile.get(filePath), filePath));
   }
   const sources = [];
@@ -1228,6 +1256,50 @@ function collectRouteSchemaSources(routes, rootDir) {
           typeInfo: resolver.resolve(paramsArg.typeName) ?? null
         });
       }
+      if (inputType === "body") {
+        const queryArg = meta.params.find((p) => p.type === "query");
+        if (queryArg?.typeName) {
+          sources.push({
+            urlPath: entry.urlPath,
+            filePath,
+            schemaName: getSchemaName(method, "query"),
+            typeInfo: resolver.resolve(queryArg.typeName) ?? null
+          });
+        }
+      } else if (hasBody(method)) {
+        const bodyArg = meta.params.find((p) => p.type === "body") ?? meta.params.find((p) => p.type === "form");
+        if (bodyArg?.typeName) {
+          sources.push({
+            urlPath: entry.urlPath,
+            filePath,
+            schemaName: getSchemaName(method, "body"),
+            typeInfo: resolver.resolve(bodyArg.typeName) ?? null,
+            coerce: bodyArg.type === "form" || void 0
+          });
+        }
+      }
+    }
+  }
+  for (const wsFile of wsFiles) {
+    const program = programByFile.get(wsFile.filePath);
+    const sourceFile = program?.getSourceFile(wsFile.filePath);
+    if (!sourceFile) continue;
+    const resolver = resolversByFile.get(wsFile.filePath);
+    if (findExportedTypeName(sourceFile, "Query")) {
+      sources.push({
+        urlPath: wsFile.urlPath,
+        filePath: wsFile.filePath,
+        schemaName: getSchemaName("WS", "query"),
+        typeInfo: resolver.resolve("Query") ?? null
+      });
+    }
+    if (findExportedTypeName(sourceFile, "Params")) {
+      sources.push({
+        urlPath: wsFile.urlPath,
+        filePath: wsFile.filePath,
+        schemaName: getSchemaName("WS", "params"),
+        typeInfo: resolver.resolve("Params") ?? null
+      });
     }
   }
   return { sources, resolversByFile };
@@ -1714,9 +1786,9 @@ function generateSchemaFileSource(sources, resolveType, helpersImportPath) {
   lines.push(...schemaBlocks);
   return lines.join("\n").replace(/\n+$/, "\n");
 }
-async function generateSchemaFiles(routes, rootDir, dist) {
-  if (routes.length === 0) return;
-  const { sources, resolversByFile } = collectRouteSchemaSources(routes, rootDir);
+async function generateSchemaFiles(routes, rootDir, dist, wsRoutes) {
+  if (routes.length === 0 && (wsRoutes?.length ?? 0) === 0) return;
+  const { sources, resolversByFile } = collectRouteSchemaSources(routes, rootDir, wsRoutes);
   await generateZodArtifacts(sources, {
     generateFileSource: generateSchemaFileSource,
     resolversByFile,
@@ -3036,8 +3108,8 @@ function resolveExport(module, exportName) {
 import fs4 from "fs";
 import { pathToFileURL as pathToFileURL2 } from "url";
 var loadTs;
-function setLoadTimestamp(ts11) {
-  loadTs = ts11;
+function setLoadTimestamp(ts12) {
+  loadTs = ts12;
 }
 function getVitestImportActual() {
   const vi = globalThis.vi;
@@ -3084,7 +3156,7 @@ import fs8 from "fs";
 import fg2 from "fast-glob";
 
 // src/cli/aliasPlugin.ts
-import ts7 from "typescript";
+import ts8 from "typescript";
 import path8 from "path";
 import fs7 from "fs";
 
@@ -3143,7 +3215,7 @@ function isInsideDir(filePath, dir) {
 }
 
 // src/utils/readTsconfig.ts
-import ts6 from "typescript";
+import ts7 from "typescript";
 import path7 from "path";
 import fs6 from "fs";
 var tsconfigCache = /* @__PURE__ */ new Map();
@@ -3160,9 +3232,9 @@ function readTsconfig(rootDir) {
   if (cached && cached.mtimeMs === mtimeMs) {
     return cached.config;
   }
-  const configFile = ts6.readConfigFile(tsconfigPath, ts6.sys.readFile);
+  const configFile = ts7.readConfigFile(tsconfigPath, ts7.sys.readFile);
   if (configFile.error || !configFile.config) return null;
-  const parsed = ts6.parseJsonConfigFileContent(configFile.config, ts6.sys, rootDir);
+  const parsed = ts7.parseJsonConfigFileContent(configFile.config, ts7.sys, rootDir);
   const baseUrl = parsed.options.baseUrl ?? rootDir;
   const rawPaths = parsed.options.paths;
   const config = rawPaths ? (() => {
@@ -3262,23 +3334,23 @@ function createAliasPlugin(config, options) {
         }
         const importer = args.path;
         const importerOutsideAppDir = appDirAbs ? !isInsideDir(importer, appDirAbs) : false;
-        const sourceFile = ts7.createSourceFile(importer, source, ts7.ScriptTarget.Latest, false);
+        const sourceFile = ts8.createSourceFile(importer, source, ts8.ScriptTarget.Latest, false);
         const literals = [];
         const visit = (node) => {
-          if (ts7.isImportDeclaration(node)) {
+          if (ts8.isImportDeclaration(node)) {
             if (!node.importClause?.isTypeOnly && node.moduleSpecifier) {
-              if (ts7.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
+              if (ts8.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
             }
-          } else if (ts7.isExportDeclaration(node)) {
+          } else if (ts8.isExportDeclaration(node)) {
             if (!node.isTypeOnly && node.moduleSpecifier) {
-              if (ts7.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
+              if (ts8.isStringLiteral(node.moduleSpecifier)) literals.push(node.moduleSpecifier);
             }
-          } else if (ts7.isCallExpression(node) && node.expression.kind === ts7.SyntaxKind.ImportKeyword && node.arguments[0] && ts7.isStringLiteral(node.arguments[0])) {
+          } else if (ts8.isCallExpression(node) && node.expression.kind === ts8.SyntaxKind.ImportKeyword && node.arguments[0] && ts8.isStringLiteral(node.arguments[0])) {
             literals.push(node.arguments[0]);
           }
-          ts7.forEachChild(node, visit);
+          ts8.forEachChild(node, visit);
         };
-        ts7.forEachChild(sourceFile, visit);
+        ts8.forEachChild(sourceFile, visit);
         const replacements = [];
         const unresolvable = [];
         for (const lit of literals) {
@@ -3586,7 +3658,7 @@ function clearGeneratedSchemas() {
   state.generatedSchemas.clear();
   state.inFlightSchemaGenerations.clear();
 }
-async function ensureSchemaGenerated(schemaPath, routeFilePath, routes, rootDir, dist) {
+async function ensureSchemaGenerated(schemaPath, routeFilePath, routes, rootDir, dist, wsRoutes) {
   const inFlight2 = state.inFlightSchemaGenerations.get(schemaPath);
   if (inFlight2) {
     await inFlight2;
@@ -3605,13 +3677,15 @@ async function ensureSchemaGenerated(schemaPath, routeFilePath, routes, rootDir,
     return false;
   }
   const fileRoutes = routes.filter((r) => r.filePath === routeFilePath);
-  if (fileRoutes.length === 0) {
+  const fileWsRoutes = (wsRoutes ?? []).filter((r) => r.filePath === routeFilePath);
+  if (fileRoutes.length === 0 && fileWsRoutes.length === 0) {
     return false;
   }
   const sourceRelPath = path14.relative(rootDir, sourceAbsPath).replace(/\\/g, "/");
   const sourceRoutes = fileRoutes.map((r) => ({ ...r, filePath: sourceRelPath }));
+  const sourceWsRoutes = fileWsRoutes.map((r) => ({ ...r, filePath: sourceRelPath }));
   const generatePromise = (async () => {
-    await generateSchemaFiles(sourceRoutes, rootDir, dist);
+    await generateSchemaFiles(sourceRoutes, rootDir, dist, sourceWsRoutes);
     state.generatedSchemas.add(schemaPath);
   })();
   state.inFlightSchemaGenerations.set(schemaPath, generatePromise);
@@ -3743,17 +3817,17 @@ init_generateZodArtifacts();
 import path15 from "path";
 
 // src/ast/extractToolMetadata.ts
-import ts9 from "typescript";
+import ts10 from "typescript";
 
 // src/ast/jsDocMetadata.ts
-import ts8 from "typescript";
+import ts9 from "typescript";
 function hasExportModifier(node) {
-  if (!ts8.canHaveModifiers(node)) return false;
-  const modifiers = ts8.getModifiers(node);
-  return !!modifiers?.some((m) => m.kind === ts8.SyntaxKind.ExportKeyword);
+  if (!ts9.canHaveModifiers(node)) return false;
+  const modifiers = ts9.getModifiers(node);
+  return !!modifiers?.some((m) => m.kind === ts9.SyntaxKind.ExportKeyword);
 }
 function getJSDocFromNode(node) {
-  const apiDocs = ts8.getJSDocCommentsAndTags(node).filter((entry) => ts8.isJSDoc(entry));
+  const apiDocs = ts9.getJSDocCommentsAndTags(node).filter((entry) => ts9.isJSDoc(entry));
   if (apiDocs.length > 0) return apiDocs[0];
   const directDocs = node.jsDoc;
   if (directDocs && directDocs.length > 0) return directDocs[0];
@@ -3799,18 +3873,18 @@ function extractToolMetadata(program, filePath, functionName, pathMeta) {
 }
 function findExportedFunction(sourceFile, functionName) {
   let result = null;
-  ts9.forEachChild(sourceFile, (node) => {
+  ts10.forEachChild(sourceFile, (node) => {
     if (result) return;
-    if (ts9.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === functionName) {
+    if (ts10.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === functionName) {
       result = { fn: node, jsDocOwner: node };
       return;
     }
-    if (ts9.isVariableStatement(node) && hasExportModifier(node)) {
+    if (ts10.isVariableStatement(node) && hasExportModifier(node)) {
       for (const decl of node.declarationList.declarations) {
         if (result) break;
-        const nameText = ts9.isIdentifier(decl.name) ? decl.name.text : decl.name.getText(sourceFile);
+        const nameText = ts10.isIdentifier(decl.name) ? decl.name.text : decl.name.getText(sourceFile);
         if (nameText !== functionName || !decl.initializer) continue;
-        if (ts9.isArrowFunction(decl.initializer) || ts9.isFunctionExpression(decl.initializer)) {
+        if (ts10.isArrowFunction(decl.initializer) || ts10.isFunctionExpression(decl.initializer)) {
           result = { fn: decl.initializer, jsDocOwner: node };
         }
       }
@@ -3822,7 +3896,7 @@ function getFirstParamTypeName(fn, sourceFile) {
   const firstParam = fn.parameters[0];
   if (!firstParam) return void 0;
   if (!firstParam.type) return void 0;
-  if (!ts9.isTypeReferenceNode(firstParam.type)) return void 0;
+  if (!ts10.isTypeReferenceNode(firstParam.type)) return void 0;
   return firstParam.type.typeName.getText(sourceFile);
 }
 
@@ -4707,17 +4781,24 @@ function encodeSseEvent(event) {
   out += "\n";
   return out;
 }
-function createSseWriter() {
+function createSseWriter(options = {}) {
+  const { onFirstWrite } = options;
   const encoder = new TextEncoder();
   let controller = null;
   let closed = false;
   let aborted = false;
+  let firstWriteTriggered = false;
   let drainWaiters = [];
   const resolveDrainWaiters = () => {
     const waiters = drainWaiters;
     drainWaiters = [];
     for (const resolve of waiters) resolve();
   };
+  const triggerFirstWrite = () => {
+    if (firstWriteTriggered) return;
+    firstWriteTriggered = true;
+    onFirstWrite?.(response);
+  };
   const stream = new ReadableStream(
     {
       start(c) {
@@ -4751,11 +4832,13 @@ function createSseWriter() {
       if (closed || !controller) return;
       const text = encodeSseEvent(event);
       controller.enqueue(encoder.encode(text));
+      triggerFirstWrite();
     },
     sendRaw(chunk) {
       if (closed || !controller) return;
       const bytes = typeof chunk === "string" ? encoder.encode(chunk) : chunk;
       controller.enqueue(bytes);
+      triggerFirstWrite();
     },
     sendError(error) {
       if (closed || !controller) return;
@@ -4763,6 +4846,7 @@ function createSseWriter() {
       const text = encodeSseEvent({ event: "error", data: message });
       try {
         controller.enqueue(encoder.encode(text));
+        triggerFirstWrite();
       } finally {
         writer.close();
       }
@@ -4878,6 +4962,26 @@ function formatErrorResponse(error, config) {
   return jsonOk(body, 500);
 }
 
+// src/utils/queryToObject.ts
+var queryCache = /* @__PURE__ */ new WeakMap();
+function queryToObject(params) {
+  const cached = queryCache.get(params);
+  if (cached) return cached;
+  const result = {};
+  for (const [key, value] of params) {
+    const existing = result[key];
+    if (existing === void 0) {
+      result[key] = value;
+    } else if (Array.isArray(existing)) {
+      existing.push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+  queryCache.set(params, result);
+  return result;
+}
+
 // src/runtime/createContext.ts
 function resolveRequestId(request) {
   const header = request.headers.get("x-request-id");
@@ -4927,7 +5031,11 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
     log,
     request,
     params,
-    query: url.searchParams,
+    rawParams: params,
+    // ctx.query 为对象口径（createContext 挂原始 string 值对象；handler 声明
+    // query 类型时管线校验后替换为转换值）。原始 URLSearchParams 恒在 rawQuery。
+    query: queryToObject(url.searchParams),
+    rawQuery: url.searchParams,
     headers: request.headers,
     method: request.method,
     path: url.pathname,
@@ -4975,13 +5083,19 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
     /**
      * 创建 SSE writer，用于流式推送事件
      *
-     * handler 调用此方法后，通过返回的 writer 推送事件，框架自动把 writer.response
-     * 作为 HTTP 响应（Content-Type: text/event-stream）。
+     * handler 调用此方法后，通过返回的 writer 推送事件。HTTP 服务场景下首次
+     * 写入（send/sendRaw/sendError）即触发 server 层提前接管钩子，把 writer.response
+     * 接入底层连接——流式期间字节即产即达（见 createServer.md「SSE 提前接管」）。
+     * 无钩子场景（app.inject / 测试直调 invokeHandler）回落为 handler 返回后交出。
      *
      * 与 ctx.json / ctx.html 互斥：一个 handler 只能用一种响应方式。
      */
     sse() {
-      const writer = createSseWriter();
+      const writer = createSseWriter({
+        onFirstWrite: (response) => {
+          ctx.__earlyRespond?.(response);
+        }
+      });
       const ctxWithSse = ctx;
       ctxWithSse.__sseResponse = writer.response;
       ctxWithSse.__sseWriter = writer;
@@ -5027,26 +5141,6 @@ function createContextFromUrl(request, url, params, config = {}, ip = "", regist
   return ctx;
 }
 
-// src/utils/queryToObject.ts
-var queryCache = /* @__PURE__ */ new WeakMap();
-function queryToObject(params) {
-  const cached = queryCache.get(params);
-  if (cached) return cached;
-  const result = {};
-  for (const [key, value] of params) {
-    const existing = result[key];
-    if (existing === void 0) {
-      result[key] = value;
-    } else if (Array.isArray(existing)) {
-      existing.push(value);
-    } else {
-      result[key] = [existing, value];
-    }
-  }
-  queryCache.set(params, result);
-  return result;
-}
-
 // src/utils/parseJsonBody.ts
 function parseJsonBody(text) {
   try {
@@ -5092,46 +5186,29 @@ init_inputType();
 async function resolveInputFromUrl(method, request, url) {
   const inputType = getInputTypeForMethod(method);
   if (inputType === "body") {
-    const contentType = request.headers.get("content-type") ?? "";
-    if (contentType.includes("multipart/form-data")) {
-      return parseMultipart(request);
-    }
-    if (contentType.includes("application/x-www-form-urlencoded")) {
-      const text2 = await request.text();
-      if (isBlankText(text2)) return null;
-      const params = new URLSearchParams(text2);
-      const obj = {};
-      for (const [key, value] of params) {
-        obj[key] = value;
-      }
-      return obj;
-    }
-    const text = await request.text();
-    if (isBlankText(text)) {
-      return null;
-    }
-    const result = parseJsonBody(text);
-    if (!result.success) {
-      throw new ValidationError("\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON", [
-        {
-          path: "body",
-          code: "INVALID_FORMAT",
-          expected: "JSON",
-          received: "text",
-          message: "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON"
-        }
-      ]);
-    }
-    return result.data;
+    return parseBodyByContentType(request);
   }
-  return queryToObject(url.searchParams);
-}
-function isBlankText(text) {
-  return text.length === 0 || !/\S/.test(text);
+  return { input: queryToObject(url.searchParams) };
 }
-async function resolveBodyForQueryMethod(request) {
+async function parseBodyByContentType(request) {
+  const contentType = request.headers.get("content-type") ?? "";
+  if (contentType.includes("multipart/form-data")) {
+    return { input: await parseMultipart(request) };
+  }
+  if (contentType.includes("application/x-www-form-urlencoded")) {
+    const text2 = await request.text();
+    if (isBlankText(text2)) return { input: null };
+    const params = new URLSearchParams(text2);
+    const obj = {};
+    for (const [key, value] of params) {
+      obj[key] = value;
+    }
+    return { input: obj, rawBody: text2 };
+  }
   const text = await request.text();
-  if (isBlankText(text)) return void 0;
+  if (isBlankText(text)) {
+    return { input: null };
+  }
   const result = parseJsonBody(text);
   if (!result.success) {
     throw new ValidationError("\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5\u7684 JSON", [
@@ -5144,7 +5221,13 @@ async function resolveBodyForQueryMethod(request) {
       }
     ]);
   }
-  return result.data;
+  return { input: result.data, rawBody: text };
+}
+function isBlankText(text) {
+  return text.length === 0 || !/\S/.test(text);
+}
+async function resolveBodyForQueryMethod(request) {
+  return parseBodyByContentType(request);
 }
 
 // src/response/pendingMeta.ts
@@ -5279,12 +5362,17 @@ function markBuffered(response) {
 init_resolveInjection();
 function getBuiltinInjectionValue(type, ctx, body) {
   switch (type) {
-    case "query": {
-      const validated = ctx.__validatedQuery;
-      return validated ?? queryToObject(ctx.query);
-    }
+    case "query":
+      return ctx.query;
     case "params":
       return ctx.params;
+    // raw 系：恒原始，管线永不覆盖（ctx 字段即注入值）
+    case "rawQuery":
+      return ctx.rawQuery;
+    case "rawParams":
+      return ctx.rawParams;
+    case "rawBody":
+      return ctx.rawBody;
     case "headers":
       return ctx.headers;
     case "context":
@@ -5800,6 +5888,9 @@ function buildErrorResponse(err, config) {
   }
 }
 
+// src/server/handleWsUpgrade.ts
+init_generateSchemaFiles();
+
 // src/middleware/loadMiddlewares.ts
 var middlewareCache = /* @__PURE__ */ new Map();
 var inFlight = /* @__PURE__ */ new Map();
@@ -5998,6 +6089,7 @@ function attachWebSocket(options) {
     server,
     routesRef,
     rootDir,
+    dist,
     config,
     globalMiddlewares,
     trustedProxy = false,
@@ -6032,12 +6124,50 @@ function attachWebSocket(options) {
     const { route, params } = match;
     const headers = nodeHttpToWebHeaders(req);
     const host = req.headers.host ?? "localhost";
-    const url = `http://${host}${req.url ?? "/"}`;
-    const request = new Request(url, { method: "GET", headers });
+    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 meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
+      const schemaPath = getRuntimeSchemaPath(route.filePath, dist, rootDir);
+      if (fs16.existsSync(schemaPath)) {
+        if (isDevOnDemandEnabled()) {
+          const devDist = getDevDist();
+          if (devDist) {
+            await ensureSchemaGenerated(
+              schemaPath,
+              route.filePath,
+              routesRef.current,
+              rootDir,
+              dist,
+              routesRef.wsCurrent
+            );
+          }
+        }
+        const searchParams = fullUrl.searchParams;
+        const rawQueryObject = queryToObject(searchParams);
+        const paramsResult = await validateInput(schemaPath, "WS", "params", params);
+        if (!paramsResult.valid) {
+          throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", paramsResult.issues);
+        }
+        if (paramsResult.data !== params && typeof paramsResult.data === "object" && paramsResult.data !== null) {
+          ctx.params = {
+            ...params,
+            ...paramsResult.data
+          };
+        }
+        const queryResult = await validateInput(schemaPath, "WS", "query", rawQueryObject);
+        if (!queryResult.valid) {
+          throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", queryResult.issues);
+        }
+        if (queryResult.data !== rawQueryObject && typeof queryResult.data === "object" && queryResult.data !== null) {
+          ctx.query = {
+            ...rawQueryObject,
+            ...queryResult.data
+          };
+        }
+      }
       let handlers;
       try {
         const absoluteFilePath = path18.resolve(rootDir, route.filePath);
@@ -6245,7 +6375,8 @@ function createServer(options) {
       globalInjectors,
       bodyLimit,
       trustedProxy,
-      registries
+      registries,
+      routesRef.wsCurrent
     ).catch((err) => {
       console.error("[faapi] Request pipeline failed after error response attempt:", err);
       try {
@@ -6263,6 +6394,7 @@ function createServer(options) {
     server,
     routesRef,
     rootDir,
+    dist,
     config,
     globalMiddlewares,
     trustedProxy,
@@ -6270,14 +6402,13 @@ function createServer(options) {
   });
   return { server, routesRef };
 }
-function prepareRequest(req, config, bodyLimit, trustedProxy, registries, requestSignal) {
-  const { request, url } = toWebRequest(req, bodyLimit, requestSignal);
+function prepareRequest(req, request, url, config, trustedProxy, registries, preMatched) {
   const method = request.method.toUpperCase();
   const urlPath = url.pathname;
   const ctx = createContextFromUrl(
     request,
     url,
-    {},
+    preMatched?.params ?? {},
     config,
     getClientIp(req, trustedProxy),
     registries
@@ -6308,19 +6439,33 @@ function getRoutePaths(route, rootDir, dist) {
 }
 var mergedInjectorsCache = /* @__PURE__ */ new WeakMap();
 function createRoutePipeline(opts) {
-  const { routes, method, urlPath, url, ctx, request, rootDir, dist, globalInjectors } = opts;
+  const {
+    routes,
+    method,
+    urlPath,
+    url,
+    ctx,
+    request,
+    rootDir,
+    dist,
+    globalInjectors,
+    preMatched,
+    wsRoutes
+  } = opts;
   return async () => {
-    const match = resolveRouteOrThrow(routes, method, urlPath);
-    ctx.params = match.params;
+    const match = preMatched ?? resolveRouteOrThrow(routes, method, urlPath);
     const { route } = match;
     const { absFilePath, schemaPath } = getRoutePaths(route, rootDir, dist);
     const routeModule = await loadRouteModule(absFilePath, route.method, rootDir);
-    const input = await resolveInputFromUrl(route.method, request, url);
+    const { input, rawBody } = await resolveInputFromUrl(route.method, request, url);
+    if (rawBody !== void 0) {
+      ctx.rawBody = rawBody;
+    }
     const inputType = getInputTypeForMethod(route.method);
     if (isDevOnDemandEnabled()) {
       const devDist = getDevDist();
       if (devDist) {
-        await ensureSchemaGenerated(schemaPath, route.filePath, routes, rootDir, dist);
+        await ensureSchemaGenerated(schemaPath, route.filePath, routes, rootDir, dist, wsRoutes);
       }
     }
     const result = await validateInput(schemaPath, route.method, inputType, input);
@@ -6328,7 +6473,7 @@ function createRoutePipeline(opts) {
       throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", result.issues);
     }
     if (inputType === "query" && result.data !== input && typeof result.data === "object" && result.data !== null) {
-      ctx.__validatedQuery = {
+      ctx.query = {
         ...input,
         ...result.data
       };
@@ -6343,7 +6488,36 @@ function createRoutePipeline(opts) {
         ...paramsResult.data
       } : match.params;
     }
-    const body = inputType === "query" && hasBody(route.method) ? await resolveBodyForQueryMethod(request) : hasBody(route.method) ? result.data : void 0;
+    if (inputType === "body") {
+      const rawQuery = queryToObject(url.searchParams);
+      const queryResult = await validateInput(schemaPath, route.method, "query", rawQuery);
+      if (!queryResult.valid) {
+        throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", queryResult.issues);
+      }
+      if (queryResult.data !== rawQuery && typeof queryResult.data === "object" && queryResult.data !== null) {
+        ctx.query = {
+          ...rawQuery,
+          ...queryResult.data
+        };
+      }
+    }
+    let body;
+    if (inputType === "query" && hasBody(route.method)) {
+      const parsed = await resolveBodyForQueryMethod(request);
+      if (parsed.rawBody !== void 0) {
+        ctx.rawBody = parsed.rawBody;
+      }
+      const bodyResult = await validateInput(schemaPath, route.method, "body", parsed.input);
+      if (!bodyResult.valid) {
+        throw new ValidationError("\u53C2\u6570\u6821\u9A8C\u5931\u8D25", bodyResult.issues);
+      }
+      body = bodyResult.data;
+    } else if (hasBody(route.method)) {
+      body = result.data;
+    }
+    if (body !== void 0 && body !== null) {
+      ctx.body = body;
+    }
     if (route.middlewares === void 0 && route.injectors === void 0 && route.middlewarePaths) {
       await ensureMiddlewaresCompiled(route.middlewarePaths, rootDir);
       const bundle = await loadMergedMiddlewares(route.middlewarePaths);
@@ -6379,25 +6553,37 @@ async function sendErrorResponse(err, meta, res, onError, ctx) {
     }
   }
 }
-async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares, onError, config, globalInjectors, bodyLimit, trustedProxy, registries) {
+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;
   const abortController = new AbortController();
   res.on("close", () => {
     if (!res.writableEnded) abortController.abort();
   });
   try {
+    const { request, url } = toWebRequest(req, bodyLimit, abortController.signal);
+    const method = request.method.toUpperCase();
+    const urlPath = url.pathname;
+    const preMatched = matchRoute(routes, method, urlPath);
     const prepared = prepareRequest(
       req,
+      request,
+      url,
       config,
-      bodyLimit,
       trustedProxy,
       registries,
-      abortController.signal
+      preMatched
     );
     ctx = prepared.ctx;
     meta = prepared.meta;
-    const { request, url, method, urlPath } = prepared;
+    ctx.__earlyRespond = (response2) => {
+      if (sseEarlySent) return;
+      sseEarlySent = true;
+      void sendNodeResponse(mergeMeta(response2, meta), res).catch(() => {
+        if (!res.writableEnded) res.destroy();
+      });
+    };
     const routePipeline = createRoutePipeline({
       routes,
       method,
@@ -6407,12 +6593,25 @@ async function handleRequest(routes, rootDir, dist, req, res, outerMiddlewares,
       request,
       rootDir,
       dist,
-      globalInjectors
+      globalInjectors,
+      preMatched,
+      wsRoutes
     });
     const response = outerMiddlewares.length > 0 ? await compose(outerMiddlewares, ctx, routePipeline) : await routePipeline();
-    await sendSuccessResponse(response, res);
+    if (!sseEarlySent) {
+      await sendSuccessResponse(response, res);
+    }
   } catch (err) {
     if (res.destroyed || res.writableEnded) return;
+    if (sseEarlySent) {
+      if (onError && ctx) {
+        try {
+          await onError(err, ctx);
+        } catch {
+        }
+      }
+      return;
+    }
     if (err instanceof PayloadTooLargeError) {
       res.setHeader("Connection", "close");
       res.once("finish", () => req.destroy());
@@ -6683,7 +6882,7 @@ import path25 from "path";
 import path23 from "path";
 
 // src/ast/extractAgentMetadata.ts
-import ts10 from "typescript";
+import ts11 from "typescript";
 init_resolveTypeNode();
 function extractAgentMetadata(program, filePath, pathMeta) {
   const sourceFile = program.getSourceFile(filePath);
@@ -6728,23 +6927,23 @@ function extractAgentMetadata(program, filePath, pathMeta) {
 }
 function findConfigExport(sourceFile) {
   let result = null;
-  ts10.forEachChild(sourceFile, (node) => {
+  ts11.forEachChild(sourceFile, (node) => {
     if (result) return;
-    if (ts10.isVariableStatement(node) && hasExportModifier(node)) {
+    if (ts11.isVariableStatement(node) && hasExportModifier(node)) {
       for (const decl of node.declarationList.declarations) {
         if (result) break;
-        const nameText = ts10.isIdentifier(decl.name) ? decl.name.text : "";
+        const nameText = ts11.isIdentifier(decl.name) ? decl.name.text : "";
         if (nameText !== "config" || !decl.initializer) continue;
-        if (ts10.isObjectLiteralExpression(decl.initializer)) {
+        if (ts11.isObjectLiteralExpression(decl.initializer)) {
           result = { jsDocOwner: node, objectLiteral: decl.initializer };
-        } else if (ts10.isArrowFunction(decl.initializer)) {
+        } else if (ts11.isArrowFunction(decl.initializer)) {
           result = { jsDocOwner: node, objectLiteral: getReturnObjectLiteral(decl.initializer) };
         } else {
           result = { jsDocOwner: node, objectLiteral: null };
         }
       }
     }
-    if (ts10.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === "config") {
+    if (ts11.isFunctionDeclaration(node) && hasExportModifier(node) && node.name?.text === "config") {
       const returnObj = getReturnObjectLiteral(node);
       result = { jsDocOwner: node, objectLiteral: returnObj };
     }
@@ -6754,12 +6953,12 @@ function findConfigExport(sourceFile) {
 function getReturnObjectLiteral(fn) {
   const body = fn.body;
   if (!body) return null;
-  if (ts10.isObjectLiteralExpression(body)) {
+  if (ts11.isObjectLiteralExpression(body)) {
     return body;
   }
-  if (ts10.isBlock(body)) {
+  if (ts11.isBlock(body)) {
     for (const stmt of body.statements) {
-      if (ts10.isReturnStatement(stmt) && stmt.expression && ts10.isObjectLiteralExpression(stmt.expression)) {
+      if (ts11.isReturnStatement(stmt) && stmt.expression && ts11.isObjectLiteralExpression(stmt.expression)) {
         return stmt.expression;
       }
     }
@@ -6774,8 +6973,8 @@ function extractConfigFields(objLit, sourceFile) {
   let maxTurns;
   let inputDescription;
   for (const prop of objLit.properties) {
-    if (ts10.isSpreadAssignment(prop)) continue;
-    if (!ts10.isPropertyAssignment(prop)) {
+    if (ts11.isSpreadAssignment(prop)) continue;
+    if (!ts11.isPropertyAssignment(prop)) {
       throw SchemaExtractionError.at(
         prop,
         "config",
@@ -6826,13 +7025,13 @@ function extractConfigFields(objLit, sourceFile) {
   return { systemPrompt, tools, agents, model, maxTurns, inputDescription };
 }
 function getPropertyName(name) {
-  if (ts10.isIdentifier(name)) return name.text;
-  if (ts10.isStringLiteral(name)) return name.text;
+  if (ts11.isIdentifier(name)) return name.text;
+  if (ts11.isStringLiteral(name)) return name.text;
   return null;
 }
 function extractStringValue(expr) {
   if (isStringLikeLiteral(expr)) return expr.text;
-  if (ts10.isBinaryExpression(expr) && expr.operatorToken.kind === ts10.SyntaxKind.PlusToken) {
+  if (ts11.isBinaryExpression(expr) && expr.operatorToken.kind === ts11.SyntaxKind.PlusToken) {
     const left = extractStringValue(expr.left);
     if (left === void 0) return void 0;
     const right = extractStringValue(expr.right);
@@ -6878,17 +7077,17 @@ function requireNumberValue(prop, fieldName, sourceFile) {
   return value;
 }
 function extractNumberValue(expr) {
-  if (ts10.isNumericLiteral(expr)) {
+  if (ts11.isNumericLiteral(expr)) {
     const num = Number(expr.text);
     return Number.isNaN(num) ? void 0 : num;
   }
   return void 0;
 }
 function isStringLikeLiteral(node) {
-  return ts10.isStringLiteral(node) || ts10.isNoSubstitutionTemplateLiteral(node);
+  return ts11.isStringLiteral(node) || ts11.isNoSubstitutionTemplateLiteral(node);
 }
 function extractStringArrayValue(expr) {
-  if (!ts10.isArrayLiteralExpression(expr)) return void 0;
+  if (!ts11.isArrayLiteralExpression(expr)) return void 0;
   const values = [];
   for (const element of expr.elements) {
     const value = extractStringValue(element);
@@ -7865,14 +8064,14 @@ async function createDevApp(options) {
       void (async () => {
         try {
           const { generateSchemaFiles: generateSchemaFiles2 } = await Promise.resolve().then(() => (init_generateSchemaFiles(), generateSchemaFiles_exports));
-          await generateSchemaFiles2(sorted, ctx.rootDir, ctx.dist);
+          await generateSchemaFiles2(sorted, ctx.rootDir, ctx.dist, reScanned.wsRoutes);
         } catch (err) {
           console.error("[faapi] Background schema regeneration failed:", err);
         }
       })();
     } else {
       const { generateSchemaFiles: generateSchemaFiles2 } = await Promise.resolve().then(() => (init_generateSchemaFiles(), generateSchemaFiles_exports));
-      await generateSchemaFiles2(sorted, ctx.rootDir, ctx.dist);
+      await generateSchemaFiles2(sorted, ctx.rootDir, ctx.dist, reScanned.wsRoutes);
     }
     ctx.updateRoutes(sorted, reScanned.wsRoutes);
   };