feat: add redis username support

Author: Sceri

README.md

@@ -63,6 +63,7 @@ Aggregate data across multiple servers using Redis. Perfect for server networks
       "Redis": {
         "Host": "redis.example.com",
         "Port": 6379,
+        "Username": "optional",
         "Password": "optional",
         "Database": 0,
         "UseTLS": false
@@ -81,7 +82,8 @@ Aggregate data across multiple servers using Redis. Perfect for server networks
 | `Store.Type` | `"redis"` | Storage backend type (only `redis` supported) |
 | `Store.Redis.Host` | `"localhost"` | Redis server hostname |
 | `Store.Redis.Port` | `6379` | Redis server port |
-| `Store.Redis.Password` | `null` | Redis password (optional) |
+| `Store.Redis.Username` | `null` | Redis username for ACL auth (Redis 6+) |
+| `Store.Redis.Password` | `null` | Redis password |
 | `Store.Redis.Database` | `0` | Redis database number |
 | `Store.Redis.UseTLS` | `false` | Enable TLS/SSL connection |
 
@@ -279,10 +281,13 @@ All fields are optional. When not set, actual server values are used.
 ```json
 {
   "Enabled": true,
-  "LegacyProtocolEnabled": false,
+  "LegacyProtocolEnabled": true,
   "ServerInfo": {
     "ServerName": "My Network",
-    "Host": "play.mynetwork.com"
+    "Motd": "Welcome to our server!",
+    "Host": "play.mynetwork.com",
+    "Port": 5520,
+    "MaxPlayers": 1000
   },
   "Authentication": {
     "Public": {
@@ -305,8 +310,16 @@ All fields are optional. When not set, actual server values are used.
       "Type": "redis",
       "Redis": {
         "Host": "redis.mynetwork.com",
-        "Port": 6379
+        "Port": 6379,
+        "Username": "default",
+        "Password": "secret",
+        "Database": 0,
+        "UseTLS": false
       }
+    },
+    "Timing": {
+      "HeartbeatIntervalSeconds": 15,
+      "CacheRefreshSeconds": 60
     }
   },
   "ServerList": {

pom.xml

@@ -9,7 +9,7 @@
     <version>${revision}</version>
 
     <properties>
-        <revision>2.0.0-SNAPSHOT</revision>
+        <revision>2.0.1-SNAPSHOT</revision>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/dev/hytaleone/query/config/NetworkConfig.java

@@ -209,6 +209,8 @@ public static class RedisConfig {
                         (o, v) -> o.host = v, o -> o.host)
                 .addField(new KeyedCodec<>("Port", Codec.INTEGER),
                         (o, v) -> o.port = v, o -> o.port)
+                .addField(new KeyedCodec<>("Username", Codec.STRING),
+                        (o, v) -> o.username = v, o -> o.username)
                 .addField(new KeyedCodec<>("Password", Codec.STRING),
                         (o, v) -> o.password = v, o -> o.password)
                 .addField(new KeyedCodec<>("Database", Codec.INTEGER),
@@ -219,6 +221,7 @@ public static class RedisConfig {
 
         private String host = "localhost";
         private int port = 6379;
+        private String username = null;
         private String password = null;
         private int database = 0;
         private boolean useTLS = false;
@@ -243,6 +246,15 @@ public void setPort(int port) {
             this.port = port;
         }
 
+        @Nullable
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(@Nullable String username) {
+            this.username = username;
+        }
+
         @Nullable
         public String getPassword() {
             return password;
@@ -275,7 +287,9 @@ public void setUseTLS(boolean useTLS) {
         public String toRedisUri() {
             StringBuilder sb = new StringBuilder();
             sb.append(useTLS ? "rediss://" : "redis://");
-            if (password != null && !password.isEmpty()) {
+            if (username != null && !username.isEmpty() && password != null && !password.isEmpty()) {
+                sb.append(username).append(":").append(password).append("@");
+            } else if (password != null && !password.isEmpty()) {
                 sb.append(":").append(password).append("@");
             }
             sb.append(host).append(":").append(port);