bxo 0.0.5-dev.30 → 0.0.5-dev.32

package/index.ts

@@ -340,7 +340,7 @@ export default class BXO {
         if (routeSegment === '*' && i === routeSegments.length - 1) {
           // Wildcard at end matches remaining path segments
           const remainingPath = pathSegments.slice(i).join('/');
-          params['*'] = decodeURIComponent(remainingPath);
+          params['*'] = remainingPath;
           break;
         }
 
@@ -351,11 +351,11 @@ export default class BXO {
 
         if (routeSegment.startsWith(':')) {
           const paramName = routeSegment.slice(1);
-          params[paramName] = decodeURIComponent(pathSegment);
+          params[paramName] = pathSegment;
         } else if (routeSegment === '*') {
           // Single segment wildcard
-          params['*'] = decodeURIComponent(pathSegment);
-        } else if (routeSegment !== decodeURIComponent(pathSegment)) {
+          params['*'] = pathSegment;
+        } else if (routeSegment !== pathSegment) {
           isMatch = false;
           break;
         }
@@ -404,7 +404,7 @@ export default class BXO {
         if (routeSegment === '*' && i === routeSegments.length - 1) {
           // Wildcard at end matches remaining path segments
           const remainingPath = pathSegments.slice(i).join('/');
-          params['*'] = decodeURIComponent(remainingPath);
+          params['*'] = remainingPath;
           break;
         }
 
@@ -415,11 +415,11 @@ export default class BXO {
 
         if (routeSegment.startsWith(':')) {
           const paramName = routeSegment.slice(1);
-          params[paramName] = decodeURIComponent(pathSegment);
+          params[paramName] = pathSegment;
         } else if (routeSegment === '*') {
           // Single segment wildcard
-          params['*'] = decodeURIComponent(pathSegment);
-        } else if (routeSegment !== decodeURIComponent(pathSegment)) {
+          params['*'] = pathSegment;
+        } else if (routeSegment !== pathSegment) {
           isMatch = false;
           break;
         }
@@ -510,7 +510,13 @@ export default class BXO {
   private async handleRequest(request: Request, server?: any): Promise<Response | undefined> {
     const url = new URL(request.url);
     const method = request.method;
-    const pathname = url.pathname;
+    const rawPathname = url.pathname;
+    let pathname: string;
+    try {
+      pathname = decodeURI(rawPathname);
+    } catch {
+      pathname = rawPathname;
+    }
 
     // Check for WebSocket upgrade
     if (request.headers.get('upgrade') === 'websocket') {
@@ -636,15 +642,6 @@ 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;
@@ -692,36 +689,7 @@ export default class BXO {
 
       // Convert response to Response object
       if (response instanceof 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 });
+        return response;
       }
 
       // Handle File response (like Elysia)

package/package.json

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