feat: improve error handling and status code mapping in HttpServer

m0ver · m0ver · commit 4c6ab0fdfd4b · 2026-02-08T19:49:31.000+08:00
- Add explicit catch block for ApplicationException to handle domain-specific errors.
- Implement mapping from ApplicationException status codes to ResponseStatus.
- Default to INTERNAL_SERVER_ERROR (500) if an invalid status code is provided.
- Ensure error messages are written to the response using StandardCharsets.UTF_8.
- Updated logging to provide more descriptive error messages.
diff --git a/src/main/java/org/tinystruct/system/HttpServer.java b/src/main/java/org/tinystruct/system/HttpServer.java
@@ -31,6 +31,7 @@
 import java.io.*;
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
@@ -304,8 +305,19 @@ public void handle(HttpExchange exchange) throws IOException {
 
                 // Process the request using TinyStruct's DefaultHandler logic
                 processRequest(request, response, context);
+            } catch (ApplicationException e) {
+                logger.log(Level.SEVERE, e.getMessage(), e);
+                int status = e.getStatus();
+                ResponseStatus responseStatus = ResponseStatus.valueOf(status);
+                if (responseStatus == null)
+                    responseStatus = ResponseStatus.INTERNAL_SERVER_ERROR;
+
+                try {
+                    sendErrorResponse(exchange, responseStatus.code(), e.getMessage());
+                } catch (Exception ignored) {
+                }
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "Error processing request", e);
+                logger.log(Level.SEVERE, e.getMessage(), e);
                 // Try to send error only if headers haven't been committed yet
                 try {
                     sendErrorResponse(exchange, 500, "Internal Server Error: " + e.getMessage());
@@ -561,8 +573,12 @@ private void processRequest(ServerRequest request, ServerResponse response, Cont
                 logger.log(Level.SEVERE, "Error in request processing", e);
                 response.setContentType("text/plain; charset=UTF-8");
                 int status = e.getStatus();
-                response.setStatus(org.tinystruct.http.ResponseStatus.valueOf(status));
-                response.writeAndFlush("500 - Internal Server Error".getBytes("UTF-8"));
+                ResponseStatus responseStatus = ResponseStatus.valueOf(status);
+                if (responseStatus == null)
+                    responseStatus = ResponseStatus.INTERNAL_SERVER_ERROR;
+
+                response.setStatus(responseStatus);
+                response.writeAndFlush(e.getMessage().getBytes(StandardCharsets.UTF_8));
                 response.close();
             }
         }
@@ -642,4 +658,3 @@ private void sendErrorResponse(HttpExchange exchange, int statusCode, String mes
 
     }
 }
-
