Switch some more things to docker (stats, console commands, ...)

TheZexquex · TheZexquex · commit 4dd813b3faf3 · 2026-06-08T19:41:06.000+02:00
diff --git a/bot/src/main/java/de/chojo/gamejam/api/v1/Server.java b/bot/src/main/java/de/chojo/gamejam/api/v1/Server.java
@@ -107,9 +107,9 @@ private void handle(@NotNull Context ctx) {
 
         ctx.status(HttpStatus.ACCEPTED);
         String restart = ctx.queryParam("restart");
-        if ("true".equals(restart) && teamServer.running()) {
+        if ("true".equals(restart) && teamServer.isRunning()) {
             teamServer.restart();
-        } else if (teamServer.running()) {
+        } else if (teamServer.isRunning()) {
             teamServer.send("say Plugin Updated");
         }
     }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/configure/MaxPlayers.java b/bot/src/main/java/de/chojo/gamejam/commands/server/configure/MaxPlayers.java
@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -37,7 +36,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
                                 .POST(HttpRequest.BodyPublishers.ofString(String.valueOf(event.getOption("amount").getAsInt())))
                                 .build();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/configure/Message.java b/bot/src/main/java/de/chojo/gamejam/commands/server/configure/Message.java
@@ -37,7 +37,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/configure/SpectatorOverflow.java b/bot/src/main/java/de/chojo/gamejam/commands/server/configure/SpectatorOverflow.java
@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -34,7 +33,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/configure/Whitelist.java b/bot/src/main/java/de/chojo/gamejam/commands/server/configure/Whitelist.java
@@ -7,7 +7,6 @@
 package de.chojo.gamejam.commands.server.configure;
 
 import de.chojo.gamejam.commands.server.Server;
-import de.chojo.gamejam.server.TeamServer;
 import de.chojo.jdautil.interactions.slash.structure.handler.SlashHandler;
 import de.chojo.jdautil.util.Futures;
 import de.chojo.jdautil.wrapper.EventContext;
@@ -34,7 +33,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
 
         var teamServer = optServer.get();
 
-        if (!teamServer.running()) {
+        if (!teamServer.isRunning()) {
             event.reply(context.localize("error.servernotrunning")).queue();
             return;
         }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/process/Log.java b/bot/src/main/java/de/chojo/gamejam/commands/server/process/Log.java
@@ -12,7 +12,10 @@
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.utils.FileUpload;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 public class Log implements SlashHandler {
@@ -27,16 +30,13 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var optServer = server.getServer(event, context);
         if(optServer.isEmpty())return;
         var teamServer = optServer.get();
-        var logFile = teamServer.logFile();
-        String content;
-        try {
-            content = Files.readString(logFile);
-        } catch (IOException e) {
-            content = "";
+        var logs = teamServer.logs(0);
+        var content = logs.substring(Math.max(logs.length() - 1950, 0));
+        try(InputStream inputStream = new ByteArrayInputStream(logs.getBytes(StandardCharsets.UTF_8))) {
+            event.reply("```log%n%s%n```".formatted(content))
+                    .addFiles(FileUpload.fromData(inputStream, "latest.log"))
+                    .queue();
+        } catch (IOException _) {
         }
-        content = content.substring(Math.max(content.length() - 1950, 0));
-        event.reply("```log%n%s%n```".formatted(content))
-             .addFiles(FileUpload.fromData(logFile, "latest.log"))
-             .queue();
     }
 }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/process/Restart.java b/bot/src/main/java/de/chojo/gamejam/commands/server/process/Restart.java
@@ -24,8 +24,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         if(optServer.isEmpty())return;
         var teamServer = optServer.get();
         if (teamServer.exists()) {
-            teamServer.stop(true)
-                      .thenRun(() -> event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue());
+            teamServer.stop();
+            event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue();
             event.reply(context.localize("command.server.process.restart.message.restarting")).queue();
         }
     }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/server/process/Stop.java b/bot/src/main/java/de/chojo/gamejam/commands/server/process/Stop.java
@@ -25,7 +25,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var teamServer = optServer.get();
         if (teamServer.exists()) {
             event.reply(context.localize("command.server.process.stop.message.stopping")).queue();
-            teamServer.stop(false).thenRun(() -> event.getHook().editOriginal(
+            teamServer.stop().thenRun(() -> event.getHook().editOriginal(
                     context.localize("command.server.process.stop.message.stopped")).queue());
         }
     }
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartAll.java b/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartAll.java
@@ -34,9 +34,9 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var count = jam.teams().teams().stream()
                        .map(serverService::get)
                        .filter(server -> {
-                           var running = server.running();
+                           var running = server.isRunning();
                            if (running) {
-                               server.stop(true);
+                               server.stop();
                            }
                            return running;
                        })
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartTeam.java b/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/restart/RestartTeam.java
@@ -42,7 +42,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         }
 
         var started = optTeam.map(serverService::get).map(server -> {
-            var running = server.running();
+            var running = server.isRunning();
             server.restart();
             return running;
         }).orElse(false);
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopAll.java b/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopAll.java
@@ -34,8 +34,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         var count = jam.teams().teams().stream()
                        .map(serverService::get)
                        .map(server -> {
-                           var running = server.running();
-                           server.stop(false);
+                           var running = server.isRunning();
+                           server.stop();
                            return running;
                        })
                        .filter(v -> v)
diff --git a/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopTeam.java b/bot/src/main/java/de/chojo/gamejam/commands/serveradmin/handler/stop/StopTeam.java
@@ -42,7 +42,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
         }
 
         var started = optTeam.map(serverService::get).map(server -> {
-            var running = server.running();
+            var running = server.isRunning();
             server.stop();
             return running;
         }).orElse(false);
