configs: individualize server configuration files

game-server/README.md

@@ -10,6 +10,11 @@ port = 20202
 flags = []
 boosts = ["DOUBLE_PANG"]
 icon = "CIEN"
+
+serverChannels = [
+    { id = 1, name = "Rookies", capacity = 20, restrictions = ["ROOKIES_ONLY"] },
+    { id = 2, name = "Free", capacity = 300 }
+]
 ```
 
 Environment variables:

game-server/src/main/kotlin/work/fking/pangya/game/Bootstrap.kt

@@ -1,13 +1,17 @@
 package work.fking.pangya.game
 
+import com.fasterxml.jackson.dataformat.toml.TomlMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import io.lettuce.core.RedisClient
 import io.lettuce.core.RedisURI
 import org.apache.logging.log4j.LogManager
-import work.fking.pangya.common.server.ServerConfigLoader
 import work.fking.pangya.discovery.DiscoveryClient
 import work.fking.pangya.discovery.HeartbeatPublisher
 import work.fking.pangya.discovery.ServerType.GAME
 import work.fking.pangya.game.ServerChannel.Restriction
+import java.nio.file.Files
+import java.nio.file.Path
 
 
 object Bootstrap {
@@ -16,19 +20,14 @@ object Bootstrap {
     @JvmStatic
     fun main(args: Array<String>) {
         LOGGER.info("Bootstrapping the game server server...")
-        val serverConfig = ServerConfigLoader.load("config.toml")
+        val objectMapper = TomlMapper().registerKotlinModule()
+
+        val serverConfig = objectMapper.readValue<GameServerConfig>(Files.newInputStream(Path.of("config.toml")))
         val redisClient = RedisClient.create(RedisURI.create(System.getenv("REDIS_URI")))
         val discoveryClient = DiscoveryClient(redisClient)
         val sessionClient = SessionClient(redisClient)
 
-        val serverChannels = listOf(
-            ServerChannel(1, "Rookies", 20, listOf(Restriction.ROOKIES_ONLY)),
-            ServerChannel(2, "Beginners & Juniors", 20, listOf(Restriction.BEGINNERS_AND_JUNIORS_ONLY)),
-            ServerChannel(3, "Juniors & Seniors", 20, listOf(Restriction.JUNIORS_AND_SENIORS_ONLY)),
-            ServerChannel(4, "Free", 20, listOf())
-        )
-
-        val server = GameServer(serverConfig, sessionClient, serverChannels)
+        val server = GameServer(serverConfig, sessionClient)
         HeartbeatPublisher(discoveryClient, GAME, serverConfig) { server.playerCount() }.start()
         server.start()
     }

game-server/src/main/kotlin/work/fking/pangya/game/GameServer.kt

@@ -4,7 +4,6 @@ import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.Channel
 import io.netty.channel.ChannelOption
 import org.slf4j.LoggerFactory
-import work.fking.pangya.common.server.ServerConfig
 import work.fking.pangya.game.net.ServerChannelInitializer
 import work.fking.pangya.game.player.Item
 import work.fking.pangya.game.player.Player
@@ -20,9 +19,9 @@ import java.util.concurrent.atomic.AtomicInteger
 private val LOGGER = LoggerFactory.getLogger(GameServer::class.java)
 
 class GameServer(
-    private val serverConfig: ServerConfig,
+    private val serverConfig: GameServerConfig,
     private val sessionClient: SessionClient,
-    private val serverChannels: List<ServerChannel>
+    private val serverChannels: List<ServerChannel> = serverConfig.serverChannels
 ) {
     private val executorService = Executors.newVirtualThreadPerTaskExecutor()
     private val connectionIdSequence = AtomicInteger()
@@ -138,7 +137,7 @@ class GameServer(
             val channel = bootstrap.bind(inetAddress, serverConfig.port)
                 .sync()
                 .channel()
-            LOGGER.info("Successfully bound to port {}, server bootstrap completed!", serverConfig.port)
+            LOGGER.info("Successfully bound to {}, server bootstrap completed!", channel.localAddress())
             channel.closeFuture().sync()
         } finally {
             bossGroup.shutdownGracefully()

game-server/src/main/kotlin/work/fking/pangya/game/GameServerConfig.kt

@@ -0,0 +1,19 @@
+package work.fking.pangya.game
+
+import work.fking.pangya.discovery.ServerBoost
+import work.fking.pangya.discovery.ServerConfig
+import work.fking.pangya.discovery.ServerFlag
+import work.fking.pangya.discovery.ServerIcon
+
+data class GameServerConfig(
+    override val id: Int,
+    override val name: String,
+    override val capacity: Int,
+    override val advertiseAddress: String,
+    override val port: Int,
+    override val flags: List<ServerFlag>?,
+    override val boosts: List<ServerBoost>?,
+    override val icon: ServerIcon?,
+    val bindAddress: String,
+    val serverChannels: List<ServerChannel> = emptyList()
+) : ServerConfig

game-server/src/main/kotlin/work/fking/pangya/game/ServerChannel.kt

@@ -9,7 +9,7 @@ class ServerChannel(
     val id: Int,
     val name: String,
     val capacity: Int,
-    val restrictions: List<Restriction>
+    val restrictions: List<Restriction> = emptyList()
 ) {
     val roomManager: RoomManager = RoomManager()
 
@@ -56,14 +56,10 @@ class ServerChannel(
         return id
     }
 
-    enum class Restriction(private val flag: Int) {
+    enum class Restriction(val flag: Int) {
         JUNIOR_AND_LOWER(1 shl 1),
         ROOKIES_ONLY(1 shl 3),
         BEGINNERS_AND_JUNIORS_ONLY(1 shl 4),
         JUNIORS_AND_SENIORS_ONLY(1 shl 5);
-
-        fun flag(): Int {
-            return flag
-        }
     }
 }

game-server/src/main/kotlin/work/fking/pangya/game/packet/outbound/ServerChannelsPacket.kt

@@ -27,7 +27,7 @@ class ServerChannelsPacket(
     private fun pack(restrictions: List<Restriction>): Int {
         var bitFlags = 0
         for (restriction in restrictions) {
-            bitFlags = bitFlags or restriction.flag()
+            bitFlags = bitFlags or restriction.flag
         }
         return bitFlags
     }

login-server/README.md

@@ -11,10 +11,6 @@ port = 10103
 Environment variables:
 
 ```
