Added removeCookie() method and error classes, implemented encoding, better form data

Author: LatvianModder

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

@@ -288,7 +288,7 @@ private void handleClient(Socket socket) {
 					builder.setStatus(HTTPStatus.NO_CONTENT);
 					builder.addHeader("Allow", allowed.stream().map(HTTPMethod::name).collect(Collectors.joining(",")));
 					out = new BufferedOutputStream(socket.getOutputStream(), bufferSize);
-					builder.write(out, writeBody);
+					builder.write(req, out, writeBody);
 					out.flush();
 				} else if (method == HTTPMethod.TRACE) {
 					// no-op
@@ -345,7 +345,7 @@ private void handleClient(Socket socket) {
 					}
 
 					out = new BufferedOutputStream(socket.getOutputStream(), bufferSize);
-					builder.write(out, writeBody);
+					builder.write(req, out, writeBody);
 					out.flush();
 
 					upgradedToWebSocket = (WSSession) builder.getWSSession();

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

@@ -4,7 +4,6 @@
 import dev.latvian.apps.tinyserver.http.HTTPMethod;
 import dev.latvian.apps.tinyserver.http.HTTPRequest;
 import dev.latvian.apps.tinyserver.http.PathFileHandler;
-import dev.latvian.apps.tinyserver.http.RootPathFileHandler;
 import dev.latvian.apps.tinyserver.http.response.HTTPResponse;
 import dev.latvian.apps.tinyserver.ws.WSHandler;
 import dev.latvian.apps.tinyserver.ws.WSSession;
@@ -56,12 +55,14 @@ default void redirect(String path, String redirect) {
 		get(path, req -> res);
 	}
 
-	default void files(String path, Path directory, Duration cacheDuration, boolean autoInedx) {
-		if (autoInedx) {
-			get(path, new RootPathFileHandler<>(path, directory));
+	default void files(String path, Path directory, Duration cacheDuration, boolean autoIndex) {
+		var handler = new PathFileHandler<REQ>(path, directory, cacheDuration, autoIndex);
+
+		if (autoIndex) {
+			get(path, handler);
 		}
 
-		get(path + "/<path>", new PathFileHandler<>(path, directory, cacheDuration, autoInedx));
+		get(path + "/<path>", handler);
 	}
 
 	<WSS extends WSSession<REQ>> WSHandler<REQ, WSS> ws(String path, WSSessionFactory<REQ, WSS> factory);

src/main/java/dev/latvian/apps/tinyserver/content/ByteContent.java

@@ -1,5 +1,6 @@
 package dev.latvian.apps.tinyserver.content;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.net.http.HttpRequest;
 
@@ -10,10 +11,15 @@ public long length() {
 	}
 
 	@Override
-	public void write(OutputStream out) throws Exception {
+	public void write(OutputStream out) throws IOException {
 		out.write(bytes);
 	}
 
+	@Override
+	public byte[] toBytes() throws IOException {
+		return bytes;
+	}
+
 	@Override
 	public HttpRequest.BodyPublisher bodyPublisher() {
 		return HttpRequest.BodyPublishers.ofByteArray(bytes);

src/main/java/dev/latvian/apps/tinyserver/content/FileContent.java

@@ -30,10 +30,15 @@ public String type() {
 	}
 
 	@Override
-	public void write(OutputStream out) throws Exception {
+	public void write(OutputStream out) throws IOException {
 		Files.copy(file, out);
 	}
 
+	@Override
+	public byte[] toBytes() throws IOException {
+		return Files.readAllBytes(file);
+	}
+
 	@Override
 	public HttpRequest.BodyPublisher bodyPublisher() throws IOException {
 		return HttpRequest.BodyPublishers.ofByteArray(Files.readAllBytes(file));

src/main/java/dev/latvian/apps/tinyserver/content/ResponseContent.java

@@ -1,5 +1,6 @@
 package dev.latvian.apps.tinyserver.content;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.http.HttpRequest;
@@ -13,7 +14,13 @@ default String type() {
 		return "";
 	}
 
-	void write(OutputStream out) throws Exception;
+	void write(OutputStream out) throws IOException;
+
+	default byte[] toBytes() throws IOException {
+		var out = new ByteArrayOutputStream();
+		write(out);
+		return out.toByteArray();
+	}
 
 	default HttpRequest.BodyPublisher bodyPublisher() throws IOException {
 		throw new IllegalStateException("Body publisher not supported");

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

@@ -10,11 +10,15 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class HTTPRequest {
 	private HTTPServer<?> server;
@@ -29,6 +33,7 @@ public class HTTPRequest {
 	private InputStream bodyStream = null;
 	private Map<String, String> cookies = null;
 	private Map<String, String> formData = null;
+	private Set<String> acceptedEncodings = null;
 
 	@ApiStatus.Internal
 	public void init(HTTPServer<?> server, HTTPMethod method, long startTime, String path, String[] pathParts, CompiledPath compiledPath, List<Header> headers, String queryString, Map<String, String> query, InputStream bodyStream) {
@@ -94,13 +99,21 @@ public Map<String, String> query() {
 		return query;
 	}
 
+	public String query(String key, String def) {
+		return query.getOrDefault(key, def);
+	}
+
+	public String query(String key) {
+		return query(key, "");
+	}
+
 	public List<Header> headers() {
 		return Collections.unmodifiableList(headers);
 	}
 
 	public String header(String name) {
 		for (var header : headers) {
-			if (header.key().equalsIgnoreCase(name)) {
+			if (header.is(name)) {
 				return header.value();
 			}
 		}
@@ -148,7 +161,7 @@ public Map<String, String> cookies() {
 			cookies = new HashMap<>(4);
 
 			for (var header : headers) {
-				if (header.key().equalsIgnoreCase("Cookie")) {
+				if (header.is("Cookie")) {
 					for (var part : header.value().split("; ")) {
 						var parts = part.split("=", 2);
 
@@ -169,6 +182,10 @@ public String cookie(String key) {
 	}
 
 	public Map<String, String> formData() {
+		if (method == HTTPMethod.GET || method == HTTPMethod.HEAD) {
+			return query;
+		}
+
 		if (formData == null) {
 			formData = new HashMap<>(4);
 
@@ -179,7 +196,7 @@ public Map<String, String> formData() {
 					var parts = part.split("=", 2);
 
 					if (parts.length == 2) {
-						formData.put(parts[0], parts[1]);
+						formData.put(URLDecoder.decode(parts[0], StandardCharsets.UTF_8), URLDecoder.decode(parts[1], StandardCharsets.UTF_8));
 					}
 				}
 			} catch (IOException e) {
@@ -190,11 +207,31 @@ public Map<String, String> formData() {
 		return formData;
 	}
 
+	public Set<String> acceptedEncodings() {
+		if (acceptedEncodings == null) {
+			acceptedEncodings = new HashSet<>(2);
+
+			for (var header : headers) {
+				if (header.is("Accept-Encoding")) {
+					Arrays.stream(header.value().split(",")).map(s -> s.trim().split(";")).forEach(s -> acceptedEncodings.add(s[0]));
+				}
+			}
+
+			acceptedEncodings = Set.of(header("Accept-Encoding").split(","));
+		}
+
+		return acceptedEncodings;
+	}
+
 	@Nullable
 	public String formData(String key) {
 		return formData().get(key);
 	}
 
+	public String userAgent() {
+		return header("User-Agent");
+	}
+
 	public void beforeResponse(HTTPPayload payload, HTTPResponse response) {
 	}
 

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

@@ -1,4 +1,7 @@
 package dev.latvian.apps.tinyserver.http;
 
 public record Header(String key, String value) {
+	public boolean is(String name) {
+		return key.equalsIgnoreCase(name);
+	}
 }

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

@@ -5,42 +5,51 @@
 import dev.latvian.apps.tinyserver.http.response.HTTPStatus;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 
-public record PathFileHandler<REQ extends HTTPRequest>(String httpPath, Path directory, Duration cacheDuration, boolean autoInedx) implements HTTPHandler<REQ> {
+public record PathFileHandler<REQ extends HTTPRequest>(String httpPath, Path directory, Duration cacheDuration, boolean autoIndex) implements HTTPHandler<REQ> {
 	@Override
 	public HTTPResponse handle(REQ req) throws IOException {
-		var path = directory.resolve(req.variable("path"));
+		var pathVar = req.variables().get("path");
+
+		if (pathVar == null) {
+			if (autoIndex && Files.exists(directory) && Files.isDirectory(directory) && Files.isReadable(directory)) {
+				return PathFileHandler.index(httpPath, directory, directory);
+			}
+
+			return HTTPStatus.NOT_FOUND;
+		}
+
+		var path = directory.resolve(pathVar);
 
 		if (path.startsWith(directory) && Files.exists(path) && Files.isReadable(path)) {
 			if (Files.isRegularFile(path)) {
 				return HTTPResponse.ok().publicCache(cacheDuration).content(path);
-			} else if (autoInedx && Files.isDirectory(path)) {
+			} else if (autoIndex && Files.isDirectory(path)) {
 				return index(httpPath, directory, path);
 			}
 		}
 
 		return HTTPStatus.NOT_FOUND;
 	}
 
-	public static HTTPResponse index(String httpPath, Path rootDirectory, Path directory) throws IOException {
+	private static HTTPResponse index(String httpPath, Path rootDirectory, Path directory) throws IOException {
 		var sb = new StringBuilder();
 		sb.append("<ul>");
 
 		if (!rootDirectory.equals(directory)) {
-			sb.append("<li><a href=\"" + httpPath + "/" + rootDirectory.relativize(directory.getParent()) + "\">..</a></li>");
+			sb.append("<li><a href=\"").append(httpPath).append('/').append(rootDirectory.relativize(directory.getParent())).append("\">..</a></li>");
 		}
 
 		for (var file : Files.list(directory).sorted().toList()) {
 			var name = file.getFileName().toString();
-			sb.append("<li><a href=\"" + httpPath + "/" + rootDirectory.relativize(file) + "\">" + name + "</a></li>");
+			sb.append("<li><a href=\"").append(httpPath).append('/').append(rootDirectory.relativize(file)).append("\">").append(name).append("</a></li>");
 		}
 
 		sb.append("</ul>");
 
-		return HTTPResponse.ok().content(sb.toString().getBytes(StandardCharsets.UTF_8), MimeType.HTML);
+		return HTTPResponse.ok().content(sb, MimeType.HTML);
 	}
 }