bxo 0.0.5-dev.17 → 0.0.5-dev.18

package/index.ts

@@ -447,20 +447,50 @@ export default class BXO {
         const formData = await request.formData();
         body = Object.fromEntries(formData.entries());
       } else {
-        body = await request.text();
+        // Try to parse as JSON if it looks like JSON, otherwise treat as text
+        const textBody = await request.text();
+        try {
+          // Check if the text looks like JSON
+          if (textBody.trim().startsWith('{') || textBody.trim().startsWith('[')) {
+            body = JSON.parse(textBody);
+          } else {
+            body = textBody;
+          }
+        } catch {
+          body = textBody;
+        }
       }
     }
 
-    // Create context
-    const ctx: Context = {
-      params: route.config?.params ? this.validateData(route.config.params, params) : params,
-      query: route.config?.query ? this.validateData(route.config.query, query) : query,
-      body: route.config?.body ? this.validateData(route.config.body, body) : body,
-      headers: route.config?.headers ? this.validateData(route.config.headers, headers) : headers,
-      path: pathname,
-      request,
-      set: {}
-    };
+    // Create context with validation
+    let ctx: Context;
+    try {
+      // Validate each part separately to get better error messages
+      const validatedParams = route.config?.params ? this.validateData(route.config.params, params) : params;
+      const validatedQuery = route.config?.query ? this.validateData(route.config.query, query) : query;
+      const validatedBody = route.config?.body ? this.validateData(route.config.body, body) : body;
+      const validatedHeaders = route.config?.headers ? this.validateData(route.config.headers, headers) : headers;
+      
+      ctx = {
+        params: validatedParams,
+        query: validatedQuery,
+        body: validatedBody,
+        headers: validatedHeaders,
+        path: pathname,
+        request,
+        set: {}
+      };
+    } catch (validationError) {
+      // Validation failed - return error response
+      const errorMessage = validationError instanceof Error ? validationError.message : 'Validation failed';
+      return new Response(JSON.stringify({ 
+        error: `Validation error: ${errorMessage}`,
+        details: validationError instanceof Error && 'errors' in validationError ? validationError.errors : undefined
+      }), {
+        status: 400,
+        headers: { 'Content-Type': 'application/json' }
+      });
+    }
 
     try {
       // Run global onRequest hook
@@ -493,6 +523,7 @@ export default class BXO {
       // Validate response against schema if provided
       if (route.config?.response && !(response instanceof Response)) {
         try {
+          console.log('response', response);
           response = this.validateData(route.config.response, response);
         } catch (validationError) {
           // Response validation failed
@@ -629,6 +660,11 @@ export default class BXO {
         }
       });
 
+      // Verify server was created successfully
+      if (!this.server) {
+        throw new Error('Failed to create server instance');
+      }
+
       this.isRunning = true;
       this.serverPort = port;
       this.serverHostname = hostname;
@@ -666,10 +702,22 @@ export default class BXO {
       }
 
       if (this.server) {
-        this.server.stop();
-        this.server = null;
+        try {
+          // Try to stop the server gracefully
+          if (typeof this.server.stop === 'function') {
+            this.server.stop();
+          } else {
+            console.warn('⚠️  Server stop method not available');
+          }
+        } catch (stopError) {
+          console.error('❌ Error calling server.stop():', stopError);
+        }
+        
+        // Clear the server reference
+        this.server = undefined;
       }
 
+      // Reset state regardless of server.stop() success
       this.isRunning = false;
       this.serverPort = undefined;
       this.serverHostname = undefined;
@@ -679,8 +727,15 @@ export default class BXO {
         await this.hooks.onAfterStop(this);
       }
 
+      console.log('✅ Server stopped successfully');
+
     } catch (error) {
       console.error('❌ Error stopping server:', error);
+      // Even if there's an error, reset the state
+      this.isRunning = false;
+      this.server = undefined;
+      this.serverPort = undefined;
+      this.serverHostname = undefined;
       throw error;
     }
   }
@@ -694,7 +749,7 @@ export default class BXO {
 
   // Server status
   isServerRunning(): boolean {
-    return this.isRunning;
+    return this.isRunning && this.server !== undefined;
   }
 
   getServerInfo(): { running: boolean } {

package/package.json

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