Server: Move everything into a package that makes more sense.

e3ndr · Oct 2, 2023 · 0ad6547 · 0ad6547
1 parent d3d597b
commit 0ad6547
Show file tree

Hide file tree

Showing 19 changed files with 40 additions and 39 deletions.
diff --git a/server/src/main/java/xyz/e3ndr/athena/Launcher.java b/server/src/main/java/xyz/e3ndr/athena/Launcher.java
@@ -7,9 +7,9 @@
 import co.casterlabs.rakurai.json.Rson;
 import co.casterlabs.rakurai.json.serialization.JsonParseException;
 import co.casterlabs.sora.SoraFramework;
-import xyz.e3ndr.athena.server.ftp.AthenaFtpServer;
-import xyz.e3ndr.athena.server.http.AthenaHttpServer;
-import xyz.e3ndr.athena.webui.AthenaUIServer;
+import xyz.e3ndr.athena.service.ftp.AthenaFtpServer;
+import xyz.e3ndr.athena.service.http.AthenaHttpServer;
+import xyz.e3ndr.athena.service.simple_ui.AthenaSimpleUIServer;
 import xyz.e3ndr.fastloggingframework.FastLoggingFramework;
 import xyz.e3ndr.fastloggingframework.logging.FastLogger;
 import xyz.e3ndr.fastloggingframework.logging.LogLevel;
@@ -48,15 +48,15 @@ public static void main(String[] args) throws Exception {
 
         // Go!
         if (Athena.config.services.http.enable) {
-            AsyncTask.createNonDaemon(() -> new AthenaHttpServer().start());
+            AsyncTask.createNonDaemon(() -> new AthenaHttpServer().init());
         }
 
         if (Athena.config.services.http.enable) {
-            AsyncTask.createNonDaemon(() -> new AthenaFtpServer().start());
+            AsyncTask.createNonDaemon(() -> new AthenaFtpServer().init());
         }
 
         if (Athena.config.services.simpleUI.enable) {
-            AsyncTask.createNonDaemon(() -> new AthenaUIServer().start());
+            AsyncTask.createNonDaemon(() -> new AthenaSimpleUIServer().init());
         }
     }
 

diff --git a/server/src/main/java/xyz/e3ndr/athena/server/AthenaServer.java b/server/src/main/java/xyz/e3ndr/athena/server/AthenaServer.java
diff --git a/server/src/main/java/xyz/e3ndr/athena/service/AthenaService.java b/server/src/main/java/xyz/e3ndr/athena/service/AthenaService.java
@@ -0,0 +1,7 @@
+package xyz.e3ndr.athena.service;
+
+public interface AthenaService {
+
+    public void init();
+
+}
diff --git a/...a/xyz/e3ndr/athena/webui/HTMLBuilder.java → ...xyz/e3ndr/athena/service/HTMLBuilder.java b/...a/xyz/e3ndr/athena/webui/HTMLBuilder.java → ...xyz/e3ndr/athena/service/HTMLBuilder.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.webui;
+package xyz.e3ndr.athena.service;
 
 import java.util.Arrays;
 import java.util.LinkedList;

diff --git a/...dr/athena/server/ftp/AthenaFtpServer.java → ...r/athena/service/ftp/AthenaFtpServer.java b/...dr/athena/server/ftp/AthenaFtpServer.java → ...r/athena/service/ftp/AthenaFtpServer.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.ftp;
+package xyz.e3ndr.athena.service.ftp;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -8,7 +8,7 @@
 import java.util.List;
 
 import xyz.e3ndr.athena.Athena;
-import xyz.e3ndr.athena.server.AthenaServer;
+import xyz.e3ndr.athena.service.AthenaService;
 import xyz.e3ndr.fastloggingframework.logging.FastLogger;
 import xyz.e3ndr.fastloggingframework.logging.LogLevel;
 
@@ -17,14 +17,14 @@
  * 
  * @author Moritz Stueckler
  */
