refactor(server): replace address with playAddress to improve naming consistency across modules

twisti-dev · twisti-dev · commit e355b6951916 · 2025-07-20T13:24:20.000+02:00
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt
@@ -49,11 +49,7 @@ class BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExte
     }
 
     override val playAddress: InetSocketAddress by lazy {
-        InetSocketAddress(
-            InetAddress.getByName(
-                properties.getProperty("server-ip", "")
-            ), properties.getProperty("server-port", "25565").toIntOrNull() ?: 25565
-        )
+        InetSocketAddress(InetAddress.getByName(server.ip), server.port)
     }
 
     override fun isServerManagedByThisProxy(address: InetSocketAddress): Boolean {
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt
@@ -123,7 +123,6 @@ class ClientNettyClientImpl(
                     serverName,
                     proxy,
                     clientConfig.isLobby,
-                    playAddress
                 )
             )
         } catch (e: Exception) {
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt
@@ -46,7 +46,7 @@ class ClientPreRunningPacketListenerImpl(
             SynchronizingProtocols.CLIENTBOUND,
             listener
         )
-        connection.send(ServerboundProceedToSynchronizingAcknowledgedPacket)
+        connection.send(ServerboundProceedToSynchronizingAcknowledgedPacket(client.playAddress))
         connection.setupOutboundProtocol(SynchronizingProtocols.SERVERBOUND)
 
         completion.complete(Unit)
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt
@@ -183,14 +183,14 @@ class ClientRunningPacketListenerImpl(
                 packet.serverId,
                 packet.group,
                 packet.name,
-                packet.address
+                packet.playAddress,
             )
         } else {
             ClientCloudServerImpl(
                 packet.serverId,
                 packet.group,
                 packet.name,
-                packet.address,
+                packet.playAddress,
                 packet.lobby
             ).also { client ->
                 platformExtension.registerCloudServerToProxy(client)
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientSynchronizingPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientSynchronizingPacketListenerImpl.kt
@@ -89,13 +89,13 @@ class ClientSynchronizingPacketListenerImpl(
     override suspend fun handleBatchUpdateServer(packet: ClientboundBatchUpdateServer) {
         serverManagerImpl.batchUpdateServer(packet.servers.map { data ->
             if (data.proxy) {
-                ClientProxyCloudServerImpl(data.serverId, data.group, data.name, data.address)
+                ClientProxyCloudServerImpl(data.serverId, data.group, data.name, data.playAddress)
             } else {
                 ClientCloudServerImpl(
                     data.serverId,
                     data.group,
                     data.name,
-                    data.address,
+                    data.playAddress,
                     data.lobby
                 ).also { server ->
                     platformExtension.registerCloudServerToProxy(server)
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/server/ClientCloudServerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/server/ClientCloudServerImpl.kt
@@ -5,8 +5,14 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.running.Serverboun
 import dev.slne.surf.cloud.core.common.server.AbstractCloudServer
 import java.net.InetSocketAddress
 
-class ClientCloudServerImpl(uid: Long, group: String, name: String, address: InetSocketAddress, lobby: Boolean) :
-    AbstractCloudServer(uid, group, name, address, lobby) {
+class ClientCloudServerImpl(
+    uid: Long,
+    group: String,
+    name: String,
+    playAddress: InetSocketAddress,
+    lobby: Boolean
+) :
+    AbstractCloudServer(uid, group, name, playAddress, lobby) {
     override fun shutdown() {
         ServerboundShutdownServerPacket(uid).fireAndForget()
     }
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/server/ClientProxyCloudServerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/server/ClientProxyCloudServerImpl.kt
@@ -9,8 +9,8 @@ class ClientProxyCloudServerImpl(
     uid: Long,
     group: String,
     name: String,
-    address: InetSocketAddress,
-) : AbstractProxyCloudServer(uid, group, name, address) {
+    playAddress: InetSocketAddress,
+) : AbstractProxyCloudServer(uid, group, name, playAddress) {
     override fun shutdown() {
         ServerboundShutdownServerPacket(uid).fireAndForget()
     }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/login/ServerboundLoginStartPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/login/ServerboundLoginStartPacket.kt
@@ -7,7 +7,6 @@ import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import java.net.InetSocketAddress
 
 /**
  * This packet is sent by the client to the server to start the login process.
@@ -30,22 +29,19 @@ class ServerboundLoginStartPacket : NettyPacket {
     val serverName: String
     val proxy: Boolean
     val lobby: Boolean
-    val playAddress: InetSocketAddress
 
     constructor(
         serverId: Long,
         serverCategory: String,
         serverName: String,
         proxy: Boolean,
         lobby: Boolean,
-        playAddress: InetSocketAddress
     ) {
         this.serverId = serverId
         this.serverCategory = serverCategory
         this.serverName = serverName
         this.proxy = proxy
         this.lobby = lobby
-        this.playAddress = playAddress
     }
 
     private constructor(buffer: SurfByteBuf) {
@@ -54,7 +50,6 @@ class ServerboundLoginStartPacket : NettyPacket {
         serverName = buffer.readUtf()
         proxy = buffer.readBoolean()
         lobby = buffer.readBoolean()
-        playAddress = buffer.readInetSocketAddress()
     }
 
     private fun write(buf: SurfByteBuf) {
@@ -63,6 +58,5 @@ class ServerboundLoginStartPacket : NettyPacket {
         buf.writeUtf(serverName)
         buf.writeBoolean(proxy)
         buf.writeBoolean(lobby)
-        buf.writeInetSocketAddress(playAddress)
     }
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt
@@ -32,7 +32,7 @@ object PreRunningProtocols {
                 .addPacket(LongResponse.STREAM_CODEC)
                 .addPacket(ServerboundPingRequestPacket.STREAM_CODEC)
                 .addPacket(ServerboundPreRunningAcknowledgedPacket.STREAM_CODEC)
-                .addPacket(ServerboundProceedToSynchronizingAcknowledgedPacket.STREAM_CODEC)
+                .addPacket(ServerboundProceedToSynchronizingAcknowledgedPacket::class.createCodec())
                 .addPacket(ServerboundRequestContinuation.STREAM_CODEC)
         }
 
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/ServerboundProceedToSynchronizingAcknowledgedPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/ServerboundProceedToSynchronizingAcknowledgedPacket.kt
@@ -3,16 +3,19 @@ package dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning
 import dev.slne.surf.cloud.api.common.meta.DefaultIds
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
 import dev.slne.surf.cloud.api.common.netty.network.ConnectionProtocol
-import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodecUnitSimple
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import java.net.InetSocketAddress
 
 @SurfNettyPacket(
     DefaultIds.SERVERBOUND_READY_TO_RUN_PACKET,
     PacketFlow.SERVERBOUND,
     ConnectionProtocol.PRE_RUNNING
 )
-object ServerboundProceedToSynchronizingAcknowledgedPacket : NettyPacket() {
-    val STREAM_CODEC = streamCodecUnitSimple(this)
+@Serializable
+class ServerboundProceedToSynchronizingAcknowledgedPacket(val playAddress: @Contextual InetSocketAddress) :
+    NettyPacket() {
     override val terminal = true
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundBatchUpdateServer.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundBatchUpdateServer.kt
@@ -55,7 +55,7 @@ class ClientboundBatchUpdateServer(
             buf.writeBoolean(data.lobby)
             buf.writeUtf(data.group)
             buf.writeUtf(data.name)
-            buf.writeInetSocketAddress(data.address)
+            buf.writeInetSocketAddress(data.playAddress)
         }
     }
 }
@@ -66,5 +66,5 @@ data class UpdateServerData(
     val lobby: Boolean,
     val group: String,
     val name: String,
-    val address: InetSocketAddress,
+    val playAddress: InetSocketAddress,
 )
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundRegisterServerPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundRegisterServerPacket.kt
@@ -21,7 +21,7 @@ class ClientboundRegisterServerPacket : NettyPacket {
     val lobby: Boolean
     val group: String
     val name: String
-    val address: InetSocketAddress
+    val playAddress: InetSocketAddress
 
     constructor(
         serverId: Long,
@@ -36,7 +36,7 @@ class ClientboundRegisterServerPacket : NettyPacket {
         this.lobby = lobby
         this.group = group
         this.name = name
-        this.address = address
+        this.playAddress = address
     }
 
     private constructor(buf: SurfByteBuf) {
@@ -45,7 +45,7 @@ class ClientboundRegisterServerPacket : NettyPacket {
         lobby = buf.readBoolean()
         group = buf.readUtf()
         name = buf.readUtf()
-        address = buf.readInetSocketAddress()
+        playAddress = buf.readInetSocketAddress()
     }
 
     private fun write(buf: SurfByteBuf) {
@@ -54,6 +54,6 @@ class ClientboundRegisterServerPacket : NettyPacket {
         buf.writeBoolean(lobby)
         buf.writeUtf(group)
         buf.writeUtf(name)
-        buf.writeInetSocketAddress(address)
+        buf.writeInetSocketAddress(playAddress)
     }
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/AbstractCloudServer.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/AbstractCloudServer.kt
@@ -16,11 +16,11 @@ abstract class AbstractCloudServer(
     uid: Long,
     group: String,
     name: String,
-    address: InetSocketAddress,
+    playAddress: InetSocketAddress,
     override val lobby: Boolean,
     users: UserListImpl = UserListImpl(),
     information: ClientInformation = ClientInformation.NOT_AVAILABLE
-) : CommonCloudServerImpl(uid, group, name, users, address, information), CloudServer {
+) : CommonCloudServerImpl(uid, group, name, users, playAddress, information), CloudServer {
     override val allowlist get() = information.allowlist
 
     override suspend fun pullPlayers(players: Collection<CloudPlayer>): ObjectList<Pair<CloudPlayer, ConnectionResultEnum>> {
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/AbstractProxyCloudServer.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/AbstractProxyCloudServer.kt
@@ -9,7 +9,7 @@ abstract class AbstractProxyCloudServer(
     uid: Long,
     group: String,
     name: String,
-    address: InetSocketAddress,
+    playAddress: InetSocketAddress,
     users: UserListImpl = UserListImpl(),
     information: ClientInformation = ClientInformation.NOT_AVAILABLE
-) : CommonCloudServerImpl(uid, group, name, users, address, information), ProxyCloudServer
+) : CommonCloudServerImpl(uid, group, name, users, playAddress, information), ProxyCloudServer
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ServerClientImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ServerClientImpl.kt
@@ -11,10 +11,11 @@ class ServerClientImpl(
     serverId: Long,
     serverCategory: String,
     serverName: String,
-    override val playAddress: InetSocketAddress,
     val lobbyServer: Boolean,
 ) : CommonNettyClientImpl(serverId, serverCategory, serverName) {
 
+    override lateinit var playAddress: InetSocketAddress
+
     private var _listener: ServerRunningPacketListenerImpl? = null
     val listener get() = _listener ?: error("listener not yet set")
 
@@ -36,7 +37,6 @@ class ServerClientImpl(
                 packet.serverId,
                 packet.serverCategory,
                 packet.serverName,
-                packet.playAddress,
                 packet.lobby
             )
     }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt
@@ -48,6 +48,8 @@ class ServerPreRunningPacketListenerImpl(
             SynchronizingProtocols.SERVERBOUND,
             listener
         )
+
+        client.playAddress = packet.playAddress
         listener.startSynchronizing()
     }
 
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt
@@ -26,10 +26,10 @@ class StandaloneCloudServerImpl(
     uid: Long,
     group: String,
     name: String,
-    address: InetSocketAddress,
+    playAddress: InetSocketAddress,
     lobby: Boolean,
     override val connection: ConnectionImpl,
-) : AbstractCloudServer(uid, group, name, address, lobby), ServerCloudServer,
+) : AbstractCloudServer(uid, group, name, playAddress, lobby), ServerCloudServer,
     CommonStandaloneServer by CommonStandaloneServerImpl() {
 
     init {
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt
@@ -11,9 +11,9 @@ class StandaloneProxyCloudServerImpl(
     uid: Long,
     group: String,
     name: String,
-    address: InetSocketAddress,
+    playAddress: InetSocketAddress,
     override val connection: ConnectionImpl
-) : AbstractProxyCloudServer(uid, group, name, address), ServerProxyCloudServer,
+) : AbstractProxyCloudServer(uid, group, name, playAddress), ServerProxyCloudServer,
     CommonStandaloneServer by CommonStandaloneServerImpl() {
 
     override fun shutdown() {

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,7 @@ class BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExte`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`override val playAddress: InetSocketAddress by lazy {`
`52`		`- InetSocketAddress(`
`53`		`- InetAddress.getByName(`
`54`		`- properties.getProperty("server-ip", "")`
`55`		`- ), properties.getProperty("server-port", "25565").toIntOrNull() ?: 25565`
`56`		`- )`
	`52`	`+ InetSocketAddress(InetAddress.getByName(server.ip), server.port)`
`57`	`53`	`}`
`58`	`54`
`59`	`55`	`override fun isServerManagedByThisProxy(address: InetSocketAddress): Boolean {`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,6 @@ class ClientNettyClientImpl(`
`123`	`123`	`serverName,`
`124`	`124`	`proxy,`
`125`	`125`	`clientConfig.isLobby,`
`126`		`- playAddress`
`127`	`126`	`)`
`128`	`127`	`)`
`129`	`128`	`} catch (e: Exception) {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ClientPreRunningPacketListenerImpl(`
`46`	`46`	`SynchronizingProtocols.CLIENTBOUND,`
`47`	`47`	`listener`
`48`	`48`	`)`
`49`		`- connection.send(ServerboundProceedToSynchronizingAcknowledgedPacket)`
	`49`	`+ connection.send(ServerboundProceedToSynchronizingAcknowledgedPacket(client.playAddress))`
`50`	`50`	`connection.setupOutboundProtocol(SynchronizingProtocols.SERVERBOUND)`
`51`	`51`
`52`	`52`	`completion.complete(Unit)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ object PreRunningProtocols {`
`32`	`32`	`.addPacket(LongResponse.STREAM_CODEC)`
`33`	`33`	`.addPacket(ServerboundPingRequestPacket.STREAM_CODEC)`
`34`	`34`	`.addPacket(ServerboundPreRunningAcknowledgedPacket.STREAM_CODEC)`
`35`		`- .addPacket(ServerboundProceedToSynchronizingAcknowledgedPacket.STREAM_CODEC)`
	`35`	`+ .addPacket(ServerboundProceedToSynchronizingAcknowledgedPacket::class.createCodec())`
`36`	`36`	`.addPacket(ServerboundRequestContinuation.STREAM_CODEC)`
`37`	`37`	`}`
`38`	`38`