Record uptime statistics

src/agent/main/java/org/comroid/mcsd/agent/MinecraftServerHubAgent.java

@@ -99,6 +99,7 @@ public Event.Listener<GatewayPacket> gatewayListener(@Autowired GatewayClient ga
     public Map<Runnable, Duration> cronjobs() {
         return Map.of(
                 this::$cronWatchdog, MinecraftServerHubConfig.CronRate_Watchdog,
+                this::$cronUptime, MinecraftServerHubConfig.CronRate_Uptime,
                 this::$cronBackup, MinecraftServerHubConfig.CronRate_Queue,
                 this::$cronUpdate, MinecraftServerHubConfig.CronRate_Queue
         );
@@ -134,6 +135,16 @@ public Map<Runnable, Duration> startCronjobs(@Autowired TaskScheduler scheduler,
         cronLog.log(Level.FINER, "Watchdog finished");
     }
 
+    @Synchronized
+    private void $cronUptime() {
+        cronLog.log(Level.FINEST, "Running Uptime");
+        agentRunner.streamServers()
+                .filter(Server::isEnabled)
+                .map(agentRunner::process)
+                .forEach(ServerProcess::pushUptime);
+        cronLog.log(Level.FINER, "Uptime finished");
+    }
+
     @SneakyThrows
     @Synchronized
     private void $cronBackup() {

src/agent/main/java/org/comroid/mcsd/agent/ServerProcess.java

@@ -11,9 +11,12 @@
 import org.comroid.mcsd.api.model.IStatusMessage;
 import org.comroid.mcsd.api.model.Status;
 import org.comroid.mcsd.core.entity.Server;
+import org.comroid.mcsd.core.entity.ServerUptimeEntry;
 import org.comroid.mcsd.core.repo.ServerRepo;
+import org.comroid.mcsd.core.repo.ServerUptimeRepo;
 import org.comroid.util.*;
 import org.intellij.lang.annotations.Language;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
@@ -68,6 +71,20 @@ public void pushStatus(IStatusMessage message) {
         bean(Event.Bus.class, "eventBus").publish(server.getId().toString(), message);
     }
 
+    public void pushUptime() {
+        server.status()
+                .thenCombine(getState() == State.Running
+                                ? OS.current.getRamUsage(process.pid())
+                                : CompletableFuture.completedFuture(0L),
+                        (stat, ram) -> new ServerUptimeEntry(server,
+                                currentStatus.getStatus(),
+                                stat.getPlayers() != null ? stat.getPlayers().size() : stat.getPlayerCount(),
+                                ram,
+                                currentStatus.getMessage()))
+                .thenAccept(bean(ServerUptimeRepo.class)::save)
+                .join();
+    }
+
     public boolean pushMaintenance(boolean val) { //todo
         var is = server.isMaintenance();
         runner.getServers().setMaintenance(server.getId(), val);

src/api/main/java/org/comroid/mcsd/api/dto/StatusMessage.java

@@ -16,9 +16,9 @@
 public class StatusMessage {
     private final Instant timestamp = Instant.now();
     private final @NotNull UUID targetId;
-    private @With @lombok.Builder.Default Status status = Status.Offline;
-    private @With @lombok.Builder.Default @Nullable Status rcon = Status.Offline;
-    private @With @lombok.Builder.Default @Nullable Status ssh = Status.Offline;
+    private @With @lombok.Builder.Default Status status = Status.Unknown;
+    private @With @lombok.Builder.Default @Nullable Status rcon = Status.Unknown;
+    private @With @lombok.Builder.Default @Nullable Status ssh = Status.Unknown;
     private @With @lombok.Builder.Default int playerCount = 0;
     private @With @lombok.Builder.Default int playerMax = 0;
     private @With @Nullable String motd;

src/core/main/java/org/comroid/mcsd/core/MinecraftServerHubConfig.java

@@ -31,6 +31,7 @@
 @EnableJpaRepositories(basePackages = "org.comroid.mcsd.core.repo")
 public class MinecraftServerHubConfig {
     public static final Duration CronRate_Watchdog = Duration.ofSeconds(10);
+    public static final Duration CronRate_Uptime = Duration.ofMinutes(1);
     public static final Duration CronRate_Queue = Duration.ofHours(1);
     public static final Logger cronLog = Logger.getLogger("cron");
 

src/core/main/java/org/comroid/mcsd/core/entity/Server.java

@@ -232,7 +232,8 @@ public CompletableFuture<StatusMessage> status() {
                         return null;
                     return v;
                 }), "Status cache outdated"))
-                .exceptionally(t -> {
+                .exceptionally(t ->
+                {
                     log.debug("Unable to get server status from cache ["+t.getMessage()+"], using Query...");
                     log.trace("Exception was", t);
                     try (var query = new MCQuery(host, getQueryPort())) {
@@ -278,7 +279,7 @@ public CompletableFuture<StatusMessage> status() {
                     statusCache.put(getId(), msg);
                     return msg;
                 })
-                .orTimeout(statusTimeout.toSeconds() + 1, TimeUnit.SECONDS);
+                .completeOnTimeout(new StatusMessage(getId()), (long) (statusTimeout.toSeconds() * 1.5), TimeUnit.SECONDS);
     }
 
     public Optional<ShConnection> shCon() {

src/core/main/java/org/comroid/mcsd/core/entity/ServerUptimeEntry.java

@@ -0,0 +1,33 @@
+package org.comroid.mcsd.core.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.comroid.mcsd.api.model.Status;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+
+@Data
+@Entity
+@NoArgsConstructor
+public class ServerUptimeEntry {
+    private static final Object lock = new Object();
+
+    private @Id Instant timestamp;
+    private @ManyToOne Server server;
+    private Status status;
+    private int players;
+    private long ramKB;
+    private @Nullable String message;
+
+    public ServerUptimeEntry(Server server, Status status, int players, long ramKB, @Nullable String message) {
+        synchronized (lock) {
+            timestamp = Instant.now();
+        }
+        this.server = server;
+        this.status = status;
+        this.players = players;
+        this.ramKB = ramKB;
+        this.message = message;
+    }
+}

src/core/main/java/org/comroid/mcsd/core/repo/ServerUptimeRepo.java

@@ -0,0 +1,9 @@
+package org.comroid.mcsd.core.repo;
+
+import org.comroid.mcsd.core.entity.ServerUptimeEntry;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.UUID;
+
+public interface ServerUptimeRepo extends CrudRepository<ServerUptimeEntry, UUID> {
+}