Improved redirects for the webserver

buildSrc/src/main/resources/website/src/main.ts

@@ -1,3 +1,4 @@
+import "reflect-metadata";
 import {bootstrapApplication} from "@angular/platform-browser";
 import {AppComponent} from "./app/app.component";
 import {provideAnimationsAsync} from "@angular/platform-browser/animations/async";

src/main/java/org/mtr/core/Main.java

@@ -3,6 +3,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.mtr.core.data.Depot;
+import org.mtr.core.generated.WebserverResources;
 import org.mtr.core.servlet.*;
 import org.mtr.core.simulation.Simulator;
 import org.mtr.core.tool.Utilities;
@@ -43,15 +44,15 @@ public static void main(String[] args) {
 			final boolean threadedSimulation = Boolean.parseBoolean(args[i++]);
 			final String[] dimensions = new String[args.length - i];
 			System.arraycopy(args, i, dimensions, 0, dimensions.length);
-			final Main main = new Main(rootPath, webserverPort, threadedSimulation, dimensions);
+			final Main main = new Main(rootPath, webserverPort, threadedSimulation, null, dimensions);
 			main.readConsoleInput();
 		} catch (Exception e) {
 			printHelp();
 			LOGGER.error("", e);
 		}
 	}
 
-	public Main(Path rootPath, int webserverPort, boolean threadedSimulation, String... dimensions) {
+	public Main(Path rootPath, int webserverPort, boolean threadedSimulation, @Nullable Consumer<Webserver> additionalWebserverSetup, String... dimensions) {
 		final ObjectArrayList<Simulator> tempSimulators = new ObjectArrayList<>();
 
 		LOGGER.info("Loading files...");
@@ -63,9 +64,12 @@ public Main(Path rootPath, int webserverPort, boolean threadedSimulation, String
 
 		if (webserverPort > 0) {
 			webserver = new Webserver(webserverPort);
-			webserver.addServlet(new ServletHolder(new WebServlet()), "/");
+			webserver.addServlet(new ServletHolder(new WebServlet(WebserverResources::get, "/")), "/");
 			webserver.addServlet(new ServletHolder(new SystemMapServlet(simulators)), "/mtr/api/map/*");
 			webserver.addServlet(new ServletHolder(new OBAServlet(simulators)), "/oba/api/where/*");
+			if (additionalWebserverSetup != null) {
+				additionalWebserverSetup.accept(webserver);
+			}
 			webserver.start();
 		} else {
 			webserver = null;

src/main/java/org/mtr/core/servlet/HttpResponseStatus.java

@@ -3,6 +3,7 @@
 public enum HttpResponseStatus {
 
 	OK(200, "OK"),
+	REDIRECT(301, "Redirect"),
 	BAD_REQUEST(400, "Bad Request"),
 	NOT_FOUND(404, "Not Found"),
 	INTERNAL_SERVER_ERROR(500, "Internal Server Error");

src/main/java/org/mtr/core/servlet/ServletBase.java

@@ -100,6 +100,9 @@ public static void sendResponse(HttpServletResponse httpServletResponse, AsyncCo
 			final ByteBuffer byteBuffer = ByteBuffer.wrap(content.getBytes(StandardCharsets.UTF_8));
 			httpServletResponse.addHeader("Content-Type", contentType);
 			httpServletResponse.addHeader("Access-Control-Allow-Origin", "*");
+			if (httpResponseStatus == HttpResponseStatus.REDIRECT) {
+				httpServletResponse.addHeader("Location", content);
+			}
 			servletOutputStream.setWriteListener(new WriteListener() {
 				@Override
 				public void onWritePossible() {

src/main/java/org/mtr/core/servlet/WebServlet.java

@@ -1,30 +1,40 @@
 package org.mtr.core.servlet;
 
-import org.mtr.core.generated.WebserverResources;
 import org.mtr.libraries.javax.servlet.AsyncContext;
 import org.mtr.libraries.javax.servlet.http.HttpServlet;
 import org.mtr.libraries.javax.servlet.http.HttpServletRequest;
 import org.mtr.libraries.javax.servlet.http.HttpServletResponse;
 
+import java.util.function.Function;
+
 public final class WebServlet extends HttpServlet {
 
+	private final Function<String, String> contentProvider;
+	private final String expectedPath;
+
+	public WebServlet(Function<String, String> contentProvider, String expectedPath) {
+		this.contentProvider = contentProvider;
+		this.expectedPath = expectedPath;
+	}
+
 	@Override
 	protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
 		final AsyncContext asyncContext = httpServletRequest.startAsync();
 		asyncContext.setTimeout(0);
-		getContent(httpServletResponse, asyncContext, httpServletRequest.getServletPath(), true);
-	}
 
-	private static void getContent(HttpServletResponse httpServletResponse, AsyncContext asyncContext, String path, boolean retry) {
-		final String content = WebserverResources.get(ServletBase.removeLastSlash(path));
-		if (content == null) {
-			if (retry) {
-				getContent(httpServletResponse, asyncContext, "index.html", false);
+		final String requestUri = httpServletRequest.getRequestURI();
+		if (requestUri.startsWith(expectedPath)) {
+			final String path = ServletBase.removeLastSlash(requestUri.replace(expectedPath, ""));
+			final String newPath = path.isEmpty() ? "index.html" : path;
+			final String content = contentProvider.apply(newPath);
+
+			if (content == null) {
+				ServletBase.sendResponse(httpServletResponse, asyncContext, expectedPath, "", HttpResponseStatus.REDIRECT);
 			} else {
-				ServletBase.sendResponse(httpServletResponse, asyncContext, "", "", HttpResponseStatus.NOT_FOUND);
+				ServletBase.sendResponse(httpServletResponse, asyncContext, content, ServletBase.getMimeType(newPath), HttpResponseStatus.OK);
 			}
 		} else {
-			ServletBase.sendResponse(httpServletResponse, asyncContext, content, ServletBase.getMimeType(path), HttpResponseStatus.OK);
+			ServletBase.sendResponse(httpServletResponse, asyncContext, expectedPath, "", HttpResponseStatus.REDIRECT);
 		}
 	}
 }

src/test/java/org/mtr/core/RuntimeTests.java

@@ -16,7 +16,7 @@ public class RuntimeTests implements TestUtilities {
 	@Test
 	public void createAndUpdateData() throws IOException {
 		FileUtils.deleteDirectory(TEST_DIRECTORY.toFile());
-		final Main main = new Main(TEST_DIRECTORY, PORT, true, "overworld");
+		final Main main = new Main(TEST_DIRECTORY, PORT, true, null, "overworld");
 
 		final Station station1 = new Station(TestUtilities.getDefaultSimulator());
 		station1.setName("Test 1");