moved servers to worker and increased api

ezTxmMC · ezTxmMC · commit 0066918f9f30 · 2026-01-06T10:25:52.000+01:00
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/IServerManagerNode.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/IServerManagerNode.java
@@ -1,13 +1,12 @@
-package com.nexoscript.servermanger.api;
+package com.nexoscript.servermanager.api;
 
-import com.nexoscript.servermanger.api.console.IConsole;
-import com.nexoscript.servermanger.api.server.IServerActionRunner;
-import com.nexoscript.servermanger.api.template.ITemplateManager;
+import com.nexoscript.servermanager.api.console.IConsole;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 
 public interface IServerManagerNode {
     void shutdownHook();
     IConsole console();
-    IServerActionRunner actionRunner();
+    IServerManagerWorker interalWorker();
     ITemplateManager templateManager();
 
     class Provider {
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/IServerManagerWorker.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/IServerManagerWorker.java
@@ -0,0 +1,7 @@
+package com.nexoscript.servermanager.api;
+
+import com.nexoscript.servermanager.api.server.IServerActionRunner;
+
+public interface IServerManagerWorker {
+    IServerActionRunner actionRunner();
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/console/IConsole.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/console/IConsole.java
@@ -0,0 +1,5 @@
+package com.nexoscript.servermanager.api.console;
+
+public interface IConsole {
+    void start();
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/INetClient.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/INetClient.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.api.networking;
+
+public interface INetClient {
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/INetServer.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/INetServer.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.api.networking;
+
+public interface INetServer {
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/packet/Packet.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/packet/Packet.java
@@ -0,0 +1,13 @@
+package com.nexoscript.servermanager.api.networking.packet;
+
+public abstract class Packet {
+    private final int id;
+
+    protected Packet(int id) {
+        this.id = id;
+    }
+
+    public int id() {
+        return id;
+    }
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/serialize/IDeserializer.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/serialize/IDeserializer.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.api.networking.serialize;
+
+public interface IDeserializer {
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/serialize/ISerializer.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/networking/serialize/ISerializer.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.api.networking.serialize;
+
+public interface ISerializer {
+}
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/server/IServer.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/server/IServer.java
@@ -1,4 +1,4 @@
-package com.nexoscript.servermanger.api.server;
+package com.nexoscript.servermanager.api.server;
 
 import java.util.Scanner;
 
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/server/IServerActionRunner.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/server/IServerActionRunner.java
@@ -1,4 +1,4 @@
-package com.nexoscript.servermanger.api.server;
+package com.nexoscript.servermanager.api.server;
 
 import java.nio.file.Path;
 import java.util.Map;
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanager/api/template/ITemplateManager.java b/servermanager-api/src/main/java/com/nexoscript/servermanager/api/template/ITemplateManager.java
@@ -1,4 +1,4 @@
-package com.nexoscript.servermanger.api.template;
+package com.nexoscript.servermanager.api.template;
 
 import java.nio.file.Path;
 import java.util.Map;
diff --git a/servermanager-api/src/main/java/com/nexoscript/servermanger/api/console/IConsole.java b/servermanager-api/src/main/java/com/nexoscript/servermanger/api/console/IConsole.java
diff --git a/servermanager-node/pom.xml b/servermanager-node/pom.xml
@@ -51,6 +51,17 @@
             <artifactId>servermanager-api</artifactId>
             <version>0.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.nexoscript</groupId>
+            <artifactId>servermanager-worker</artifactId>
+            <version>0.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.nexoscript</groupId>
+                    <artifactId>servermanager-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/ServerManagerNode.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/ServerManagerNode.java
@@ -1,33 +1,29 @@
 package com.nexoscript.servermanager.node;
 
 import com.nexoscript.servermanager.node.console.Console;
-import com.nexoscript.servermanager.node.server.ServerActionRunner;
 import com.nexoscript.servermanager.node.template.TemplateManager;
-import com.nexoscript.servermanger.api.IServerManagerNode;
-import com.nexoscript.servermanger.api.console.IConsole;
-import com.nexoscript.servermanger.api.server.IServerActionRunner;
-import com.nexoscript.servermanger.api.template.ITemplateManager;
+import com.nexoscript.servermanager.worker.ServerManagerWorker;
+import com.nexoscript.servermanager.api.IServerManagerNode;
+import com.nexoscript.servermanager.api.IServerManagerWorker;
+import com.nexoscript.servermanager.api.console.IConsole;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 
 public class ServerManagerNode implements IServerManagerNode {
     private final ITemplateManager templateManager;
-    private final IServerActionRunner actionRunner;
+    private final IServerManagerWorker internalWorker;
 
     private final IConsole console;
 
     public ServerManagerNode() {
-        Provider.register(this);
+        IServerManagerNode.Provider.register(this);
         this.templateManager = new TemplateManager();
-        this.actionRunner = new ServerActionRunner(this, this.templateManager);
-        this.console = new Console(this.templateManager, this.actionRunner);
+        this.internalWorker = new ServerManagerWorker(this.templateManager);
+        this.console = new Console(this.templateManager, this.internalWorker.actionRunner());
         this.console.start();
     }
 
     @Override
     public void shutdownHook() {
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            System.out.println("\nProgramm has been exited. Stop all servers...");
-            this.actionRunner.shutdownAllServers();
-        }));
     }
 
     @Override
@@ -36,8 +32,8 @@ public IConsole console() {
     }
 
     @Override
-    public IServerActionRunner actionRunner() {
-        return this.actionRunner;
+    public IServerManagerWorker interalWorker() {
+        return internalWorker;
     }
 
     @Override
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/console/Console.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/console/Console.java
@@ -3,9 +3,9 @@
 import java.nio.file.Path;
 import java.util.Scanner;
 
-import com.nexoscript.servermanger.api.console.IConsole;
-import com.nexoscript.servermanger.api.server.IServerActionRunner;
-import com.nexoscript.servermanger.api.template.ITemplateManager;
+import com.nexoscript.servermanager.api.console.IConsole;
+import com.nexoscript.servermanager.api.server.IServerActionRunner;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 
 public class Console implements IConsole {
     private final ITemplateManager templateManager;
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/networking/NetServer.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/networking/NetServer.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.node.networking;
+
+public class NetServer {
+}
diff --git a/servermanager-node/src/main/java/com/nexoscript/servermanager/node/template/TemplateManager.java b/servermanager-node/src/main/java/com/nexoscript/servermanager/node/template/TemplateManager.java
@@ -1,7 +1,7 @@
 package com.nexoscript.servermanager.node.template;
 
 import com.nexoscript.servermanager.node.config.JsonConfig;
-import com.nexoscript.servermanger.api.template.ITemplateManager;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
diff --git a/servermanager-worker/pom.xml b/servermanager-worker/pom.xml
@@ -15,6 +15,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>servermanager-api</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/ServerManagerWorker.java b/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/ServerManagerWorker.java
@@ -1,8 +1,21 @@
 package com.nexoscript.servermanager.worker;
 
-public class ServerManagerWorker {
+import com.nexoscript.servermanager.worker.server.ServerActionRunner;
+import com.nexoscript.servermanager.api.IServerManagerWorker;
+import com.nexoscript.servermanager.api.server.IServerActionRunner;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 
-    public ServerManagerWorker() {
+public record ServerManagerWorker(IServerActionRunner actionRunner) implements IServerManagerWorker {
 
+    public ServerManagerWorker(ITemplateManager actionRunner) {
+        this(new ServerActionRunner(actionRunner));
     }
-}
+
+    public static void main(String[] args) {
+        /*
+         * TODO
+         * Start networking
+         * Get TemplateManager from node and automatically sync changes
+         * */
+    }
+}
diff --git a/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/networking/NetClient.java b/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/networking/NetClient.java
@@ -0,0 +1,4 @@
+package com.nexoscript.servermanager.worker.networking;
+
+public class NetClient {
+}
diff --git a/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/server/Server.java b/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/server/Server.java
@@ -1,8 +1,7 @@
-package com.nexoscript.servermanager.node.server;
+package com.nexoscript.servermanager.worker.server;
 
-import com.nexoscript.servermanager.node.ServerManagerNode;
-import com.nexoscript.servermanger.api.IServerManagerNode;
-import com.nexoscript.servermanger.api.server.IServer;
+import com.nexoscript.servermanager.api.server.IServer;
+import com.nexoscript.servermanager.api.server.IServerActionRunner;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -16,7 +15,7 @@
 import java.util.Scanner;
 
 public class Server implements IServer {
-    private final IServerManagerNode node;
+    private final IServerActionRunner actionRunner;
     private final String name;
     private final String path;
     private final String jar;
@@ -26,8 +25,8 @@ public class Server implements IServer {
     private final List<String> logBuffer = Collections.synchronizedList(new ArrayList<>());
     private BufferedWriter writer;
 
-    public Server(IServerManagerNode node, String name, String path, String jar) {
-        this.node = node;
+    public Server(IServerActionRunner actionRunner, String name, String path, String jar) {
+        this.actionRunner = actionRunner;
         this.name = name;
         this.path = path;
         this.jar = jar;
@@ -54,7 +53,7 @@ public void start() {
                 } catch (IOException e) {
                     e.printStackTrace();
                 } finally {
-                    this.node.actionRunner().servers().remove(name);
+                    this.actionRunner.servers().remove(name);
                     insideConsole = false;
                 }
             });
diff --git a/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/server/ServerActionRunner.java b/servermanager-worker/src/main/java/com/nexoscript/servermanager/worker/server/ServerActionRunner.java
@@ -1,9 +1,8 @@
-package com.nexoscript.servermanager.node.server;
+package com.nexoscript.servermanager.worker.server;
 
-import com.nexoscript.servermanger.api.IServerManagerNode;
-import com.nexoscript.servermanger.api.server.IServer;
-import com.nexoscript.servermanger.api.server.IServerActionRunner;
-import com.nexoscript.servermanger.api.template.ITemplateManager;
+import com.nexoscript.servermanager.api.server.IServer;
+import com.nexoscript.servermanager.api.server.IServerActionRunner;
+import com.nexoscript.servermanager.api.template.ITemplateManager;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -12,12 +11,10 @@
 import java.util.stream.Stream;
 
 public class ServerActionRunner implements IServerActionRunner {
-    private final IServerManagerNode node;
     private final ITemplateManager templateManager;
     private final Map<String, IServer> servers;
 
-    public ServerActionRunner(IServerManagerNode node, ITemplateManager templateManager) {
-        this.node = node;
+    public ServerActionRunner(ITemplateManager templateManager) {
         this.templateManager = templateManager;
         this.servers = new HashMap<>();
     }
@@ -60,7 +57,7 @@ public void startServer(String name, String path, String jar) {
         }
 
         try {
-            IServer server = new Server(node, name, path, jar);
+            IServer server = new Server(this, name, path, jar);
             server.start();
             servers.put(name, server);
             System.out.println("Server '" + name + "' gestartet.");

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.nexoscript.servermanager.api.networking;
++
 +public interface INetClient {
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.nexoscript.servermanger.api.server;`
	`1`	`+package com.nexoscript.servermanager.api.server;`
`2`	`2`
`3`	`3`	`import java.util.Scanner;`
`4`	`4`