refactor: Migrate CloudPlayer persistence & update player data protocols

This commit overhauls the player persistence and network data handling layers by:

• Removing legacy JPA-based implementations:
  - Deleted JPA entities, repositories, and services (e.g. CloudPlayerEntity, CloudPlayerNameHistoryEntity, CloudPlayerRepository, CloudPlayerService in the JPA flavor) along with outdated test files.

• Introducing an Exposed DAO persistence layer:
  - Added new Exposed-based CloudPlayerEntity and CloudPlayerNameHistoryEntity classes and their corresponding tables.
  - Created new CloudPlayerTables (and migration script V1__Add_cloud_player_tables.sql) to support the updated data schema.
  - Implemented a new CloudPlayerService using Exposed DAO and adjusted DAO service methods for player lookup, creation, and updates.

• Updating player management and data retrieval:
  - Modified StandaloneCloudPlayerImpl to store player name and IP address; its methods now delegate to the new Exposed service.
  - Enhanced OfflineCloudPlayerImpl to request updated player metadata (latest IP, last server, display name, name history, etc.) using newly defined netty request/response packets.
  - Added new serverbound data packets (ServerboundRequestPlayerDataPacket/DataRequestType and ServerboundRequestPlayerDataResponse) for handling various player data queries.

• Refining Netty protocol and network configuration:
  - Updated netty listener pipelines to use a configurable logging level (based on cloud configuration).
  - Adjusted packet registration and handling to integrate the new request/response flows.

• Build and configuration improvements:
  - Upgraded the Exposed dependency to version 0.60.0.
  - Added necessary dependencies (Flyway, MySQL Connector, Spring Instrument) and updated Gradle build files.
  - Introduced additional Spring configuration classes (AdditionalStandaloneConfiguration, PluginDatabaseConfig) to streamline the standalone module setup.

This migration from JPA to an Exposed-based persistence model simplifies database interactions and unifies player data retrieval through standardized netty protocols. It also improves clarity and consistency in the overall player management codebase.

Author: twisti-dev

.idea/dataSources.xml

@@ -13,11 +13,13 @@ buildscript {
 
 plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
+    id("io.freefair.aspectj.post-compile-weaving") version "8.13.1"
     java
 }
 
 allprojects {
     apply(plugin = "java")
+    apply(plugin = "io.freefair.aspectj.post-compile-weaving")
     group = "dev.slne.surf.cloud"
     version = findProperty("version") as String
 

build.gradle.kts

@@ -5,7 +5,7 @@ netty = "4.1.117.Final"
 nbt = "6.1"
 datafixerupper = "8.0.16"
 byte-buddy = "1.15.10"
-exposed = "0.59.0"
+exposed = "0.60.0"
 maven-impl = "4.0.0-rc-2"
 maven-resolver = "2.0.5"
 jline = "3.26.3"
@@ -53,6 +53,7 @@ aspectjrt = { module = "org.aspectj:aspectjrt" }
 zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd-jni" }
 luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms-api" }
 mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client" }
+mysql-connector-j = { module = "com.mysql:mysql-connector-j" }
 spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" }
 reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactive-streams" }
 hibernate-jcache = { module = "org.hibernate.orm:hibernate-jcache" }
@@ -61,6 +62,9 @@ ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages" }
 spring-boot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2" }
 spring-aop = { module = "org.springframework:spring-aop" }
 spring-aspects = { module = "org.springframework:spring-aspects" }
+flyway-core = { module = "org.flywaydb:flyway-core" }
+flyway-mysql = { module = "org.flywaydb:flyway-mysql" }
+spring-instrument = { module = "org.springframework:spring-instrument" }
 
 
 [plugins]
@@ -73,4 +77,5 @@ jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin
 exposed-api-server = ["exposed-spring-boot-starter", "exposed-java-time"]
 maven-libraries = ["maven-impl", "maven-resolver"]
 console-api = ["jline", "brigadier", "terminalconsoleappender"]
-ktor-api-server = ["ktor-server-core-jvm", "ktor-server-netty", "ktor-server-core", "ktor-server-html-builder", "kotlin-css", "ktor-server-websockets", "ktor-serialization-kotlinx-json"]
+ktor-api-server = ["ktor-server-core-jvm", "ktor-server-netty", "ktor-server-core", "ktor-server-html-builder", "kotlin-css", "ktor-server-websockets", "ktor-serialization-kotlinx-json"]
+flyway = ["flyway-core", "flyway-mysql"]

gradle/libs.versions.toml

@@ -1,5 +1,3 @@
-import org.gradle.internal.impldep.org.bouncycastle.asn1.x500.style.RFC4519Style.l
-
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
 }

