Added string path and query to request, moved post-response methods to request

Author: LatvianModder

src/main/java/dev/latvian/apps/tinyserver/HTTPServer.java

@@ -52,6 +52,7 @@ public HTTPServer(Supplier<REQ> requestFactory) {
 		this.requestFactory = requestFactory;
 		this.handlers = new EnumMap<>(HTTPMethod.class);
 		this.rootHandlers = new EnumMap<>(HTTPMethod.class);
+		this.serverName = "dev.latvian.apps:tiny-java-server";
 	}
 
 	public void setServerName(String name) {
@@ -298,7 +299,7 @@ private void handleClient(Socket socket) {
 						var handler = rootHandlers.get(method);
 
 						if (handler != null) {
-							req.init(this, new String[0], CompiledPath.EMPTY, headers, query, in);
+							req.init(this, "", new String[0], CompiledPath.EMPTY, headers, queryString, query, in);
 							builder = createBuilder(req, handler.handler());
 						}
 					} else {
@@ -320,14 +321,14 @@ private void handleClient(Socket socket) {
 							var h = hl.staticHandlers().get(path);
 
 							if (h != null) {
-								req.init(this, pathParts, h.path(), headers, query, in);
+								req.init(this, path, pathParts, h.path(), headers, queryString, query, in);
 								builder = createBuilder(req, h.handler());
 							} else {
 								for (var dynamicHandler : hl.dynamicHandlers()) {
 									var matches = dynamicHandler.path().matches(pathParts);
 
 									if (matches != null) {
-										req.init(this, matches, dynamicHandler.path(), headers, query, in);
+										req.init(this, path, matches, dynamicHandler.path(), headers, queryString, query, in);
 										builder = createBuilder(req, dynamicHandler.handler());
 										break;
 									}
@@ -392,16 +393,15 @@ public HTTPResponseBuilder createBuilder(REQ req, @Nullable HTTPHandler<REQ> han
 
 		if (handler != null) {
 			try {
-				builder.setResponse(handler.handle(req));
+				var response = handler.handle(req);
+				builder.setResponse(response);
+				req.afterResponse(builder, response);
 			} catch (Exception ex) {
 				builder.setStatus(HTTPStatus.INTERNAL_ERROR);
-				handlePayloadError(builder, ex);
+				req.handlePayloadError(builder, ex);
 			}
 		}
 
 		return builder;
 	}
-
-	public void handlePayloadError(HTTPResponseBuilder payload, Exception error) {
-	}
 }

src/main/java/dev/latvian/apps/tinyserver/ServerRegistry.java

@@ -47,6 +47,11 @@ default void delete(String path, HTTPHandler<REQ> handler) {
 		http(HTTPMethod.DELETE, path, handler);
 	}
 
+	default void redirect(String path, String redirect) {
+		var res = HTTPResponse.redirect(redirect);
+		get(path, req -> res);
+	}
+
 	<WSS extends WSSession<REQ>> WSHandler<REQ, WSS> ws(String path, WSSessionFactory<REQ, WSS> factory);
 
 	default <WSS extends WSSession<REQ>> WSHandler<REQ, WSS> ws(String path) {

src/main/java/dev/latvian/apps/tinyserver/http/HTTPRequest.java

@@ -3,6 +3,8 @@
 import dev.latvian.apps.tinyserver.CompiledPath;
 import dev.latvian.apps.tinyserver.HTTPServer;
 import dev.latvian.apps.tinyserver.error.InvalidPathException;
+import dev.latvian.apps.tinyserver.http.response.HTTPResponse;
+import dev.latvian.apps.tinyserver.http.response.HTTPResponseBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,29 +16,33 @@
 
 public class HTTPRequest {
 	private HTTPServer<?> server;
-	private String[] path = new String[0];
+	private String path = "";
+	private String[] pathParts = new String[0];
 	private Map<String, String> variables = Map.of();
+	private String queryString = "";
 	private Map<String, String> query = Map.of();
 	private List<Header> headers = List.of();
 	private InputStream bodyStream = null;
 
-	public void init(HTTPServer<?> server, String[] path, CompiledPath compiledPath, List<Header> headers, Map<String, String> query, InputStream bodyStream) {
+	public void init(HTTPServer<?> server, String path, String[] pathParts, CompiledPath compiledPath, List<Header> headers, String queryString, Map<String, String> query, InputStream bodyStream) {
 		this.server = server;
 		this.path = path;
+		this.pathParts = pathParts;
 
 		if (compiledPath.variables() > 0) {
 			this.variables = new HashMap<>(compiledPath.variables());
 
 			for (var i = 0; i < compiledPath.parts().length; i++) {
 				var part = compiledPath.parts()[i];
 
-				if (part.variable() && i < path.length) {
-					variables.put(part.name(), path[i]);
+				if (part.variable() && i < pathParts.length) {
+					variables.put(part.name(), pathParts[i]);
 				}
 			}
 		}
 
 		this.headers = headers;
+		this.queryString = queryString;
 		this.query = query;
 		this.bodyStream = bodyStream;
 	}
@@ -59,6 +65,10 @@ public String variable(String name) {
 		return s;
 	}
 
+	public String queryString() {
+		return queryString;
+	}
+
 	public Map<String, String> query() {
 		return query;
 	}
@@ -77,10 +87,18 @@ public String header(String name) {
 		return "";
 	}
 
-	public String[] path() {
+	public String path() {
 		return path;
 	}
 
+	public String fullPath() {
+		return path + (queryString.isEmpty() ? "" : "?" + queryString);
+	}
+
+	public String[] pathParts() {
+		return pathParts;
+	}
+
 	public InputStream bodyStream() {
 		if (bodyStream == null) {
 			return InputStream.nullInputStream();
@@ -103,4 +121,10 @@ public byte[] bodyBytes() throws IOException {
 	public String body() throws IOException {
 		return new String(bodyBytes(), StandardCharsets.UTF_8);
 	}
+
+	public void handlePayloadError(HTTPResponseBuilder payload, Exception error) {
+	}
+
+	public void afterResponse(HTTPResponseBuilder payload, HTTPResponse response) {
+	}
 }