bxo 0.0.5-dev.29 → 0.0.5-dev.30

package/index.ts

@@ -636,6 +636,15 @@ export default class BXO {
       // Execute route handler
       let response = await route.handler(ctx);
 
+      // If handler returned a Response, expose its status and headers to hooks
+      if (response instanceof Response) {
+        if (ctx.set.status === undefined) {
+          ctx.set.status = response.status;
+        }
+        const existingHeaders = Object.fromEntries(response.headers);
+        ctx.set.headers = { ...(existingHeaders || {}), ...(ctx.set.headers || {}) };
+      }
+
       // Run global onResponse hook
       if (this.hooks.onResponse) {
         response = await this.hooks.onResponse(ctx, response, this) || response;
@@ -683,7 +692,36 @@ export default class BXO {
 
       // Convert response to Response object
       if (response instanceof Response) {
-        return response;
+        // Merge existing response headers with any set via hooks
+        let responseHeaders: Record<string, string> = {
+          ...Object.fromEntries(response.headers),
+          ...(ctx.set.headers || {})
+        };
+
+        // 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) => {
+            responseHeaders[index === 0 ? 'Set-Cookie' : `Set-Cookie-${index}`] = cookieHeader;
+          });
+        }
+
+        const mergedStatus = ctx.set.status || response.status || 200;
+        return new Response(response.body, { status: mergedStatus, headers: responseHeaders });
       }
 
       // Handle File response (like Elysia)

package/package.json

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