feat(proxy): refactor PrePlayerJoinTaskManager to use object instead of class and simplify task registration

Author: twisti-dev

surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt

@@ -24,7 +24,6 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
 import dev.slne.surf.cloud.core.common.netty.registry.listener.NettyListenerRegistry
 import dev.slne.surf.cloud.core.common.player.playerManagerImpl
 import dev.slne.surf.cloud.core.common.player.task.PrePlayerJoinTaskManager
-import dev.slne.surf.cloud.core.common.util.bean
 import dev.slne.surf.cloud.core.common.util.hasPermissionPlattform
 import dev.slne.surf.surfapi.core.api.messages.adventure.getPointer
 import dev.slne.surf.surfapi.core.api.messages.adventure.text
@@ -280,7 +279,7 @@ class ClientRunningPacketListenerImpl(
 
     override suspend fun handleRunPlayerPreJoinTasks(packet: ClientboundRunPrePlayerJoinTasksPacket) {
         val player = commonPlayerManagerImpl.getOfflinePlayer(packet.uuid)
-        val result = bean<PrePlayerJoinTaskManager>().runTasks(player)
+        val result = PrePlayerJoinTaskManager.runTasks(player)
         packet.respond(RunPrePlayerJoinTasksResultPacket(result))
     }
 

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/task/PrePlayerJoinTaskAutoRegistrationHandler.kt

@@ -7,27 +7,26 @@ import org.springframework.context.SmartLifecycle
 import org.springframework.stereotype.Component
 
 @Component
-class PrePlayerJoinTaskAutoRegistrationHandler(private val taskManager: PrePlayerJoinTaskManager) :
-    BeanPostProcessor, SmartLifecycle {
+class PrePlayerJoinTaskAutoRegistrationHandler : BeanPostProcessor, SmartLifecycle {
     private val watched = mutableObjectSetOf<PrePlayerJoinTask>()
     private var running = false
 
     override fun postProcessAfterInitialization(bean: Any, beanName: String): Any? {
         if (bean is PrePlayerJoinTask) {
             if (watched.add(bean) && running) {
-                taskManager.registerTask(bean)
+                PrePlayerJoinTaskManager.registerTask(bean)
             }
         }
         return bean
     }
 
     override fun start() {
-        taskManager.registerTasks(watched)
+        PrePlayerJoinTaskManager.registerTasks(watched)
         running = true
     }
 
     override fun stop() {
-        watched.forEach { taskManager.unregisterTask(it) }
+        watched.forEach { PrePlayerJoinTaskManager.unregisterTask(it) }
         watched.clear()
         running = false
     }

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/task/PrePlayerJoinTaskManager.kt

@@ -10,8 +10,7 @@ import org.springframework.core.OrderComparator
 import org.springframework.stereotype.Component
 import dev.slne.surf.cloud.core.common.coroutines.PrePlayerJoinTaskScope as TaskScope
 
-@Component
-class PrePlayerJoinTaskManager : SmartInitializingSingleton {
+object PrePlayerJoinTaskManager {
     private val log = logger()
     private val tasks = mutableObjectListOf<PrePlayerJoinTask>()
     private var singletonsInstantiated = false
@@ -42,11 +41,6 @@ class PrePlayerJoinTaskManager : SmartInitializingSingleton {
         }
     }
 
-    override fun afterSingletonsInstantiated() {
-        singletonsInstantiated = true
-        maybeSort()
-    }
-
     suspend fun runTasks(player: CommonOfflineCloudPlayerImpl) = withContext(TaskScope.context) {
         for (task in tasks) {
             val result = runCatching { task.preJoin(player) }
@@ -63,4 +57,12 @@ class PrePlayerJoinTaskManager : SmartInitializingSingleton {
         }
         PrePlayerJoinTask.Result.ALLOWED
     }
-}
+
+    @Component
+    class Lifecycle : SmartInitializingSingleton {
+        override fun afterSingletonsInstantiated() {
+            singletonsInstantiated = true
+            maybeSort()
+        }
+    }
+}

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerManagerImpl.kt

@@ -48,7 +48,7 @@ class StandaloneCloudPlayerManagerImpl : CloudPlayerManagerImpl<StandaloneCloudP
     }
 
     override suspend fun preJoin(player: StandaloneCloudPlayerImpl): PrePlayerJoinTask.Result {
-        val serverResult = bean<PrePlayerJoinTaskManager>().runTasks(player)
+        val serverResult = PrePlayerJoinTaskManager.runTasks(player)
         if (serverResult !is PrePlayerJoinTask.Result.ALLOWED) return serverResult
         val connections = serverManagerImpl.retrieveAllServers().map { it.connection }