-DATABASE_HOST=localhost
-DATABASE_NAME=pangya
-DATABASE_USERNAME=postgres
-DATABASE_PASSWORD=
-LOG_LEVEL=trace
+LOG_LEVEL=debug
 REDIS_URI=redis://localhost
 ```

login-server/src/main/kotlin/work/fking/pangya/login/Bootstrap.kt

@@ -1,25 +1,31 @@
 package work.fking.pangya.login
 
+import com.fasterxml.jackson.dataformat.toml.TomlMapper
+import com.fasterxml.jackson.module.kotlin.readValue
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import io.lettuce.core.RedisClient
 import io.lettuce.core.RedisURI
 import org.apache.logging.log4j.LogManager
-import work.fking.pangya.common.server.ServerConfigLoader
 import work.fking.pangya.discovery.DiscoveryClient
 import work.fking.pangya.discovery.HeartbeatPublisher
 import work.fking.pangya.discovery.ServerType.LOGIN
 import work.fking.pangya.login.auth.NOOP_AUTHENTICATOR
 import work.fking.pangya.login.auth.SessionClient
+import java.nio.file.Files
+import java.nio.file.Path
 
 object Bootstrap {
     private val LOGGER = LogManager.getLogger(Bootstrap::class.java)
 
     @JvmStatic
     fun main(args: Array<String>) {
+        val objectMapper = TomlMapper().registerKotlinModule()
+
         LOGGER.info("Bootstrapping the login server...")
         val redisClient = RedisClient.create(RedisURI.create(System.getenv("REDIS_URI")))
         val discoveryClient = DiscoveryClient(redisClient)
         val sessionClient = SessionClient(redisClient)
-        val serverConfig = ServerConfigLoader.load("config.toml")
+        val serverConfig = objectMapper.readValue<LoginServerConfig>(Files.newInputStream(Path.of("config.toml")))
         val loginServer = LoginServer(discoveryClient, serverConfig, sessionClient, NOOP_AUTHENTICATOR)
         LOGGER.debug("Initializing service discovery...")
         HeartbeatPublisher(discoveryClient, LOGIN, serverConfig).start()

login-server/src/main/kotlin/work/fking/pangya/login/LoginServer.kt

@@ -4,7 +4,6 @@ import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.Channel
 import io.netty.channel.ChannelOption
 import org.slf4j.LoggerFactory
-import work.fking.pangya.common.server.ServerConfig
 import work.fking.pangya.discovery.DiscoveryClient
 import work.fking.pangya.login.auth.Authenticator
 import work.fking.pangya.login.auth.SessionClient
@@ -19,7 +18,7 @@ private val LOGGER = LoggerFactory.getLogger(LoginServer::class.java)
 
 class LoginServer(
     val discoveryClient: DiscoveryClient,
-    val serverConfig: ServerConfig,
+    val serverConfig: LoginServerConfig,
     val sessionClient: SessionClient,
     val authenticator: Authenticator
 ) {
@@ -58,12 +57,11 @@ class LoginServer(
             val channel = bootstrap.bind(inetAddress, serverConfig.port)
                 .sync()
                 .channel()
-            LOGGER.info("Successfully bound to port {}, server bootstrap completed!", serverConfig.port)
+            LOGGER.info("Successfully bound to {}, server bootstrap completed!", channel.localAddress())
             channel.closeFuture().sync()
         } finally {
             bossGroup.shutdownGracefully()
             workerGroup.shutdownGracefully()
         }
     }
-
 }

login-server/src/main/kotlin/work/fking/pangya/login/LoginServerConfig.kt

@@ -0,0 +1,18 @@
+package work.fking.pangya.login
+
+import work.fking.pangya.discovery.ServerBoost
+import work.fking.pangya.discovery.ServerConfig
+import work.fking.pangya.discovery.ServerFlag
+import work.fking.pangya.discovery.ServerIcon
+
+data class LoginServerConfig(
+    override val id: Int,
+    override val name: String,
+    override val capacity: Int,
+    override val advertiseAddress: String,
+    override val port: Int,
+    override val flags: List<ServerFlag>?,
+    override val boosts: List<ServerBoost>?,
+    override val icon: ServerIcon?,
+    val bindAddress: String
+) : ServerConfig

login-server/src/main/kotlin/work/fking/pangya/login/packet/outbound/ServerListReplies.kt

@@ -32,7 +32,7 @@ object ServerListReplies {
     private fun encodeServerInfo(buffer: ByteBuf, server: ServerInfo) {
         var serverFlags = 0
         for (flag in server.flags) {
-            serverFlags = serverFlags or flag.value()
+            serverFlags = serverFlags or flag.value
         }
         var serverBoosts = 0
         for (boost in server.boosts) {

service-discovery/src/main/kotlin/work/fking/pangya/discovery/DiscoveryClient.kt

@@ -9,6 +9,8 @@ import io.lettuce.core.pubsub.api.sync.RedisPubSubCommands
 import org.apache.logging.log4j.LogManager
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.withLock
 
 private val LOGGER = LogManager.getLogger(DiscoveryClient::class.java)
 private const val CHANNEL_NAME = "pangya.servers.heartbeat"
@@ -30,6 +32,7 @@ class DiscoveryClient(
             .subscribe()
     }
 
+    private val serversLock = ReentrantLock()
     private val knownServers: MutableList<KnownServer> = ArrayList()
 
     /**
@@ -88,7 +91,7 @@ class DiscoveryClient(
 
     private fun cleanup() {
         val now = LocalDateTime.now()
-        synchronized(knownServers) {
+        serversLock.withLock {
             knownServers.removeIf { ChronoUnit.MINUTES.between(it.knownSince, now) > 3 }
         }
     }