bxo 0.0.5-dev.43 → 0.0.5-dev.45

package/index.ts

@@ -136,7 +136,7 @@ interface BXOOptions {
 // Plugin interface for middleware-style plugins
 interface Plugin {
   name?: string;
-  onRequest?: (ctx: Context) => Promise<void> | void;
+  onRequest?: (ctx: Context) => Promise<Response | void> | Response | void;
   onResponse?: (ctx: Context, response: any) => Promise<any> | any;
   onError?: (ctx: Context, error: Error) => Promise<any> | any;
 }
@@ -153,7 +153,7 @@ export default class BXO {
     onAfterRestart?: (instance: BXO) => Promise<void> | void;
     onBeforeStop?: (instance: BXO) => Promise<void> | void;
     onAfterStop?: (instance: BXO) => Promise<void> | void;
-    onRequest?: (ctx: Context, instance: BXO) => Promise<void> | void;
+    onRequest?: (ctx: Context, instance: BXO) => Promise<Response | void> | Response | void;
     onResponse?: (ctx: Context, response: any, instance: BXO) => Promise<any> | any;
     onError?: (ctx: Context, error: Error, instance: BXO) => Promise<any> | any;
   } = {};
@@ -721,6 +721,84 @@ export default class BXO {
       return new Response('WebSocket upgrade failed', { status: 400 });
     }
 
+    // Handle OPTIONS requests for CORS preflight before route matching
+    if (method === 'OPTIONS') {
+      // Create a minimal context for OPTIONS requests
+      const ctx: Context = {
+        params: {},
+        query: {},
+        body: {},
+        headers: this.parseHeaders(request.headers),
+        cookies: {},
+        path: pathname,
+        request,
+        set: {},
+        status: ((code: number, data?: any) => {
+          ctx.set.status = code;
+          return data;
+        }) as any,
+        redirect: ((location: string, status: number = 302) => {
+          ctx.set.redirect = { location, status };
+          const responseHeaders: Record<string, string> = {
+            Location: location,
+            ...(ctx.set.headers || {})
+          };
+          return new Response(null, {
+            status,
+            headers: responseHeaders
+          });
+        }) as any,
+        clearRedirect: (() => {
+          delete ctx.set.redirect;
+          if (ctx.set.headers) {
+            for (const key of Object.keys(ctx.set.headers)) {
+              if (key.toLowerCase() === 'location') {
+                delete ctx.set.headers[key];
+              }
+            }
+          }
+          if (typeof ctx.set.status === 'number' && ctx.set.status >= 300 && ctx.set.status < 400) {
+            delete ctx.set.status;
+          }
+        }) as any
+      };
+
+      // Run middleware onRequest hooks for OPTIONS requests
+      for (const plugin of this.middleware) {
+        if (plugin.onRequest) {
+          const result = await plugin.onRequest(ctx);
+          // If middleware returns a response, return it immediately
+          if (result instanceof Response) {
+            return result;
+          }
+        }
+      }
+
+      // Run global onRequest hook
+      if (this.hooks.onRequest) {
+        const result = await this.hooks.onRequest(ctx, this);
+        if (result instanceof Response) {
+          return result;
+        }
+      }
+
+      // Run BXO instance onRequest hooks
+      for (const bxoInstance of this.plugins) {
+        if (bxoInstance.hooks.onRequest) {
+          const result = await bxoInstance.hooks.onRequest(ctx, this);
+          if (result instanceof Response) {
+            return result;
+          }
+        }
+      }
+
+      // If no middleware handled the OPTIONS request, return a default response
+      return new Response(null, {
+        status: 204,
+        headers: ctx.set.headers || {}
+      });
+    }
+
     const matchResult = this.matchRoute(method, pathname);
     if (!matchResult) {
       return new Response('Not Found', { status: 404 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bxo",
   "module": "index.ts",
-  "version": "0.0.5-dev.43",
+  "version": "0.0.5-dev.45",
   "description": "A simple and lightweight web framework for Bun",
   "type": "module",
   "exports": {

package/plugins/cors.ts

@@ -60,6 +60,7 @@ export function cors(options: CORSOptions = {}): Plugin {
   return {
     name: 'cors',
     onRequest: async (ctx) => {
+      console.log('onRequest', ctx.request.method);
       // Handle preflight OPTIONS requests
       if (ctx.request.method === 'OPTIONS') {
         const requestOrigin = getRequestOrigin(ctx.request);
@@ -77,6 +78,12 @@ export function cors(options: CORSOptions = {}): Plugin {
         if (credentials) {
           ctx.set.headers['Access-Control-Allow-Credentials'] = 'true';
         }
+
+        // Return a proper Response for OPTIONS requests
+        return new Response(null, {
+          status: 204,
+          headers: ctx.set.headers
+        });
       }
     },
     onResponse: async (ctx, response) => {