surf-cloud-api/surf-cloud-api-common/build.gradle.kts

@@ -1,19 +1,25 @@
 package dev.slne.surf.cloud.api.common
 
+import org.springframework.boot.autoconfigure.AutoConfigurationPackage
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
-import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.context.annotation.AdviceMode
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.EnableAspectJAutoProxy
+import org.springframework.context.annotation.EnableLoadTimeWeaving
 import org.springframework.context.annotation.Import
+import org.springframework.context.annotation.Primary
 import org.springframework.context.annotation.Profile
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing
+import org.springframework.jdbc.datasource.DataSourceTransactionManager
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
+import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.EnableTransactionManagement
+import org.springframework.transaction.aspectj.AnnotationTransactionAspect
+import javax.sql.DataSource
+
 
 /**
  * Annotation for defining Surf Cloud applications with specific configurations.
@@ -23,20 +29,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@SpringBootApplication(
-    exclude = [DataSourceAutoConfiguration::class, RedisRepositoriesAutoConfiguration::class]
-)
+@SpringBootApplication
 @EnableScheduling
-@EnableAsync(mode = AdviceMode.ASPECTJ)
-@EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
+@EnableAsync
 @EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @EntityScan
-//@EnableRedisRepositories
-@EnableCaching(mode = AdviceMode.ASPECTJ)
-@Import(JpaAuditingConfiguration::class)
+@EnableCaching
+@AutoConfigurationPackage
 annotation class SurfCloudApplication
-
-@EnableJpaAuditing
-@ConditionalOnClass(name = ["org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect"])
-@Profile("server")
-class JpaAuditingConfiguration

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt

@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.api.common.config.properties
 
-
 /**
  * Contains predefined cloud properties for Surf Cloud applications.
  */
@@ -9,7 +8,7 @@ object CloudProperties {
     /**
      * Default value indicating that the server category is not set.
      */
-    private const val SERVER_CATEGORY_NOT_SET = "NOT_SET"
+    const val SERVER_CATEGORY_NOT_SET = "NOT_SET"
 
     /**
      * System property for the server category. Defaults to [SERVER_CATEGORY_NOT_SET].

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/config/properties/CloudProperties.kt

@@ -1,5 +1,9 @@
 package dev.slne.surf.cloud.api.common.meta
 
+import org.springframework.aot.hint.annotation.Reflective
+import org.springframework.core.annotation.AliasFor
+import kotlin.reflect.KClass
+
 /**
  * Annotation for marking methods in a component as packet handlers.
  */
@@ -11,4 +15,10 @@ package dev.slne.surf.cloud.api.common.meta
 @Retention(
     AnnotationRetention.RUNTIME
 )
-annotation class SurfNettyPacketHandler 
+@Reflective
+annotation class SurfNettyPacketHandler(
+    @get:AliasFor("classes") val value: Array<KClass<*>> = [],
+    @get:AliasFor("values") val classes: Array<KClass<*>> = [],
+    val condition: String = "",
+    val id: String = ""
+)

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler.kt

@@ -17,6 +17,7 @@ import dev.slne.surf.cloud.api.common.netty.protocol.buffer.types.VarLong
 import dev.slne.surf.cloud.api.common.util.codec.ExtraCodecs
 import dev.slne.surf.cloud.api.common.util.createUnresolvedInetSocketAddress
 import dev.slne.surf.cloud.api.common.util.fromJson
+import dev.slne.surf.surfapi.core.api.util.getCallerClass
 import io.netty.buffer.ByteBuf
 import io.netty.handler.codec.DecoderException
 import io.netty.handler.codec.EncoderException
@@ -631,12 +632,12 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
         fun <B : ByteBuf> readCompoundTag(buf: B) = ExtraCodecs.COMPOUND_TAG_CODEC.decode(buf)
 
         fun <B: ByteBuf> writeZonedDateTime(buf: B, time: ZonedDateTime) {
-            writeVarLong(buf, time.toInstant().toEpochMilli())
+            buf.writeLong(time.toInstant().toEpochMilli())
             writeUtf(buf, time.zone.id)
         }
 
         fun <B: ByteBuf> readZonedDateTime(buf: B): ZonedDateTime {
-            val epoch = readVarLong(buf)
+            val epoch = buf.readLong()
             val zone = readUtf(buf)
             return ZonedDateTime.ofInstant(Instant.ofEpochMilli(epoch), ZoneId.of(zone))
         }
@@ -655,9 +656,9 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
             writeUtf(buf, singleton::class.qualifiedName!!)
         }
 
