Dev : Error handler updated

Author: Jones-peter

jsweb/app.py

@@ -1,7 +1,7 @@
 import secrets
 import os
 import asyncio
-from .routing import Router
+from .routing import Router, NotFound, MethodNotAllowed
 from .request import Request
 from .response import Response, HTMLResponse, configure_template_env
 from .auth import init_auth, get_current_user
@@ -79,9 +79,9 @@ def decorator(func):
 
     async def _asgi_app_handler(self, scope, receive, send):
         req = scope['jsweb.request']
-
-        handler, params = self.router.resolve(req.path, req.method)
-        if handler:
+        try:
+            handler, params = self.router.resolve(req.path, req.method)
+            
             # Support both sync and async handlers
             if asyncio.iscoroutinefunction(handler):
                 response = await handler(req, **params)
@@ -94,14 +94,16 @@ async def _asgi_app_handler(self, scope, receive, send):
             if not isinstance(response, Response):
                 raise TypeError(f"View function did not return a Response object (got {type(response).__name__})")
 
-            if hasattr(req, 'new_csrf_token_generated') and req.new_csrf_token_generated:
-                response.set_cookie("csrf_token", req.csrf_token, httponly=False, samesite='Lax')
+        except NotFound:
+            response = HTMLResponse("<h1>404 Not Found</h1>", status_code=404)
+        except MethodNotAllowed:
+            response = HTMLResponse("<h1>405 Method Not Allowed</h1>", status_code=405)
+        except Exception as e:
+            response = HTMLResponse(f"<h1>500 Internal Server Error</h1><p>{e}</p>", status_code=500)
 
-            await response(scope, receive, send)
-            return
+        if hasattr(req, 'new_csrf_token_generated') and req.new_csrf_token_generated:
+            response.set_cookie("csrf_token", req.csrf_token, httponly=False, samesite='Lax')
 
-        # 404 Not Found
-        response = HTMLResponse("<h1>404 Not Found</h1>", status_code=404)
         await response(scope, receive, send)