vafast 0.3.4 → 0.3.7

package/dist/index.js

@@ -551,6 +551,23 @@ var Server = class extends BaseServer {
     if (end === -1) end = url.length;
     return url.substring(pathStart, end) || "/";
   }
+  /** 生成 404/405 响应 */
+  createErrorResponse(method, pathname) {
+    const allowedMethods = this.router.getAllowedMethods(pathname);
+    if (allowedMethods.length > 0) {
+      return json(
+        {
+          success: false,
+          error: "Method Not Allowed",
+          message: `Method ${method} not allowed for this endpoint`,
+          allowedMethods
+        },
+        405,
+        { Allow: allowedMethods.join(", ") }
+      );
+    }
+    return json({ success: false, error: "Not Found" }, 404);
+  }
   /** 处理请求 */
   fetch = async (req) => {
     const pathname = this.extractPathname(req.url);
@@ -565,20 +582,31 @@ var Server = class extends BaseServer {
       const handler = composeMiddleware(allMiddleware, match.handler);
       return handler(req);
     }
-    const allowedMethods = this.router.getAllowedMethods(pathname);
-    if (allowedMethods.length > 0) {
-      return json(
-        {
-          success: false,
-          error: "Method Not Allowed",
-          message: `Method ${method} not allowed for this endpoint`,
-          allowedMethods
-        },
-        405,
-        { Allow: allowedMethods.join(", ") }
+    if (method === "OPTIONS") {
+      const allowedMethods = this.router.getAllowedMethods(pathname);
+      if (allowedMethods.length > 0) {
+        const anyMatch = this.router.match(
+          allowedMethods[0],
+          pathname
+        );
+        const routeMiddleware = anyMatch?.middleware || [];
+        const allMiddleware = [...this.globalMiddleware, ...routeMiddleware];
+        const optionsHandler = () => new Response(null, {
+          status: 204,
+          headers: { Allow: allowedMethods.join(", ") }
+        });
+        const handler = composeMiddleware(allMiddleware, optionsHandler);
+        return handler(req);
+      }
+    }
+    if (this.globalMiddleware.length > 0) {
+      const handler = composeMiddleware(
+        this.globalMiddleware,
+        () => this.createErrorResponse(method, pathname)
       );
+      return handler(req);
     }
-    return json({ success: false, error: "Not Found" }, 404);
+    return this.createErrorResponse(method, pathname);
   };
   addRoute(route) {
     const flattenedRoute = {