-        fun <B : ByteBuf> readSingleton(buf: B): Any {
+        fun <B : ByteBuf> readSingleton(buf: B, classLoader: ClassLoader): Any {
             val className = readUtf(buf)
-            return Class.forName(className).kotlin.objectInstance
+            return Class.forName(className, true, classLoader).kotlin.objectInstance
                 ?: throw DecoderException("Failed to read singleton: $className")
         }
     }
@@ -834,7 +835,7 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
     fun writeInet4Address(address: Inet4Address) = writeInet4Address(this, address)
     fun readInet4Address() = readInet4Address(this)
     fun writeSingleton(singleton: Any) = writeSingleton(this, singleton)
-    fun readSingleton() = readSingleton(this)
+    fun readSingleton(classLoader: ClassLoader) = readSingleton(this, classLoader)
     // @formatter:on
 // endregion
 
@@ -1064,7 +1065,7 @@ fun <B : ByteBuf> B.writeZonedDateTime(time: ZonedDateTime) = SurfByteBuf.writeZ
 fun <B : ByteBuf> B.readInet4Address() = SurfByteBuf.readInet4Address(this)
 fun <B : ByteBuf> B.writeInet4Address(address: Inet4Address) = SurfByteBuf.writeInet4Address(this, address)
 
-fun <B : ByteBuf> B.readSingleton() = SurfByteBuf.readSingleton(this)
+fun <B : ByteBuf> B.readSingleton(classLoader: ClassLoader) = SurfByteBuf.readSingleton(this, classLoader)
 fun <B : ByteBuf> B.writeSingleton(singleton: Any) = SurfByteBuf.writeSingleton(this, singleton)
 
 fun ByteBuf.wrap() = SurfByteBuf(this)

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf.kt

@@ -7,7 +7,7 @@ import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
 import dev.slne.surf.cloud.api.common.server.CloudServer
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.text.Component
-import java.net.InetAddress
+import java.net.Inet4Address
 import java.util.*
 
 /**
@@ -18,7 +18,7 @@ import java.util.*
  * it enables sending messages or components to the player.
  */
 interface CloudPlayer : Audience, OfflineCloudPlayer { // TODO: conversation but done correctly?
-    override suspend fun latestIpAddress(): InetAddress
+    override suspend fun latestIpAddress(): Inet4Address
     override suspend fun lastServerRaw(): String
 
     /**
@@ -142,6 +142,7 @@ interface CloudPlayer : Audience, OfflineCloudPlayer { // TODO: conversation but
     ) = teleport(TeleportLocation(world, x, y, z, yaw, pitch), teleportCause, *flags)
 
     override suspend fun displayName(): Component
+    override suspend fun name(): String
 }
 
 /**

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt

@@ -1,7 +1,9 @@
 package dev.slne.surf.cloud.api.common.player
 
+import dev.slne.surf.cloud.api.common.server.UserList
 import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.surfapi.core.api.util.requiredService
+import it.unimi.dsi.fastutil.objects.ObjectSet
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.identity.Identity
 import org.jetbrains.annotations.ApiStatus
@@ -27,6 +29,8 @@ interface CloudPlayerManager {
 
     fun getOfflinePlayer(uuid: UUID): OfflineCloudPlayer
 
+    fun getOnlinePlayers(): UserList
+
     companion object : CloudPlayerManager by INSTANCE {
         @InternalApi
         val instance = INSTANCE