bxo 0.0.5-dev.46 → 0.0.5-dev.48

package/example.ts

@@ -1,12 +1,39 @@
-import BXO from ".";
-import { cors } from "./plugins";
+import BXO from './index';
+import { cors } from './plugins/cors';
 
 const app = new BXO();
 
-app.use(cors());
+// Use CORS plugin
+app.use(cors({
+    origin: ['http://localhost:3000', 'http://localhost:3001'],
+    credentials: true,
+    methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
+    allowedHeaders: ['Content-Type', 'Authorization', 'X-Custom-Header']
+}));
 
-app.get('/', (ctx) => {
-    return { message: 'Hello, world!' };
+// Test route that returns a Response object
+app.get('/test-response', () => {
+    return new Response(JSON.stringify({ message: 'Hello from Response object' }), {
+        status: 200,
+        headers: {
+            'Content-Type': 'application/json',
+            'X-Custom-Response-Header': 'test-value'
+        }
+    });
+});
+
+// Test route that returns plain data
+app.get('/test-data', () => {
+    return { message: 'Hello from plain data' };
+});
+
+// Test route that sets custom headers via ctx.set
+app.get('/test-headers', (ctx) => {
+    ctx.set.headers = {
+        'X-Custom-Header': 'set-via-context',
+        'Cache-Control': 'no-cache'
+    };
+    return { message: 'Headers set via context' };
 });
 
 app.get("/api/actions/nodula.auth.login", (ctx) => {
@@ -15,6 +42,17 @@ app.get("/api/actions/nodula.auth.login", (ctx) => {
 
 app.post("/api/actions/nodula.auth.login", (ctx) => {
     return { message: 'Hello, world!' };
-});
+})
+// Note: OPTIONS requests are handled automatically by the CORS plugin
 
-app.listen(3000);
+// Start the server
+app.start(3000, 'localhost').then(() => {
+    console.log('🚀 Server started at http://localhost:3000');
+    console.log('📋 Test endpoints:');
+    console.log('  GET  /test-response  - Returns Response object');
+    console.log('  GET  /test-data      - Returns plain data');
+    console.log('  GET  /test-headers   - Sets headers via ctx.set');
+    console.log('  OPTIONS /*           - Handled automatically by CORS plugin');
+    console.log('\n🔍 Check CORS headers in browser dev tools or curl:');
+    console.log('  curl -H "Origin: http://localhost:3001" -H "Access-Control-Request-Method: GET" -X OPTIONS http://localhost:3000/test-response');
+});

package/index.ts

@@ -1055,6 +1055,47 @@ export default class BXO {
 
       // Convert response to Response object
       if (response instanceof Response) {
+        // If there are headers set via ctx.set.headers, merge them with the Response headers
+        if (ctx.set.headers && Object.keys(ctx.set.headers).length > 0) {
+          const newHeaders = new Headers(response.headers);
+          
+          // Add headers from ctx.set.headers
+          Object.entries(ctx.set.headers).forEach(([key, value]) => {
+            newHeaders.set(key, value);
+          });
+          
+          // Handle cookies if any are set
+          if (ctx.set.cookies && ctx.set.cookies.length > 0) {
+            const cookieHeaders = ctx.set.cookies.map(cookie => {
+              let cookieString = `${encodeURIComponent(cookie.name)}=${encodeURIComponent(cookie.value)}`;
+              if (cookie.domain) cookieString += `; Domain=${cookie.domain}`;
+              if (cookie.path) cookieString += `; Path=${cookie.path}`;
+              if (cookie.expires) cookieString += `; Expires=${cookie.expires.toUTCString()}`;
+              if (cookie.maxAge) cookieString += `; Max-Age=${cookie.maxAge}`;
+              if (cookie.secure) cookieString += `; Secure`;
+              if (cookie.httpOnly) cookieString += `; HttpOnly`;
+              if (cookie.sameSite) cookieString += `; SameSite=${cookie.sameSite}`;
+              return cookieString;
+            });
+            
+            // Add Set-Cookie headers
+            cookieHeaders.forEach((cookieHeader, index) => {
+              if (index === 0) {
+                newHeaders.set('Set-Cookie', cookieHeader);
+              } else {
+                newHeaders.set(`Set-Cookie-${index}`, cookieHeader);
+              }
+            });
+          }
+          
+          // Create new Response with merged headers
+          return new Response(response.body, {
+            status: ctx.set.status || response.status,
+            statusText: response.statusText,
+            headers: newHeaders
+          });
+        }
+        
         return response;
       }
 

package/package.json

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

package/plugins/cors.ts

@@ -78,8 +78,6 @@ export function cors(options: CORSOptions = {}): Plugin {
           ctx.set.headers['Access-Control-Allow-Credentials'] = 'true';
         }
 
-        console.log('ctx.set.headers', ctx.set.headers);
-
         // Return a proper Response for OPTIONS requests
         return new Response(null, {
           status: 204,
@@ -87,29 +85,23 @@ export function cors(options: CORSOptions = {}): Plugin {
         });
       }
     },
-    onResponse: async (ctx, response) => {
+    onResponse: async (ctx) => {
       // Handle CORS headers for actual requests
       const requestOrigin = getRequestOrigin(ctx.request);
       const allowedOrigin = validateOrigin(requestOrigin, origin);
 
-      // Clone the response to modify headers
-      const newResponse = new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers: new Headers(response.headers)
-      });
-
-      // Set CORS headers
-      newResponse.headers.set('Access-Control-Allow-Origin', allowedOrigin || '*');
-      newResponse.headers.set('Access-Control-Allow-Methods', methods.join(', '));
-      newResponse.headers.set('Access-Control-Allow-Headers', allowedHeaders.join(', '));
-      newResponse.headers.set('Access-Control-Max-Age', maxAge.toString());
+      // Set CORS headers for all responses
+      ctx.set.headers = {
+        ...ctx.set.headers,
+        'Access-Control-Allow-Origin': allowedOrigin || '*',
+        'Access-Control-Allow-Methods': methods.join(', '),
+        'Access-Control-Allow-Headers': allowedHeaders.join(', '),
+        'Access-Control-Max-Age': maxAge.toString()
+      };
 
       if (credentials) {
-        newResponse.headers.set('Access-Control-Allow-Credentials', 'true');
+        ctx.set.headers['Access-Control-Allow-Credentials'] = 'true';
       }
-
-      return newResponse;
     }
   };
 }