feat: extend CloudPlayer API with session details, timestamps, and properties

Author: FllipEis

api/src/main/java/app/simplecloud/api/internal/player/CloudPlayerImpl.java

@@ -15,6 +15,9 @@
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 
 import java.time.Duration;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -32,26 +35,48 @@ public class CloudPlayerImpl implements CloudPlayer, ForwardingAudience.Single {
     private final UUID uniqueId;
     private final String name;
     private final String displayName;
-    private final String connectedProxyId;
-    private final String connectedServerId;
+    private final String connectedProxyName;
+    private final String connectedServerName;
+    private final boolean online;
+    private final long onlineTimeSeconds;
+    private final String sessionId;
+    private final String firstSeen;
+    private final String lastSeen;
+    private final Map<String, String> properties;
 
     public CloudPlayerImpl(
             Connection natsConnection,
             String networkId,
             UUID uniqueId,
             String name,
             String displayName,
-            String connectedProxyId,
-            String connectedServerId
+            String connectedProxyName,
+            String connectedServerName,
+            boolean online,
+            long onlineTimeSeconds,
+            String sessionId,
+            String firstSeen,
+            String lastSeen,
+            Map<String, String> properties
     ) {
         this.natsConnection = natsConnection;
         this.networkId = networkId;
         this.audience = RemoteAudience.builder(natsConnection, networkId).forPlayer(uniqueId);
         this.uniqueId = uniqueId;
         this.name = name;
         this.displayName = displayName;
-        this.connectedProxyId = connectedProxyId;
-        this.connectedServerId = connectedServerId;
+        this.connectedProxyName = connectedProxyName;
+        this.connectedServerName = connectedServerName;
+        this.online = online;
+        this.onlineTimeSeconds = onlineTimeSeconds;
+        this.sessionId = sessionId;
+        this.firstSeen = firstSeen;
+        this.lastSeen = lastSeen;
+        if (properties == null || properties.isEmpty()) {
+            this.properties = Collections.emptyMap();
+        } else {
+            this.properties = Collections.unmodifiableMap(new HashMap<>(properties));
+        }
     }
 
     @Override
@@ -77,13 +102,43 @@ public String getDisplayName() {
     }
 
     @Override
-    public String getConnectedProxyId() {
-        return connectedProxyId;
+    public String getConnectedProxyName() {
+        return connectedProxyName;
     }
 
     @Override
-    public String getConnectedServerId() {
-        return connectedServerId;
+    public String getConnectedServerName() {
+        return connectedServerName;
+    }
+
+    @Override
+    public boolean isOnline() {
+        return online;
+    }
+
+    @Override
+    public long getOnlineTimeSeconds() {
+        return onlineTimeSeconds;
+    }
+
+    @Override
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    @Override
+    public String getFirstSeen() {
+        return firstSeen;
+    }
+
+    @Override
+    public String getLastSeen() {
+        return lastSeen;
+    }
+
+    @Override
+    public Map<String, String> getProperties() {
+        return properties;
     }
 
     @Override

api/src/main/java/app/simplecloud/api/internal/player/PlayerApiImpl.java

@@ -128,7 +128,13 @@ private CloudPlayer convertPlayer(ModelsOnlinePlayerResponse player) {
                 player.getName(),
                 player.getDisplayName(),
                 player.getConnectedProxyName(),
-                player.getConnectedServerName()
+                player.getConnectedServerName(),
+                player.getOnline() != null && player.getOnline(),
+                player.getOnlineTimeSeconds() != null ? player.getOnlineTimeSeconds().longValue() : 0L,
+                player.getSessionId(),
+                player.getFirstSeen(),
+                player.getLastSeen(),
+                player.getProperties()
         );
     }
 
@@ -140,7 +146,13 @@ private CloudPlayer convertPlayerResponse(ModelsPlayerResponse player) {
                 player.getName(),
                 player.getDisplayName(),
                 player.getConnectedProxyName(),
-                player.getConnectedServerName()
+                player.getConnectedServerName(),
+                player.getOnline() != null && player.getOnline(),
+                player.getOnlineTimeSeconds() != null ? player.getOnlineTimeSeconds().longValue() : 0L,
+                player.getSessionId(),
+                player.getFirstSeen(),
+                player.getLastSeen(),
+                player.getProperties()
         );
     }
 }

api/src/main/java/app/simplecloud/api/player/CloudPlayer.java

@@ -3,6 +3,7 @@
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
@@ -61,18 +62,60 @@ public interface CloudPlayer extends Audience {
     String getDisplayName();
 
     /**
-     * Returns the unique ID of the proxy the player is connected through.
+     * Returns the name of the proxy the player is connected through.
      *
-     * @return the proxy server ID
+     * @return the proxy name, or null if unavailable
      */
-    String getConnectedProxyId();
+    String getConnectedProxyName();
 
     /**
-     * Returns the unique ID of the server the player is currently on.
+     * Returns the name of the server the player is currently on.
      *
-     * @return the server ID, or null if not connected to a backend server
+     * @return the server name, or null if not connected to a backend server
      */
-    String getConnectedServerId();
+    String getConnectedServerName();
+
+    /**
+     * Returns whether the player is currently online.
+     *
+     * @return true if online
+     */
+    boolean isOnline();
+
+    /**
+     * Returns accumulated online time in seconds.
+     *
+     * @return total online time in seconds
+     */
+    long getOnlineTimeSeconds();
+
+    /**
+     * Returns the active session ID when online.
+     *
+     * @return session ID, or null if unavailable
+     */
+    String getSessionId();
+
+    /**
+     * Returns the first seen timestamp as returned by the controller.
+     *
+     * @return ISO-8601 timestamp string, or null if unavailable
+     */
+    String getFirstSeen();
+
+    /**
+     * Returns the last seen timestamp as returned by the controller.
+     *
+     * @return ISO-8601 timestamp string, or null if unavailable
+     */
+    String getLastSeen();
+
+    /**
+     * Returns custom player properties.
+     *
+     * @return immutable map of properties (empty if none)
+     */
+    Map<String, String> getProperties();
 
     /**
      * Kicks the player from the network with the specified reason.

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     `signing`
 }
 
-val baseVersion = "0.1.0-platform.16"
+val baseVersion = "0.1.0-platform.17"
 val commitHash = System.getenv("COMMIT_HASH")
 val isSnapshot = commitHash != null