Fix: Server Resource And Lifecycle Polish.

Author: RedxAx

src/main/java/redxax/oxy/remotely/ui/server/ServerConfigurationScreen.java

@@ -42,6 +42,7 @@
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import static restudio.rescreen.util.BrowserUtils.openBrowser;
@@ -59,6 +60,8 @@ private record InitialConfigLoad(List<String> extraFiles) {}
     private final RemotelyClient remotelyClient;
     private final boolean isReStudioCreation;
     private final String preselectedPlanName;
+    private final Consumer<Instance> creationInitializer;
+    private final Consumer<Instance> creationCallback;
 
     private final Map<String, String> remoteVariables = new HashMap<>();
     private final Map<String, String> originalRemoteVariables = new HashMap<>();
@@ -83,6 +86,18 @@ public ServerConfigurationScreen(Screen parent, Instance instance, RemoteHost re
     }
 
     public ServerConfigurationScreen(Screen parent, Instance instance, RemoteHost remoteHostContext, RemotelyClient remotelyClient, boolean isReStudioCreation, String preselectedPlanName) {
+        this(parent, instance, remoteHostContext, remotelyClient, isReStudioCreation, preselectedPlanName, null, null, null);
+    }
+
+    public ServerConfigurationScreen(Screen parent, RemoteHost remoteHostContext, RemotelyClient remotelyClient, ModLoader preset, Consumer<Instance> creationCallback) {
+        this(parent, null, remoteHostContext, remotelyClient, false, null, preset, null, creationCallback);
+    }
+
+    public ServerConfigurationScreen(Screen parent, RemoteHost remoteHostContext, RemotelyClient remotelyClient, ModLoader preset, Consumer<Instance> creationInitializer, Consumer<Instance> creationCallback) {
+        this(parent, null, remoteHostContext, remotelyClient, false, null, preset, creationInitializer, creationCallback);
+    }
+
+    private ServerConfigurationScreen(Screen parent, Instance instance, RemoteHost remoteHostContext, RemotelyClient remotelyClient, boolean isReStudioCreation, String preselectedPlanName, ModLoader preset, Consumer<Instance> creationInitializer, Consumer<Instance> creationCallback) {
         super();
         this.parent = parent;
         this.isEditMode = instance != null;
@@ -91,6 +106,8 @@ public ServerConfigurationScreen(Screen parent, Instance instance, RemoteHost re
         this.remotelyClient = remotelyClient;
         this.isReStudioCreation = isReStudioCreation;
         this.preselectedPlanName = preselectedPlanName;
+        this.creationInitializer = creationInitializer;
+        this.creationCallback = creationCallback;
 
         if (isEditMode) {
             this.tempInstance = new Instance(instance, instance.getName());
@@ -107,6 +124,9 @@ public ServerConfigurationScreen(Screen parent, Instance instance, RemoteHost re
             }
         } else {
             this.tempInstance = new Instance("New Server", remotelyClient.getHost().getGameVersion(), "");
+            if (preset != null) {
+                this.tempInstance.setModLoader(preset);
+            }
             this.isReStudioBackend = false;
             if (remoteHostContext != null) {
                 this.tempInstance.setBackendConfig(createBackendConfigForRemoteHost(remoteHostContext, null));
@@ -170,6 +190,9 @@ public void init() {
             if (screenClosed) {
                 return;
             }
+            if (!isEditMode && creationInitializer != null) {
+                creationInitializer.accept(tempInstance);
+            }
             setupSettingsUI(load.extraFiles());
         })).exceptionally(e -> {
             ScreenManager.getInstance().execute(() -> {
@@ -435,6 +458,9 @@ private void createNewLocalServer() {
         }).thenAccept(newInstance -> ScreenManager.getInstance().execute(() -> {
             handleOpMe(newInstance);
             newInstance.setState(InstanceState.STOPPED);
+            if (creationCallback != null) {
+                creationCallback.accept(newInstance);
+            }
         })).exceptionally(ex -> {
             ScreenManager.getInstance().execute(() -> {
                 Throwable cause = ex.getCause() != null ? ex.getCause() : ex;
@@ -471,6 +497,9 @@ private void createNewRemoteServer() {
             .thenAccept(newInstance -> ScreenManager.getInstance().execute(() -> {
                 handleOpMe(newInstance);
                 newInstance.setState(InstanceState.STOPPED);
+                if (creationCallback != null) {
+                    creationCallback.accept(newInstance);
+                }
                 notification.update().message("Remote Server Created").description(newInstance.getName()).type(Notification.Type.SUCCESS).loading(false).image(null).autoSlideOut(true);
             })).exceptionally(ex -> {
                 ScreenManager.getInstance().execute(() -> {

src/main/java/redxax/oxy/remotely/ui/server/ServerDetailsScreen.java

@@ -1,8 +1,11 @@
 package redxax.oxy.remotely.ui.server;
 
 import redxax.oxy.remotely.RemotelyClient;
-import redxax.oxy.remotely.discord.DiscordRpcBridge;
-import redxax.oxy.remotely.data.integrations.luckperms.LuckPermsService;
+import redxax.oxy.remotely.discord.DiscordRpcBridge;
+import redxax.oxy.remotely.data.integrations.luckperms.LuckPermsService;
+import redxax.oxy.remotely.network.NetworkDefinition;
+import redxax.oxy.remotely.network.NetworkMember;
+import redxax.oxy.remotely.network.NetworkRuntimeSnapshot;
 import redxax.oxy.remotely.servers.QuickServerSyncManager;
 import redxax.oxy.remotely.servers.ReProxyManager;
 import redxax.oxy.remotely.session.TerminalSession;
@@ -79,7 +82,8 @@ public class ServerDetailsScreen extends InstanceDetailsScreen implements IDebug
     private final RemotelyClient remotelyClient;
     private final Object parent;
     private final Instance initialInstanceToOpen;
-    private IconButton startIconButton;
+    private IconButton startIconButton;
+    private PopupWidget networkSummaryPopup;
     private Instance sidecarInstance;
 
     private final Map<TabContext, TerminalSession> contextInfos = new HashMap<>();
@@ -1628,7 +1632,7 @@ private static String formatBytes(long bytes) {
         return String.format(Locale.ROOT, "%.1f%s", b, units[idx]);
     }
 
-    private static String formatUptime(long uptimeMs) {
+    private static String formatUptime(long uptimeMs) {
         if (uptimeMs <= 0) return "-";
         long totalSeconds = uptimeMs / 1000;
         long days = totalSeconds / 86400;
@@ -1639,17 +1643,59 @@ private static String formatUptime(long uptimeMs) {
         if (days > 0) return days + "d " + hours + "h";
         if (hours > 0) return hours + "h " + minutes + "m";
         if (minutes > 0) return minutes + "m " + seconds + "s";
-        return seconds + "s";
-    }
-
-    private static final class ServerTabStatusContext extends TabContext implements TabStatusContext {
+        return seconds + "s";
+    }
+
+    private void showNetworkSummary(Instance instance) {
+        if (instance == null || remotelyClient.getNetworkManager() == null) {
+            return;
+        }
+        NetworkDefinition network = remotelyClient.getNetworkManager().getNetworkForInstance(instance.getInstanceId()).orElse(null);
+        if (network == null) {
+            return;
+        }
+        NetworkMember member = network.members().stream().filter(candidate -> candidate.instanceId().equals(instance.getInstanceId())).findFirst().orElse(null);
+        NetworkRuntimeSnapshot snapshot = remotelyClient.getNetworkManager().getRuntimeSnapshot(network.networkId());
+        if (networkSummaryPopup != null) {
+            remove(networkSummaryPopup);
+        }
+        String role = member == null ? "Member" : member.isProxy() ? "Proxy" : formatNetworkRole(member.role().name());
+        String route = member == null ? "Unavailable" : member.routeName() + " • " + member.address() + ":" + member.port();
+        String presence = snapshot.connected() ? snapshot.players() + " Shared Players" : "ReSync " + formatNetworkRole(snapshot.state().name());
+        AnimatedButton identity = new AnimatedButton.Builder().label(role + " • " + network.members().size() + " Servers").active(false).accentType(ThemeManager.getAccent("calm")).build();
+        AnimatedButton endpoint = new AnimatedButton.Builder().label(route).active(false).accentType(ThemeManager.getAccent("calm")).build();
+        AnimatedButton runtime = new AnimatedButton.Builder().label(presence).active(false).accentType(ThemeManager.getAccent(snapshot.connected() ? "nice" : "warning")).build();
+        PopupWidget.Builder builder = new PopupWidget.Builder(network.name()).size(390, 135);
+        builder.addRow("identity", "Network", true, 22, identity);
+        builder.addRow("route", "Route", true, 22, endpoint);
+        builder.addRow("presence", "Presence", true, 22, runtime);
+        networkSummaryPopup = builder.build();
+        networkSummaryPopup.setX((width - networkSummaryPopup.getWidth()) / 2);
+        networkSummaryPopup.setY((height - networkSummaryPopup.getHeight()) / 2);
+        addDrawableChild(networkSummaryPopup);
+        networkSummaryPopup.show();
+    }
+
+    private static String formatNetworkRole(String value) {
+        String normalized = value == null ? "" : value.toLowerCase(Locale.ROOT).replace('_', ' ');
+        StringBuilder result = new StringBuilder(normalized.length());
+        boolean capitalize = true;
+        for (char character : normalized.toCharArray()) {
+            result.append(capitalize ? Character.toUpperCase(character) : character);
+            capitalize = character == ' ';
+        }
+        return result.toString();
+    }
+
+    private final class ServerTabStatusContext extends TabContext implements TabStatusContext {
         private static final long CONNECTION_REFRESH_MS = 30000;
         private static final long COPIED_DISPLAY_MS = 2000;
 
         private IconButton connectionWidget;
-        private IconButton uptimeWidget;
-        private IconButton cpuWidget;
-        private IconButton ramWidget;
+        private IconButton uptimeWidget;
+        private IconButton cpuWidget;
+        private IconButton ramWidget;
+        private IconButton networkWidget;
         private String connectionInfo = "Loading...";
         private long copiedUntilMs;
         private long copyActionToken;
@@ -1681,7 +1727,18 @@ public void setupStatusBar(StatusBarBuilder builder) {
                     .transparent(true).animateElevation(false).entranceAnimation(false).elevateOnFocused(false)
                     .build();
             }
-            updateConnectionWidget();
+            updateConnectionWidget();
+
+            if (networkWidget == null) {
+                networkWidget = new IconButton.Builder()
+                    .imagePath("velocity.png")
+                    .autoWidthOnTextChange(true)
+                    .size(0, 14)
+                    .iconSize(12).iconPadding(2)
+                    .transparent(true).animateElevation(false).entranceAnimation(false).elevateOnFocused(false)
+                    .build();
+            }
+            updateNetworkWidget();
 
             if (uptimeWidget == null) {
                 uptimeWidget = new IconButton.Builder()
@@ -1702,8 +1759,9 @@ public void setupStatusBar(StatusBarBuilder builder) {
                         .build();
             }
 
-            builder.addLeft(connectionWidget);
-            builder.addRight(uptimeWidget);
+            builder.addLeft(connectionWidget);
+            builder.addLeft(networkWidget);
+            builder.addRight(uptimeWidget);
             builder.addRight(cpuWidget);
             builder.addRight(ramWidget);
         }
@@ -1817,8 +1875,9 @@ private void finishRequest() {
             requestInFlight = false;
         }
 
-        private void update(ResourceUsageFeature.ResourceUsage usage) {
-            int players = 0;
+        private void update(ResourceUsageFeature.ResourceUsage usage) {
+            updateNetworkWidget();
+            int players = 0;
             try {
                 players = PlayerManagerController.getOrCreate(instance).getOnlinePlayerCount();
             } catch (Exception ignored) {
@@ -1846,10 +1905,30 @@ private void update(ResourceUsageFeature.ResourceUsage usage) {
             if (usage.memoryLimitBytes() > 0) {
                 ramWidget.setMessage("RAM: " + formatBytes(usage.memoryBytes()) + "/" + formatBytes(usage.memoryLimitBytes()));
             } else {
-                ramWidget.setMessage("RAM: " + formatBytes(usage.memoryBytes()));
-            }
-        }
-    }
+                ramWidget.setMessage("RAM: " + formatBytes(usage.memoryBytes()));
+            }
+        }
+
+        private void updateNetworkWidget() {
+            if (networkWidget == null || instance == null || remotelyClient.getNetworkManager() == null) {
+                return;
+            }
+            NetworkDefinition network = remotelyClient.getNetworkManager().getNetworkForInstance(instance.getInstanceId()).orElse(null);
+            if (network == null) {
+                networkWidget.setVisible(false);
+                networkWidget.setOnClick(null);
+                return;
+            }
+            NetworkMember member = network.members().stream().filter(candidate -> candidate.instanceId().equals(instance.getInstanceId())).findFirst().orElse(null);
+            NetworkRuntimeSnapshot snapshot = remotelyClient.getNetworkManager().getRuntimeSnapshot(network.networkId());
+            String role = member == null ? "Member" : member.isProxy() ? "Proxy" : formatNetworkRole(member.role().name());
+            String players = snapshot.connected() ? " • " + snapshot.players() + " Players" : "";
+            networkWidget.setMessage(network.name() + " • " + role + players);
+            networkWidget.setHint(snapshot.connected() ? "Network-Wide ReSync Presence" : "ReSync " + formatNetworkRole(snapshot.state().name()));
+            networkWidget.setOnClick(() -> showNetworkSummary(instance));
+            networkWidget.setVisible(true);
+        }
+    }
 
     @Override
     public List<String> getLeftLines() {

src/main/java/redxax/oxy/remotely/ui/server/ServerIconManager.java

@@ -22,6 +22,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
 
 import static redxax.oxy.remotely.util.DevUtil.devPrint;
 
@@ -393,7 +394,7 @@ private CompletableFuture<Boolean> uploadToRemote(Instance instance, BufferedIma
 
     private void deleteDirectoryQuietly(Path dir) {
         if (dir == null || !Files.exists(dir)) return;
-        try (java.util.stream.Stream<Path> walk = Files.walk(dir)) {
+        try (Stream<Path> walk = Files.walk(dir)) {
             walk.sorted(Comparator.reverseOrder()).forEach(path -> {
                 try {
                     Files.deleteIfExists(path);