Add Server Uptime to Performance as numbers tables

AuroraLS3 · AuroraLS3 · commit 6fb01a068c37 · 2025-08-23T18:10:38.000+03:00
Modified server occupied number to use new uptime calculation instead of relying on downtime calculation Affects issues: - Close #3696
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/TPSMutator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/domain/mutators/TPSMutator.java
@@ -120,6 +120,28 @@ public long serverDownTime() {
         return downTime;
     }
 
+    public long serverUptime() {
+        long lastDate = -1;
+        long uptime = 0;
+        tpsData.sort(new TPSComparator());
+
+        for (TPS tps : tpsData) {
+            long date = tps.getDate();
+            if (lastDate == -1) {
+                lastDate = date;
+                continue;
+            }
+
+            long diff = date - lastDate;
+            if (diff < TimeUnit.MINUTES.toMillis(2L)) {
+                uptime += diff;
+            }
+            lastDate = date;
+        }
+
+        return uptime;
+    }
+
     public long serverOccupiedTime() {
         long lastDate = -1;
         long activeTime = 0;
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONCreator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/OnlineActivityOverviewJSONCreator.java
@@ -25,7 +25,6 @@
 import com.djrapitops.plan.gathering.domain.TPS;
 import com.djrapitops.plan.identification.ServerUUID;
 import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.DisplaySettings;
 import com.djrapitops.plan.settings.config.paths.TimeSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.storage.database.Database;
@@ -188,11 +187,6 @@ private Map<String, Object> createNumbersMap(ServerUUID serverUUID) {
         numbers.put("session_length_7d_avg", sessionLengthAvgWeek);
         numbers.put("session_length_24h_avg", sessionLengthAvgDay);
 
-        TPSMutator tpsMutator = new TPSMutator(db.query(TPSQueries.fetchTPSDataOfServer(monthAgo, now, serverUUID)));
-        numbers.put("average_tps", decimalFormatter.apply(tpsMutator.averageTPS()));
-        numbers.put("low_tps_spikes", tpsMutator.lowTpsSpikeCount(config.get(DisplaySettings.GRAPH_TPS_THRESHOLD_MED)));
-        numbers.put("downtime", tpsMutator.serverDownTime());
-
         return numbers;
     }
 
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONCreator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/PerformanceJSONCreator.java
@@ -98,6 +98,10 @@ private Map<String, Object> createNumbersMap(List<TPS> tpsData) {
         numbers.put("server_downtime_7d", tpsDataWeek.serverDownTime());
         numbers.put("server_downtime_24h", tpsDataDay.serverDownTime());
 
+        numbers.put("server_uptime_30d", tpsDataMonth.serverUptime());
+        numbers.put("server_uptime_7d", tpsDataWeek.serverUptime());
+        numbers.put("server_uptime_24h", tpsDataDay.serverUptime());
+
         numbers.put("players_30d", format(tpsDataMonth.averagePlayers()));
         numbers.put("players_7d", format(tpsDataWeek.averagePlayers()));
         numbers.put("players_24h", format(tpsDataDay.averagePlayers()));
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONCreator.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/SessionsOverviewJSONCreator.java
@@ -71,7 +71,7 @@ private Map<String, Object> createInsightsMap(ServerUUID serverUUID) {
 
         Map<String, Object> insights = new HashMap<>();
 
-        long uptime = TimeUnit.DAYS.toMillis(30L) - tpsMutator.serverDownTime();
+        long uptime = tpsMutator.serverUptime();
         long occupied = tpsMutator.serverOccupiedTime();
         insights.put("server_occupied", occupied);
         insights.put("server_occupied_perc", percentage.apply(Percentage.calculate(occupied, uptime, -1)));
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/NetworkPerformanceJSONResolver.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/NetworkPerformanceJSONResolver.java
@@ -50,6 +50,7 @@
 import javax.inject.Singleton;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -160,9 +161,9 @@ private Map<String, Object> createNumbersMap(Map<Integer, List<TPS>> tpsData) {
         numbers.put("low_tps_spikes_7d", tpsDataWeek.lowTpsSpikeCount(tpsThreshold));
         numbers.put("low_tps_spikes_24h", tpsDataDay.lowTpsSpikeCount(tpsThreshold));
 
-        long downtimeMonth = getTotalDowntime(mutatorsOfServersMonth);
-        long downtimeWeek = getTotalDowntime(mutatorsOfServersWeek);
-        long downtimeDay = getTotalDowntime(mutatorsOfServersDay);
+        long downtimeMonth = getTotal(mutatorsOfServersMonth, TPSMutator::serverDownTime);
+        long downtimeWeek = getTotal(mutatorsOfServersWeek, TPSMutator::serverDownTime);
+        long downtimeDay = getTotal(mutatorsOfServersDay, TPSMutator::serverDownTime);
         numbers.put("server_downtime_30d", downtimeMonth);
         numbers.put("server_downtime_7d", downtimeWeek);
         numbers.put("server_downtime_24h", downtimeDay);
@@ -177,6 +178,23 @@ private Map<String, Object> createNumbersMap(Map<Integer, List<TPS>> tpsData) {
             numbers.put("avg_server_downtime_24h", "-");
         }
 
+        long uptimeMonth = getTotal(mutatorsOfServersMonth, TPSMutator::serverUptime);
+        long uptimeWeek = getTotal(mutatorsOfServersWeek, TPSMutator::serverUptime);
+        long uptimeDay = getTotal(mutatorsOfServersDay, TPSMutator::serverUptime);
+        numbers.put("server_uptime_30d", uptimeMonth);
+        numbers.put("server_uptime_7d", uptimeWeek);
+        numbers.put("server_uptime_24h", uptimeDay);
+
+        if (!tpsData.isEmpty()) {
+            numbers.put("avg_server_uptime_30d", uptimeMonth / tpsData.size());
+            numbers.put("avg_server_uptime_7d", uptimeWeek / tpsData.size());
+            numbers.put("avg_server_uptime_24h", uptimeDay / tpsData.size());
+        } else {
+            numbers.put("avg_server_uptime_30d", "-");
+            numbers.put("avg_server_uptime_7d", "-");
+            numbers.put("avg_server_uptime_24h", "-");
+        }
+
         numbers.put("players_30d", format(tpsDataMonth.averagePlayers()));
         numbers.put("players_7d", format(tpsDataWeek.averagePlayers()));
         numbers.put("players_24h", format(tpsDataDay.averagePlayers()));
@@ -199,10 +217,10 @@ private Map<String, Object> createNumbersMap(Map<Integer, List<TPS>> tpsData) {
         return numbers;
     }
 
-    private long getTotalDowntime(Map<Integer, TPSMutator> mutatorsOfServersMonth) {
+    private long getTotal(Map<Integer, TPSMutator> mutatorsOfServersMonth, Function<TPSMutator, Long> transform) {
         long downTime = 0L;
         for (TPSMutator tpsMutator : mutatorsOfServersMonth.values()) {
-            downTime += tpsMutator.serverDownTime();
+            downTime += transform.apply(tpsMutator);
         }
         return downTime;
     }
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java b/Plan/common/src/main/java/com/djrapitops/plan/settings/locale/lang/HtmlLang.java
@@ -193,6 +193,7 @@ public enum HtmlLang implements Lang {
     LABEL_SERVER_DOWNTIME("html.label.serverDowntime", "Server Downtime"),
     LABEL_TOTAL_SERVER_DOWNTIME("html.label.totalServerDowntime", "Total Server Downtime"),
     LABEL_AVERAGE_SERVER_DOWNTIME("html.label.averageServerDowntime", "Average Downtime / Server"),
+    LABEL_AVERAGE_SERVER_UPTIME("html.label.averageServerUptime", "Average Uptime / Server"),
     LABEL_DURING_LOW_TPS("html.label.duringLowTps", "During Low TPS Spikes:"),
     TEXT_NO_LOW_TPS("html.text.noLowTps", "No low tps spikes"),
     // Player Page
@@ -264,6 +265,7 @@ public enum HtmlLang implements Lang {
     LABEL_MAX_FREE_DISK("html.label.maxFreeDisk", "Max Free Disk"),
     LABEL_MIN_FREE_DISK("html.label.minFreeDisk", "Min Free Disk"),
     LABEL_CURRENT_UPTIME("html.label.currentUptime", "Current Uptime"),
+    LABEL_SERVER_UPTIME("html.label.serverUptime", "Server Uptime"),
     LABEL_TOTAL("html.label.total", "Total"),
     LABEL_ALPHABETICAL("html.label.alphabetical", "Alphabetical"),
     LABEL_SORT_BY("html.label.sortBy", "Sort By"),
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_CN.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "平均游玩时间"
         averageRamUsage: "平均内存使用量"
         averageServerDowntime: "平均停机时间/服务器"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "平均会话时长"
         averageSessions: "平均会话"
         averageTps: "平均 TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "最近 30 天内的服务器游玩时间"
         serverPossiblyOffline: "可能处于离线状态"
         serverSelector: "服务器选择器"
+        serverUptime: "Server Uptime"
         servers: "服务器"
         serversTitle: "服务器"
         session: "会话次数"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_CS.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Průměr herní doby"
         averageRamUsage: "Průměrné využití RAM"
         averageServerDowntime: "Průměrná doba vypnutí / Serveru"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Průměrná délka připojení"
         averageSessions: "Průměr připojení"
         averageTps: "Průměr TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Herní čas serveru za 30 dní"
         serverPossiblyOffline: "Pravděpodobně offline"
         serverSelector: "Výběr serveru"
+        serverUptime: "Server Uptime"
         servers: "Servery"
         serversTitle: "SERVERY"
         session: "Relace"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_DE.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Durschnittliche Spielzeit"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Durschnittliche Sitzungslänge"
         averageSessions: "Durchschnittliche Sessions"
         averageTps: "Durschnittliche TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Server Spielzeit für 30 Tage"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Server"
         serversTitle: "SERVER"
         session: "Sitzung"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_EN.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Average Playtime"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Average Session Length"
         averageSessions: "Average Sessions"
         averageTps: "Average TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Server Playtime for 30 days"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Servers"
         serversTitle: "SERVERS"
         session: "Session"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_ES.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Jugabilidad promedio"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Duración de sesion promedio"
         averageSessions: "Sesiones promedio"
         averageTps: "TPS promedio"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Jugabilidad de 30 días"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Servidores"
         serversTitle: "SERVERS"
         session: "Sesión"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_FI.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Keskimäräinen peliaika"
         averageRamUsage: "Keskimääräinen Muistin Käyttö"
         averageServerDowntime: "Keskimääräinen Sammutettunaoloaika / Palvelin"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Keskimäräinen istunnon pituus"
         averageSessions: "Keskimääräinen Istuntomäärä"
         averageTps: "Keskimäräinen TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Palvelimen peliaika 30 päivälle"
         serverPossiblyOffline: "Mahdollisesti sammutettu"
         serverSelector: "Palvelimen valitsin"
+        serverUptime: "Server Uptime"
         servers: "Palvelimet"
         serversTitle: "PALVELIMET"
         session: "Istunto"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_FR.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Temps de Jeu moyen"
         averageRamUsage: "Utilisation moyenne de la RAM"
         averageServerDowntime: "Temps d'arrêt moyen par serveur"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Durée moyenne d'une Session"
         averageSessions: "Quantité moyenne de Sessions"
         averageTps: "TPS moyen"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Temps de Jeu du Serveur sur 30 Jours"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Serveurs"
         serversTitle: "SERVEURS"
         session: "Session"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_IT.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Media Tempo di Gioco"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Media Lunghezza Sessione"
         averageSessions: "Average Sessions"
         averageTps: "Media TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Tempo di Gioco Server di 30 giorni"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Servers"
         serversTitle: "SERVERS"
         session: "Session"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_JA.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "平均プレイ時間"
         averageRamUsage: "平均メモリ使用量"
         averageServerDowntime: "平均ダウンタイム / サーバー"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "平均接続時間"
         averageSessions: "平均セッション"
         averageTps: "平均TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "各サーバーでの1ヶ月のプレイ時間"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "サーバーセレクター"
+        serverUptime: "Server Uptime"
         servers: "接続されているサーバー"
         serversTitle: "接続されているサーバー"
         session: "オンライン"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_KO.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "평균 플레이 타임"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "평균 접속 시간(세션 길이)"
         averageSessions: "Average Sessions"
         averageTps: "평균 TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "서버 플레이 타임 - 최근 30일"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "서버 목록"
         serversTitle: "서버 목록"
         session: "세션"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_NL.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Gemiddelde Speeltijd"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Gemiddelde sessieduur"
         averageSessions: "Gemiddelde sessies"
         averageTps: "Gemiddelde TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Server speeltijd voor 30 dagen"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Servers"
         serversTitle: "SERVERS"
         session: "Sessie"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_PT_BR.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Average Playtime"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Average Session Length"
         averageSessions: "Average Sessions"
         averageTps: "Average TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Server Playtime for 30 days"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Servidores"
         serversTitle: "SERVERS"
         session: "Sessão"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_RU.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Среднее время игры"
         averageRamUsage: "Среднее использование памяти"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Средняя продолжительность сессии"
         averageSessions: "Средняя сессия"
         averageTps: "Средний TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Время игры на сервере за 30 дней"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Серверы"
         serversTitle: "СЕРВЕРЫ"
         session: "Сессия"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_TR.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Ortalama Oyun Süresi"
         averageRamUsage: "Average RAM Usage"
         averageServerDowntime: "Average Downtime / Server"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Ortalama Oturum Uzunluğu"
         averageSessions: "Ortalama Oturumlar"
         averageTps: "Ortalama TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "30 günlük Sunucu Oynatma Süresi"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Server selector"
+        serverUptime: "Server Uptime"
         servers: "Sunucular"
         serversTitle: "SUNUCULAR"
         session: "Oturum"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_UK.yml
@@ -316,6 +316,7 @@ html:
         averagePlaytime: "Середній час гри"
         averageRamUsage: "Середнє використання пам'яті"
         averageServerDowntime: "Середній час простою / сервер"
+        averageServerUptime: "Average Uptime / Server"
         averageSessionLength: "Середня тривалість сесії"
         averageSessions: "Середня сесія"
         averageTps: "Середній TPS"
@@ -580,6 +581,7 @@ html:
         serverPlaytime30days: "Час гри на сервері за 30 днів"
         serverPossiblyOffline: "Possibly offline"
         serverSelector: "Вибір сервера"
+        serverUptime: "Server Uptime"
         servers: "Сервери"
         serversTitle: "Сервери"
         session: "Сесія"
diff --git a/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml b/Plan/common/src/main/resources/assets/plan/locale/locale_ZH_TW.yml
diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/cache/JSONStorageTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/cache/JSONStorageTest.java
diff --git a/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.jsx b/Plan/react/dashboard/src/components/cards/network/QuickViewDataCard.jsx
diff --git a/Plan/react/dashboard/src/components/table/PerformanceAsNumbersTable.jsx b/Plan/react/dashboard/src/components/table/PerformanceAsNumbersTable.jsx