diff --git a/bot/src/main/java/de/chojo/gamejam/configuration/elements/Docker.java b/bot/src/main/java/de/chojo/gamejam/configuration/elements/Docker.java
@@ -6,7 +6,6 @@
 
 package de.chojo.gamejam.configuration.elements;
 
-
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 public class Docker {
     private String host = "unix:///var/run/docker.sock";
@@ -16,6 +15,7 @@ public class Docker {
     private String registryPassword;
     private String registryEmail;
     private String registryUrl;
+    private String networkName = "plugin-jam-network";
 
     public String getHost() {
         return host;
@@ -44,4 +44,9 @@ public String getRegistryEmail() {
     public String getRegistryUrl() {
         return registryUrl;
     }
+
+    public String getNetworkName() {
+        return networkName;
+    }
+
 }
diff --git a/bot/src/main/java/de/chojo/gamejam/configuration/elements/Plugins.java b/bot/src/main/java/de/chojo/gamejam/configuration/elements/Plugins.java
@@ -16,11 +16,16 @@
 @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal"})
 public class Plugins {
     private String pluginDir = "plugins";
+    private List<String> defaultPlugins = List.of();
 
     public String pluginDir() {
         return pluginDir;
     }
 
+    public List<String> defaultPlugins() {
+        return defaultPlugins;
+    }
+
     private Path pluginPath() {
         return Path.of(pluginDir);
     }
diff --git a/bot/src/main/java/de/chojo/gamejam/server/DockerService.java b/bot/src/main/java/de/chojo/gamejam/server/DockerService.java
@@ -11,9 +11,11 @@
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import de.chojo.gamejam.configuration.elements.Docker;
+import de.chojo.gamejam.configuration.elements.Plugins;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -30,8 +32,12 @@ public class DockerService {
     private static final Logger log = getLogger(DockerService.class);
     private static final String DOCKER_IMAGE = "itzg/minecraft-server:latest";
     private static final String DOCKER_VOLUME_DATA_DIR = "/data";
+    private final String networkName;
+    private final String pluginUrls;
 
-    public DockerService(Docker dockerConfig) {
+    public DockerService(Docker dockerConfig, Plugins pluginsConfig) {
+        this.networkName = dockerConfig.getNetworkName();
+        this.pluginUrls = String.join(",", pluginsConfig.defaultPlugins());
         this.dockerClientConfig = DefaultDockerClientConfig
                 .createDefaultConfigBuilder()
                 .withDockerHost(dockerConfig.getHost())
@@ -54,6 +60,20 @@ public void initDockerClient() {
                 .build();
 
         dockerClient = DockerClientImpl.getInstance(dockerClientConfig, httpClient);
+        ensureNetwork();
+    }
+
+    private void ensureNetwork() {
+        var networks = dockerClient.listNetworksCmd()
+                .withNameFilter(networkName)
+                .exec();
+        if (networks.stream().noneMatch(n -> n.getName().equals(networkName))) {
+            dockerClient.createNetworkCmd()
+                    .withName(networkName)
+                    .withDriver("bridge")
+                    .exec();
+            log.info("Created docker network {}", networkName);
+        }
     }
 
     public void shutdown() throws IOException {
@@ -69,8 +89,11 @@ public void provisionServer(int teamId) {
         HostConfig hostConfig = HostConfig.newHostConfig()
                 .withBinds(new Bind(volumeName(teamId), new Volume(DOCKER_VOLUME_DATA_DIR)));
 
+        hostConfig.withNetworkMode(networkName);
+
         dockerClient.createContainerCmd(DOCKER_IMAGE)
                 .withName(containerName(teamId))
+                .withEnv("EULA=TRUE", "TYPE=PAPER", "VERSION=26.1.2", String.format("PLUGINS=%s", pluginUrls))
                 .withHostConfig(hostConfig)
                 .exec();
         log.info("Server provisioned for team with container name {} and volume name {}", containerName(teamId), volumeName(teamId));
@@ -96,7 +119,7 @@ public void restartServer(int teamId) {
         dockerClient.restartContainerCmd(containerName(teamId)).exec();
     }
 
-    public boolean running(int teamId) {
+    public boolean isRunning(int teamId) {
         return dockerClient.listContainersCmd()
                 .withShowAll(true)
                 .withNameFilter(List.of(containerName(teamId)))
@@ -106,11 +129,31 @@ public boolean running(int teamId) {
     }
 
     public void sendCommand(int teamId, String command) {
-        dockerClient.execCreateCmd(containerName(teamId))
-                .withCmd(String.format("mc rcon-cli %s", command))
-                .exec();
+        var container = container(teamId);
+        if (container.isEmpty()) {
+            log.error("Container not found for team {}", teamId);
+            return;
+        }
+        var execId = dockerClient.execCreateCmd(container.get().getId())
+                .withAttachStdout(true)
+                .withAttachStderr(true)
+                .withCmd("rcon-cli", command)
+                .exec()
+                .getId();
+        try {
+            dockerClient.execStartCmd(execId)
+                    .exec(new ResultCallback.Adapter<Frame>() {
+                        @Override
+                        public void onNext(Frame frame) {
+                            log.info("rcon-cli response for team {}: {}", teamId, new String(frame.getPayload()));
+                        }
+                    })
+                    .awaitCompletion();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("Interrupted while sending command to team {}", teamId, e);
+        }
     }
-
     public boolean exists(int teamId) {
         return dockerClient.listContainersCmd()
                 .withShowAll(true)
@@ -130,6 +173,35 @@ public Optional<Container> container(int teamId) {
                 .findFirst();
     }
 
+    public String logs(int teamId, int tail) {
+        var callback = new ResultCallback.Adapter<Frame>() {
+            private final StringBuilder logs = new StringBuilder();
+
+            @Override
+            public void onNext(Frame frame) {
+                logs.append(new String(frame.getPayload()));
+            }
+
+            public String getLogs() {
+                return logs.toString();
+            }
+        };
+
+        try {
+            dockerClient.logContainerCmd(containerName(teamId))
+                    .withStdOut(true)
+                    .withStdErr(true)
+                    .withTail(tail)
+                    .exec(callback)
+                    .awaitCompletion();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.error("Interrupted while retrieving logs for team {}", teamId, e);
+        }
+
+        return callback.getLogs();
+    }
+
     public void copyArchiveToContainer(int teamId, Path source, Path destination) {
         dockerClient.copyArchiveToContainerCmd(containerName(teamId))
                 .withHostResource(source.toString())
diff --git a/bot/src/main/java/de/chojo/gamejam/server/ServerService.java b/bot/src/main/java/de/chojo/gamejam/server/ServerService.java
@@ -48,7 +48,7 @@ private ServerService(Configuration configuration) {
         this.configuration = configuration;
         IntStream.rangeClosed(configuration.serverManagement().minPort(), configuration.serverManagement().maxPort())
                 .forEach(freePorts::add);
-        this.dockerService = new DockerService(configuration.docker());
+        this.dockerService = new DockerService(configuration.docker(), configuration.plugins());
         this.dockerService.initDockerClient();
     }
 
@@ -61,7 +61,7 @@ public void shutdown() {
     @Override
     public void run() {
         for (var value : server.values()) {
-            if (!value.running()) continue;
+            if (!value.isRunning()) continue;
             try {
                 value.serverRequests()
                         .ifPresent(server -> {
@@ -127,7 +127,7 @@ public CompletableFuture<Boolean> syncVelocity() {
                 var team = optTeam.get();
                 log.info("Registered server for team {} with id {}", team.meta().name(), team.id());
                 var teamServer = new TeamServer(this, dockerService, team, configuration, registration.port(), registration.apiPort());
-                teamServer.running(true);
+                //teamServer.running(true);
                 server.put(team, teamServer);
                 freePorts.removeElement(registration.apiPort());
                 freePorts.removeElement(registration.port());
diff --git a/bot/src/main/java/de/chojo/gamejam/server/TeamServer.java b/bot/src/main/java/de/chojo/gamejam/server/TeamServer.java
diff --git a/compose.yml b/compose.yml
diff --git a/dev.compose.yml b/dev.compose.yml

Original file line number	Diff line number	Diff line change
`@@ -107,9 +107,9 @@ private void handle(@NotNull Context ctx) {`
`107`	`107`
`108`	`108`	`ctx.status(HttpStatus.ACCEPTED);`
`109`	`109`	`String restart = ctx.queryParam("restart");`
`110`		`- if ("true".equals(restart) && teamServer.running()) {`
	`110`	`+ if ("true".equals(restart) && teamServer.isRunning()) {`
`111`	`111`	`teamServer.restart();`
`112`		`- } else if (teamServer.running()) {`
	`112`	`+ } else if (teamServer.isRunning()) {`
`113`	`113`	`teamServer.send("say Plugin Updated");`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont`
`37`	`37`
`38`	`38`	`var teamServer = optServer.get();`
`39`	`39`
`40`		`- if (!teamServer.running()) {`
	`40`	`+ if (!teamServer.isRunning()) {`
`41`	`41`	`event.reply(context.localize("error.servernotrunning")).queue();`
`42`	`42`	`return;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont`
`24`	`24`	`if(optServer.isEmpty())return;`
`25`	`25`	`var teamServer = optServer.get();`
`26`	`26`	`if (teamServer.exists()) {`
`27`		`- teamServer.stop(true)`
`28`		`- .thenRun(() -> event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue());`
	`27`	`+ teamServer.stop();`
	`28`	`+ event.getHook().editOriginal(context.localize("command.server.process.restart.message.restarted")).queue();`
`29`	`29`	`event.reply(context.localize("command.server.process.restart.message.restarting")).queue();`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont`
`25`	`25`	`var teamServer = optServer.get();`
`26`	`26`	`if (teamServer.exists()) {`
`27`	`27`	`event.reply(context.localize("command.server.process.stop.message.stopping")).queue();`
`28`		`- teamServer.stop(false).thenRun(() -> event.getHook().editOriginal(`
	`28`	`+ teamServer.stop().thenRun(() -> event.getHook().editOriginal(`
`29`	`29`	`context.localize("command.server.process.stop.message.stopped")).queue());`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`var started = optTeam.map(serverService::get).map(server -> {`
`45`		`- var running = server.running();`
	`45`	`+ var running = server.isRunning();`
`46`	`46`	`server.restart();`
`47`	`47`	`return running;`
`48`	`48`	`}).orElse(false);`