feat(shulker-proxy-agent): listen on teleport player pub sub

BridgeSplash · Oct 27, 2023 · e4f8d17 · e4f8d17
1 parent 850af26
commit e4f8d17
Show file tree

Hide file tree

Showing 11 changed files with 86 additions and 54 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...gent/src/bungeecord/kotlin/io/shulkermc/proxyagent/bungeecord/ProxyInterfaceBungeeCord.kt b/...gent/src/bungeecord/kotlin/io/shulkermc/proxyagent/bungeecord/ProxyInterfaceBungeeCord.kt
@@ -124,6 +124,12 @@ class ProxyInterfaceBungeeCord(
         )
     }
 
+    override fun teleportPlayerOnServer(playerName: String, serverName: String) {
+        val server = this.proxy.getServerInfo(serverName)
+        if (server != null)
+            this.proxy.getPlayer(playerName)?.connect(server)
+    }
+
     override fun getPlayerCount(): Int {
         return this.proxy.players.size
     }

diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ProxyInterface.kt
@@ -21,6 +21,7 @@ interface ProxyInterface {
     fun addServerPreConnectHook(hook: ServerPreConnectHook)
     fun addServerPostConnectHook(hook: ServerPostConnectHook)
 
+    fun teleportPlayerOnServer(playerName: String, serverName: String)
     fun getPlayerCount(): Int
 
     fun scheduleDelayedTask(delay: Long, timeUnit: TimeUnit, runnable: Runnable): ScheduledTask

diff --git a/.../shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt b/.../shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt
@@ -12,6 +12,7 @@ import io.shulkermc.proxyagent.adapters.pubsub.PubSubAdapter
 import io.shulkermc.proxyagent.adapters.pubsub.RedisPubSubAdapter
 import io.shulkermc.proxyagent.api.ShulkerProxyAPI
 import io.shulkermc.proxyagent.api.ShulkerProxyAPIImpl
+import io.shulkermc.proxyagent.handlers.TeleportPlayerOnServerHandler
 import io.shulkermc.proxyagent.services.PlayerMovementService
 import io.shulkermc.proxyagent.services.ProxyLifecycleService
 import io.shulkermc.proxyagent.services.ServerDirectoryService
@@ -60,6 +61,8 @@ class ShulkerProxyAgentCommon(val proxyInterface: ProxyInterface, val logger: Lo
             this.playerMovementService = PlayerMovementService(this)
             this.proxyLifecycleService = ProxyLifecycleService(this)
 
+            this.pubSub.onTeleportPlayerOnServer(TeleportPlayerOnServerHandler(this)::handle)
+
             this.healthcheckTask = HealthcheckTask(this).schedule()
             this.lostProxyPurgeTask = LostProxyPurgeTask(this).schedule()
 

diff --git a/...proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/adapters/cache/RedisCacheAdapter.kt b/...proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/adapters/cache/RedisCacheAdapter.kt
@@ -2,7 +2,6 @@ package io.shulkermc.proxyagent.adapters.cache
 
 import io.shulkermc.proxyagent.api.ShulkerProxyAPI.PlayerPosition
 import redis.clients.jedis.JedisPool
-import redis.clients.jedis.Response
 import redis.clients.jedis.params.SetParams
 import java.util.Optional
 import java.util.UUID

diff --git a/...oxy-agent/src/common/kotlin/io/shulkermc/proxyagent/adapters/pubsub/RedisPubSubAdapter.kt b/...oxy-agent/src/common/kotlin/io/shulkermc/proxyagent/adapters/pubsub/RedisPubSubAdapter.kt
@@ -12,12 +12,15 @@ class RedisPubSubAdapter(private val jedisPool: JedisPool) : PubSubAdapter {
 
     override fun onTeleportPlayerOnServer(callback: (playerId: String, serverName: String) -> Unit) {
         this.jedisPool.resource.use { jedis ->
-            jedis.subscribe(object : JedisPubSub() {
-                override fun onMessage(channel: String, message: String) {
-                    val (playerId, serverName) = message.split(":")
-                    callback(playerId, serverName)
-                }
-            }, "shulker:teleport")
+            jedis.subscribe(
+                object : JedisPubSub() {
+                    override fun onMessage(channel: String, message: String) {
+                        val (playerId, serverName) = message.split(":")
+                        callback(playerId, serverName)
+                    }
+                },
+                "shulker:teleport"
+            )
         }
     }
 }
diff --git a/...agent/src/common/kotlin/io/shulkermc/proxyagent/handlers/TeleportPlayerOnServerHandler.kt b/...agent/src/common/kotlin/io/shulkermc/proxyagent/handlers/TeleportPlayerOnServerHandler.kt
@@ -0,0 +1,9 @@
+package io.shulkermc.proxyagent.handlers
+
+import io.shulkermc.proxyagent.ShulkerProxyAgentCommon
+
+class TeleportPlayerOnServerHandler(private val agent: ShulkerProxyAgentCommon) {
+    fun handle(playerName: String, serverName: String) {
+        this.agent.proxyInterface.teleportPlayerOnServer(playerName, serverName)
+    }
+}
diff --git a/...s/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/platform/ProxyPingHook.kt b/...s/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/platform/ProxyPingHook.kt
@@ -1,5 +1,5 @@
 package io.shulkermc.proxyagent.platform
 
-data class ProxyPingHookResult(val playerCount: Int);
+data class ProxyPingHookResult(val playerCount: Int)
 
 typealias ProxyPingHook = () -> ProxyPingHookResult
diff --git a/...roxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/ProxyInterfaceVelocity.kt b/...roxy-agent/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/ProxyInterfaceVelocity.kt
@@ -86,6 +86,14 @@ class ProxyInterfaceVelocity(private val plugin: ShulkerProxyAgentVelocity, priv
         }
     }
 
+    override fun teleportPlayerOnServer(playerName: String, serverName: String) {
+        this.proxy.getPlayer(playerName).ifPresent { player ->
+            this.proxy.getServer(serverName).ifPresent { server ->
+                player.createConnectionRequest(server).fireAndForget()
+            }
+        }
+    }
+
     override fun getPlayerCount(): Int {
         return this.proxy.playerCount
     }

diff --git a/...-agent/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/commands/GlobalFindCommand.kt b/...-agent/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/commands/GlobalFindCommand.kt
@@ -14,21 +14,22 @@ object GlobalFindCommand {
     fun create(agent: ShulkerProxyAgentCommon): BrigadierCommand {
         val rootNode = LiteralArgumentBuilder.literal<CommandSource>("gfind")
             .requires { it.hasPermission("shulker.command.gfind") }
-            .then(RequiredArgumentBuilder.argument<CommandSource, String>("player", StringArgumentType.word())
-                .executes { context ->
-                    val source = context.source
-                    val player = context.getArgument("player", String::class.java)
-                    val playerPosition = agent.cache.getPlayerIdFromName(player)
-                        .flatMap { playerId -> agent.cache.getPlayerPosition(playerId) }
+            .then(
+                RequiredArgumentBuilder.argument<CommandSource, String>("player", StringArgumentType.word())
+                    .executes { context ->
+                        val source = context.source
+                        val player = context.getArgument("player", String::class.java)
+                        val playerPosition = agent.cache.getPlayerIdFromName(player)
+                            .flatMap { playerId -> agent.cache.getPlayerPosition(playerId) }
 
-                    if (playerPosition.isEmpty) {
-                        source.sendMessage(Component.text("Player $player not found.", NamedTextColor.RED))
+                        if (playerPosition.isEmpty) {
+                            source.sendMessage(Component.text("Player $player not found.", NamedTextColor.RED))
+                            return@executes Command.SINGLE_SUCCESS
+                        }
+
+                        source.sendMessage(Component.text("Player $player is connected on proxy ${playerPosition.get().proxyName} and located on server ${playerPosition.get().serverName}.", NamedTextColor.GREEN))
                         return@executes Command.SINGLE_SUCCESS
                     }
-
-                    source.sendMessage(Component.text("Player $player is connected on proxy ${playerPosition.get().proxyName} and located on server ${playerPosition.get().serverName}.", NamedTextColor.GREEN))
-                    return@executes Command.SINGLE_SUCCESS
-                }
             )
             .build()
 

diff --git a/...nt/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/commands/GlobalTeleportCommand.kt b/...nt/src/velocity/kotlin/io/shulkermc/proxyagent/velocity/commands/GlobalTeleportCommand.kt
@@ -15,43 +15,45 @@ object GlobalTeleportCommand {
     fun create(agent: ShulkerProxyAgentCommon, proxyServer: ProxyServer): BrigadierCommand {
         val rootNode = LiteralArgumentBuilder.literal<CommandSource>("gtp")
             .requires { it.hasPermission("shulker.command.gtp") }
-            .then(RequiredArgumentBuilder.argument<CommandSource, String>("player", StringArgumentType.word())
-                .executes { context ->
-                    val source = context.source
-                    val player = context.getArgument("player", String::class.java)
-                    val playerPosition = agent.cache.getPlayerIdFromName(player)
-                        .flatMap { playerId -> agent.cache.getPlayerPosition(playerId) }
-
-                    if (playerPosition.isEmpty) {
-                        source.sendMessage(Component.text("Player $player not found.", NamedTextColor.RED))
-                        return@executes Command.SINGLE_SUCCESS
-                    }
-
-                    val server = playerPosition.get().serverName
-                    agent.pubSub.teleportPlayerOnServer(player, server)
-                    source.sendMessage(Component.text("Teleported to server $server.", NamedTextColor.GREEN))
-
-                    return@executes Command.SINGLE_SUCCESS
-                }
-                .then(RequiredArgumentBuilder.argument<CommandSource, String>("server", StringArgumentType.word())
-                    .suggests { _, builder ->
-                        proxyServer.allServers.forEach { server ->
-                            builder.suggest(server.serverInfo.name)
-                        }
-
-                        return@suggests builder.buildFuture()
-                    }
+            .then(
+                RequiredArgumentBuilder.argument<CommandSource, String>("player", StringArgumentType.word())
                     .executes { context ->
                         val source = context.source
                         val player = context.getArgument("player", String::class.java)
-                        val server = context.getArgument("server", String::class.java)
+                        val playerPosition = agent.cache.getPlayerIdFromName(player)
+                            .flatMap { playerId -> agent.cache.getPlayerPosition(playerId) }
+
+                        if (playerPosition.isEmpty) {
+                            source.sendMessage(Component.text("Player $player not found.", NamedTextColor.RED))
+                            return@executes Command.SINGLE_SUCCESS
+                        }
 
+                        val server = playerPosition.get().serverName
                         agent.pubSub.teleportPlayerOnServer(player, server)
-                        source.sendMessage(Component.text("Teleported $player to server $server.", NamedTextColor.GREEN))
+                        source.sendMessage(Component.text("Teleported to server $server.", NamedTextColor.GREEN))
 
                         return@executes Command.SINGLE_SUCCESS
                     }
-                )
+                    .then(
+                        RequiredArgumentBuilder.argument<CommandSource, String>("server", StringArgumentType.word())
+                            .suggests { _, builder ->
+                                proxyServer.allServers.forEach { server ->
+                                    builder.suggest(server.serverInfo.name)
+                                }
+
+                                return@suggests builder.buildFuture()
+                            }
+                            .executes { context ->
+                                val source = context.source
+                                val player = context.getArgument("player", String::class.java)
+                                val server = context.getArgument("server", String::class.java)
+
+                                agent.pubSub.teleportPlayerOnServer(player, server)
+                                source.sendMessage(Component.text("Teleported $player to server $server.", NamedTextColor.GREEN))
+
+                                return@executes Command.SINGLE_SUCCESS
+                            }
+                    )
             )
             .build()