-public class AthenaFtpServer implements AthenaServer {
+public class AthenaFtpServer implements AthenaService {
     private static final int MAX_CLIENTS = 100;
     private static final int FTP_PORT_RANGE_OFFSET = 100;
     static final List<Integer> openPorts = Collections.synchronizedList(new LinkedList<>());
 
     @SuppressWarnings("resource")
     @Override
-    public void start() {
+    public void init() {
         int controlPort = Athena.config.services.ftp.port;
 
         // Generate a list of ports.

diff --git a/...yz/e3ndr/athena/server/ftp/FtpClient.java → ...z/e3ndr/athena/service/ftp/FtpClient.java b/...yz/e3ndr/athena/server/ftp/FtpClient.java → ...z/e3ndr/athena/service/ftp/FtpClient.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.ftp;
+package xyz.e3ndr.athena.service.ftp;
 
 import java.io.BufferedReader;
 import java.io.Closeable;

diff --git a/...z/e3ndr/athena/server/ftp/LoginState.java → .../e3ndr/athena/service/ftp/LoginState.java b/...z/e3ndr/athena/server/ftp/LoginState.java → .../e3ndr/athena/service/ftp/LoginState.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.ftp;
+package xyz.e3ndr.athena.service.ftp;
 
 enum LoginState {
     WAITING_FOR_USERNAME,

diff --git a/...e3ndr/athena/server/ftp/TransferType.java → ...3ndr/athena/service/ftp/TransferType.java b/...e3ndr/athena/server/ftp/TransferType.java → ...3ndr/athena/service/ftp/TransferType.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.ftp;
+package xyz.e3ndr.athena.service.ftp;
 
 enum TransferType {
     ASCII,

diff --git a/.../athena/server/http/AthenaHttpServer.java → ...athena/service/http/AthenaHttpServer.java b/.../athena/server/http/AthenaHttpServer.java → ...athena/service/http/AthenaHttpServer.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -8,14 +8,14 @@
 import co.casterlabs.sora.api.SoraPlugin;
 import lombok.NonNull;
 import xyz.e3ndr.athena.Athena;
-import xyz.e3ndr.athena.server.AthenaServer;
+import xyz.e3ndr.athena.service.AthenaService;
 import xyz.e3ndr.fastloggingframework.logging.FastLogger;
 import xyz.e3ndr.fastloggingframework.logging.LogLevel;
 
-public class AthenaHttpServer implements AthenaServer {
+public class AthenaHttpServer implements AthenaService {
 
     @Override
-    public void start() {
+    public void init() {
         try {
             int port = Athena.config.services.http.port;
 

diff --git a/...r/athena/server/http/IngestApiRoutes.java → .../athena/service/http/IngestApiRoutes.java b/...r/athena/server/http/IngestApiRoutes.java → .../athena/service/http/IngestApiRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...3ndr/athena/server/http/JsonResponse.java → ...ndr/athena/service/http/JsonResponse.java b/...3ndr/athena/server/http/JsonResponse.java → ...ndr/athena/service/http/JsonResponse.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Map;

diff --git a/...e3ndr/athena/server/http/MediaRoutes.java → ...3ndr/athena/service/http/MediaRoutes.java b/...e3ndr/athena/server/http/MediaRoutes.java → ...3ndr/athena/service/http/MediaRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/.../e3ndr/athena/server/http/MetaRoutes.java → ...e3ndr/athena/service/http/MetaRoutes.java b/.../e3ndr/athena/server/http/MetaRoutes.java → ...e3ndr/athena/service/http/MetaRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import co.casterlabs.rakurai.io.http.StandardHttpStatus;
 import co.casterlabs.rakurai.io.http.server.HttpResponse;

diff --git a/...ndr/athena/server/http/SessionRoutes.java → ...dr/athena/service/http/SessionRoutes.java b/...ndr/athena/server/http/SessionRoutes.java → ...dr/athena/service/http/SessionRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.util.Arrays;
 import java.util.Map;

diff --git a/...3ndr/athena/server/http/StreamRoutes.java → ...ndr/athena/service/http/StreamRoutes.java b/...3ndr/athena/server/http/StreamRoutes.java → ...ndr/athena/service/http/StreamRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...e3ndr/athena/server/http/WiiMCRoutes.java → ...3ndr/athena/service/http/WiiMCRoutes.java b/...e3ndr/athena/server/http/WiiMCRoutes.java → ...3ndr/athena/service/http/WiiMCRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.server.http;
+package xyz.e3ndr.athena.service.http;
 
 import java.util.List;
 

diff --git a/...yz/e3ndr/athena/webui/AthenaUIServer.java → ...rvice/simple_ui/AthenaSimpleUIServer.java b/...yz/e3ndr/athena/webui/AthenaUIServer.java → ...rvice/simple_ui/AthenaSimpleUIServer.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.webui;
+package xyz.e3ndr.athena.service.simple_ui;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -8,14 +8,14 @@
 import co.casterlabs.sora.api.SoraPlugin;
 import lombok.NonNull;
 import xyz.e3ndr.athena.Athena;
-import xyz.e3ndr.athena.server.AthenaServer;
+import xyz.e3ndr.athena.service.AthenaService;
 import xyz.e3ndr.fastloggingframework.logging.FastLogger;
 import xyz.e3ndr.fastloggingframework.logging.LogLevel;
 
-public class AthenaUIServer implements AthenaServer {
+public class AthenaSimpleUIServer implements AthenaService {
 
     @Override
-    public void start() {
+    public void init() {
         try {
             int port = Athena.config.services.simpleUI.port;
 

diff --git a/...yz/e3ndr/athena/webui/InternalRoutes.java → ...ena/service/simple_ui/InternalRoutes.java b/...yz/e3ndr/athena/webui/InternalRoutes.java → ...ena/service/simple_ui/InternalRoutes.java
@@ -1,10 +1,10 @@
-package xyz.e3ndr.athena.webui;
+package xyz.e3ndr.athena.service.simple_ui;
 
 import co.casterlabs.rakurai.io.http.server.HttpResponse;
 import co.casterlabs.sora.api.http.HttpProvider;
 import co.casterlabs.sora.api.http.SoraHttpSession;
 import co.casterlabs.sora.api.http.annotations.HttpEndpoint;
-import xyz.e3ndr.athena.server.http.StreamRoutes;
+import xyz.e3ndr.athena.service.http.StreamRoutes;
 
 class InternalRoutes implements HttpProvider {
     private StreamRoutes streamRoutes = new StreamRoutes();

diff --git a/...java/xyz/e3ndr/athena/webui/UIRoutes.java → ...dr/athena/service/simple_ui/UIRoutes.java b/...java/xyz/e3ndr/athena/webui/UIRoutes.java → ...dr/athena/service/simple_ui/UIRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.webui;
+package xyz.e3ndr.athena.service.simple_ui;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -24,6 +24,7 @@
 import co.casterlabs.sora.api.http.annotations.HttpEndpoint;
 import lombok.SneakyThrows;
 import xyz.e3ndr.athena.Athena;
+import xyz.e3ndr.athena.service.HTMLBuilder;
 import xyz.e3ndr.athena.types.AudioCodec;
 import xyz.e3ndr.athena.types.ContainerFormat;
 import xyz.e3ndr.athena.types.VideoCodec;