Merged all response handling methods into one

LatvianModder · LatvianModder · commit a19018a03757 · 2024-10-13T00:35:01.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 	// implementation('com.google.code.gson:gson:2.10.1')
 
 	compileOnly('org.jetbrains:annotations:23.0.0')
+	testCompileOnly('org.jetbrains:annotations:23.0.0')
 }
 
 jar {
diff --git a/src/main/java/dev/latvian/apps/tinyserver/HTTPServer.java b/src/main/java/dev/latvian/apps/tinyserver/HTTPServer.java
@@ -8,6 +8,7 @@
 import dev.latvian.apps.tinyserver.http.HTTPRequest;
 import dev.latvian.apps.tinyserver.http.Header;
 import dev.latvian.apps.tinyserver.http.response.HTTPPayload;
+import dev.latvian.apps.tinyserver.http.response.HTTPResponse;
 import dev.latvian.apps.tinyserver.http.response.HTTPStatus;
 import dev.latvian.apps.tinyserver.ws.WSEndpointHandler;
 import dev.latvian.apps.tinyserver.ws.WSHandler;
@@ -385,23 +386,21 @@ private void handleClient(Socket socket) {
 	}
 
 	public HTTPPayload createBuilder(REQ req, @Nullable HTTPHandler<REQ> handler) {
-		var payload = new HTTPPayload();
-
-		if (serverName != null && !serverName.isEmpty()) {
-			payload.addHeader("Server", serverName);
-		}
-
-		payload.addHeader("Date", HTTPPayload.DATE_TIME_FORMATTER.format(Instant.now()));
+		var payload = new HTTPPayload(serverName, Instant.now());
 
 		if (handler != null) {
+			HTTPResponse response;
+			Throwable error;
+
 			try {
-				var response = handler.handle(req);
-				req.beforeResponse(payload, response);
-				payload.setResponse(response);
-			} catch (Throwable error) {
-				payload.setStatus(HTTPStatus.INTERNAL_ERROR);
-				req.handlePayloadError(payload, error);
+				response = handler.handle(req);
+				error = null;
+			} catch (Throwable error1) {
+				response = HTTPStatus.INTERNAL_ERROR;
+				error = error1;
 			}
+
+			payload.setResponse(req.handleResponse(payload, response, error));
 		}
 
 		return payload;
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/HTTPRequest.java b/src/main/java/dev/latvian/apps/tinyserver/http/HTTPRequest.java
@@ -232,13 +232,11 @@ public String userAgent() {
 		return header("User-Agent");
 	}
 
-	public void beforeResponse(HTTPPayload payload, HTTPResponse response) {
-	}
-
-	public void afterResponse(HTTPPayload payload, HTTPResponse response) {
-	}
+	public HTTPResponse handleResponse(HTTPPayload payload, HTTPResponse response, @Nullable Throwable error) {
+		if (error != null) {
+			error.printStackTrace();
+		}
 
-	public void handlePayloadError(HTTPPayload payload, Throwable error) {
-		error.printStackTrace();
+		return response;
 	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/ContentResponse.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/ContentResponse.java
@@ -4,7 +4,7 @@
 
 public record ContentResponse(HTTPResponse original, ResponseContent body) implements HTTPResponse {
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		original.build(payload);
 		payload.setBody(body);
 	}
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPPayload.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPPayload.java
@@ -10,6 +10,7 @@
 
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -22,6 +23,8 @@ public class HTTPPayload {
 	public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss z", Locale.ENGLISH).withZone(ZoneId.of("GMT"));
 	private static final byte[] CRLF = "\r\n".getBytes(StandardCharsets.UTF_8);
 
+	private final String serverName;
+	private final Instant serverTime;
 	private HTTPStatus status = HTTPStatus.NO_CONTENT;
 	private final List<Header> headers = new ArrayList<>();
 	private String cacheControl = "";
@@ -30,6 +33,11 @@ public class HTTPPayload {
 	private WSSession<?> wsSession = null;
 	private List<ResponseContentEncoding> encodings;
 
+	public HTTPPayload(String serverName, Instant serverTime) {
+		this.serverName = serverName;
+		this.serverTime = serverTime;
+	}
+
 	public void setStatus(HTTPStatus status) {
 		this.status = status;
 	}
@@ -111,7 +119,7 @@ public void addEncoding(ResponseContentEncoding encoding) {
 		encodings.add(encoding);
 	}
 
-	public void setResponse(HTTPResponse response) throws Exception {
+	public void setResponse(HTTPResponse response) {
 		response.build(this);
 
 		if (response instanceof WSResponse res) {
@@ -124,6 +132,13 @@ public void write(HTTPRequest req, OutputStream out, boolean writeBody) throws E
 		out.write(CRLF);
 
 		var actualHeaders = new ArrayList<Header>(headers.size() + (cookies == null ? 0 : cookies.size()) + (cacheControl.isEmpty() ? 0 : 1));
+
+		if (serverName != null && !serverName.isEmpty()) {
+			actualHeaders.add(new Header("Server", serverName));
+		}
+
+		actualHeaders.add(new Header("Date", HTTPPayload.DATE_TIME_FORMATTER.format(serverTime)));
+
 		actualHeaders.addAll(headers);
 
 		if (cookies != null) {
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponse.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponse.java
@@ -46,7 +46,7 @@ static HTTPResponse redirectPermanently(String location) {
 		return new RedirectResponse(EmptyResponse.INSTANCE, HTTPStatus.PERMANENT_REDIRECT, location);
 	}
 
-	void build(HTTPPayload payload) throws Exception;
+	void build(HTTPPayload payload);
 
 	default HTTPResponse header(String header, Object value) {
 		return new HTTPResponseWithHeader(this, header, String.valueOf(value));
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithCacheControl.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithCacheControl.java
@@ -8,7 +8,7 @@ public HTTPResponseWithCacheControl(HTTPResponse original, boolean isPublic, Dur
 	}
 
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		payload.setCacheControl(value);
 		original.build(payload);
 	}
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithCookie.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithCookie.java
@@ -71,7 +71,7 @@ public HTTPResponseWithCookie(HTTPResponse original, String key, String value) {
 	}
 
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		var sb = new StringBuilder();
 		sb.append(value);
 
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithEncoding.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithEncoding.java
@@ -4,7 +4,7 @@
 
 public record HTTPResponseWithEncoding(HTTPResponse original, ResponseContentEncoding encoding) implements HTTPResponse {
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		payload.addEncoding(encoding);
 		original.build(payload);
 	}
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithHeader.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/HTTPResponseWithHeader.java
@@ -2,7 +2,7 @@
 
 public record HTTPResponseWithHeader(HTTPResponse original, String header, String value) implements HTTPResponse {
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		payload.addHeader(header, value);
 		original.build(payload);
 	}
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/RedirectResponse.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/RedirectResponse.java
@@ -2,7 +2,7 @@
 
 public record RedirectResponse(HTTPResponse original, HTTPStatus status, String location) implements HTTPResponse {
 	@Override
-	public void build(HTTPPayload payload) throws Exception {
+	public void build(HTTPPayload payload) {
 		original.build(payload);
 		payload.setStatus(status);
 		payload.setHeader("Location", location);
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/BadRequestError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/BadRequestError.java
@@ -10,8 +10,4 @@ public BadRequestError(String message) {
 	public BadRequestError(String message, Throwable cause) {
 		super(HTTPStatus.BAD_REQUEST, message, cause);
 	}
-
-	public BadRequestError(Throwable cause) {
-		super(HTTPStatus.BAD_REQUEST, cause);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/ForbiddenError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/ForbiddenError.java
@@ -10,8 +10,4 @@ public ForbiddenError(String message) {
 	public ForbiddenError(String message, Throwable cause) {
 		super(HTTPStatus.FORBIDDEN, message, cause);
 	}
-
-	public ForbiddenError(Throwable cause) {
-		super(HTTPStatus.FORBIDDEN, cause);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/HTTPError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/HTTPError.java
@@ -16,11 +16,6 @@ public HTTPError(HTTPStatus status, String message, Throwable cause) {
 		this.status = status;
 	}
 
-	public HTTPError(HTTPStatus status, Throwable cause) {
-		super(cause);
-		this.status = status;
-	}
-
 	public HTTPStatus getStatus() {
 		return status;
 	}
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/InternalError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/InternalError.java
@@ -10,8 +10,4 @@ public InternalError(String message) {
 	public InternalError(String message, Throwable cause) {
 		super(HTTPStatus.INTERNAL_ERROR, message, cause);
 	}
-
-	public InternalError(Throwable cause) {
-		super(HTTPStatus.INTERNAL_ERROR, cause);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/NotFoundError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/NotFoundError.java
@@ -10,8 +10,4 @@ public NotFoundError(String message) {
 	public NotFoundError(String message, Throwable cause) {
 		super(HTTPStatus.NOT_FOUND, message, cause);
 	}
-
-	public NotFoundError(Throwable cause) {
-		super(HTTPStatus.NOT_FOUND, cause);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/NotImplementedError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/NotImplementedError.java
@@ -10,8 +10,4 @@ public NotImplementedError(String message) {
 	public NotImplementedError(String message, Throwable cause) {
 		super(HTTPStatus.NOT_IMPLEMENTED, message, cause);
 	}
-
-	public NotImplementedError(Throwable cause) {
-		super(HTTPStatus.NOT_IMPLEMENTED, cause);
-	}
 }
diff --git a/src/main/java/dev/latvian/apps/tinyserver/http/response/error/UnauthorizedError.java b/src/main/java/dev/latvian/apps/tinyserver/http/response/error/UnauthorizedError.java
@@ -10,8 +10,4 @@ public UnauthorizedError(String message) {
 	public UnauthorizedError(String message, Throwable cause) {
 		super(HTTPStatus.UNAUTHORIZED, message, cause);
 	}
-
-	public UnauthorizedError(Throwable cause) {
-		super(HTTPStatus.UNAUTHORIZED, cause);
-	}
 }
diff --git a/src/test/java/dev/latvian/apps/tinyserver/test/TestRequest.java b/src/test/java/dev/latvian/apps/tinyserver/test/TestRequest.java
@@ -3,20 +3,27 @@
 import dev.latvian.apps.tinyserver.http.HTTPRequest;
 import dev.latvian.apps.tinyserver.http.response.HTTPPayload;
 import dev.latvian.apps.tinyserver.http.response.HTTPResponse;
+import dev.latvian.apps.tinyserver.http.response.HTTPStatus;
+import dev.latvian.apps.tinyserver.http.response.error.HTTPError;
+import org.jetbrains.annotations.Nullable;
 
 public class TestRequest extends HTTPRequest {
 	@Override
-	public void beforeResponse(HTTPPayload payload, HTTPResponse response) {
+	public HTTPResponse handleResponse(HTTPPayload payload, HTTPResponse response, @Nullable Throwable error) {
 		payload.setCacheControl("no-cache, no-store, must-revalidate, max-age=0");
-	}
 
-	@Override
-	public void afterResponse(HTTPPayload payload, HTTPResponse response) {
 		System.out.println(method() + " /" + fullPath() + " " + payload.getStatus() + ", " + (System.currentTimeMillis() - startTime()) + " ms");
 		System.out.println("- Cookies: " + cookies());
 		System.out.println("- Headers: " + headers());
 		System.out.println("- Query: " + query());
 		System.out.println("- Accept Encodings: " + acceptedEncodings());
+		System.out.println("- Error: " + error);
 		System.out.println();
+
+		if (error != null) {
+			return (error instanceof HTTPError e ? e.getStatus() : HTTPStatus.INTERNAL_ERROR).text(error.toString());
+		}
+
+		return response;
 	}
 }
diff --git a/src/test/java/dev/latvian/apps/tinyserver/test/TinyServerTest.java b/src/test/java/dev/latvian/apps/tinyserver/test/TinyServerTest.java
@@ -2,6 +2,7 @@
 
 import dev.latvian.apps.tinyserver.HTTPServer;
 import dev.latvian.apps.tinyserver.http.response.HTTPResponse;
+import dev.latvian.apps.tinyserver.http.response.error.UnauthorizedError;
 import dev.latvian.apps.tinyserver.ws.WSHandler;
 
 import java.io.IOException;
@@ -27,6 +28,7 @@ public static void main(String[] args) {
 		server.get("/redirect", TinyServerTest::redirect);
 		server.post("/console", TinyServerTest::console);
 		server.get("/stop", TinyServerTest::stop);
+		server.get("/error", TinyServerTest::error);
 
 		server.get("/form", TinyServerTest::form);
 		server.get("/form-submit", TinyServerTest::formSubmit);
@@ -71,6 +73,10 @@ private static HTTPResponse stop(TestRequest req) {
 		return HTTPResponse.noContent();
 	}
 
+	private static HTTPResponse error(TestRequest req) {
+		throw new UnauthorizedError(null);
+	}
+
 	private static HTTPResponse form(TestRequest req) {
 		return HTTPResponse.ok().html("""
 			<form action="/form-submit" method="get" accept-charset="utf-8">

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ dependencies {`
`23`	`23`	`// implementation('com.google.code.gson:gson:2.10.1')`
`24`	`24`
`25`	`25`	`compileOnly('org.jetbrains:annotations:23.0.0')`
	`26`	`+ testCompileOnly('org.jetbrains:annotations:23.0.0')`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`jar {`
Original file line number	Diff line number	Diff line change
`@@ -232,13 +232,11 @@ public String userAgent() {`
`232`	`232`	`return header("User-Agent");`
`233`	`233`	`}`
`234`	`234`
`235`		`- public void beforeResponse(HTTPPayload payload, HTTPResponse response) {`
`236`		`- }`
`237`		`-`
`238`		`- public void afterResponse(HTTPPayload payload, HTTPResponse response) {`
`239`		`- }`
	`235`	`+ public HTTPResponse handleResponse(HTTPPayload payload, HTTPResponse response, @Nullable Throwable error) {`
	`236`	`+ if (error != null) {`
	`237`	`+ error.printStackTrace();`
	`238`	`+ }`
`240`	`239`
`241`		`- public void handlePayloadError(HTTPPayload payload, Throwable error) {`
`242`		`- error.printStackTrace();`
	`240`	`+ return response;`
`243`	`241`	`}`
`244`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`public record ContentResponse(HTTPResponse original, ResponseContent body) implements HTTPResponse {`
`6`	`6`	`@Override`
`7`		`- public void build(HTTPPayload payload) throws Exception {`
	`7`	`+ public void build(HTTPPayload payload) {`
`8`	`8`	`original.build(payload);`
`9`	`9`	`payload.setBody(body);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ static HTTPResponse redirectPermanently(String location) {`
`46`	`46`	`return new RedirectResponse(EmptyResponse.INSTANCE, HTTPStatus.PERMANENT_REDIRECT, location);`
`47`	`47`	`}`
`48`	`48`
`49`		`- void build(HTTPPayload payload) throws Exception;`
	`49`	`+ void build(HTTPPayload payload);`
`50`	`50`
`51`	`51`	`default HTTPResponse header(String header, Object value) {`
`52`	`52`	`return new HTTPResponseWithHeader(this, header, String.valueOf(value));`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public HTTPResponseWithCacheControl(HTTPResponse original, boolean isPublic, Dur`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@Override`
`11`		`- public void build(HTTPPayload payload) throws Exception {`
	`11`	`+ public void build(HTTPPayload payload) {`
`12`	`12`	`payload.setCacheControl(value);`
`13`	`13`	`original.build(payload);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public HTTPResponseWithCookie(HTTPResponse original, String key, String value) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`
`74`		`- public void build(HTTPPayload payload) throws Exception {`
	`74`	`+ public void build(HTTPPayload payload) {`
`75`	`75`	`var sb = new StringBuilder();`
`76`	`76`	`sb.append(value);`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`public record HTTPResponseWithEncoding(HTTPResponse original, ResponseContentEncoding encoding) implements HTTPResponse {`
`6`	`6`	`@Override`
`7`		`- public void build(HTTPPayload payload) throws Exception {`
	`7`	`+ public void build(HTTPPayload payload) {`
`8`	`8`	`payload.addEncoding(encoding);`
`9`	`9`	`original.build(payload);`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`public record HTTPResponseWithHeader(HTTPResponse original, String header, String value) implements HTTPResponse {`
`4`	`4`	`@Override`
`5`		`- public void build(HTTPPayload payload) throws Exception {`
	`5`	`+ public void build(HTTPPayload payload) {`
`6`	`6`	`payload.addHeader(header, value);`
`7`	`7`	`original.build(payload);`
`8`	`8`	`}`