Skip to content

fix(proxy): send proxy hops through the session handoff #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lusu007 merged 1 commit into from
Oct 31, 2026
Merged

fix(proxy): send proxy hops through the session handoff #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions velocity/src/main/kotlin/gg/grounds/proxy/velocity/listener/ProxyHopListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import com.velocitypowered.api.network.ProtocolVersion
import com.velocitypowered.api.proxy.Player
import com.velocitypowered.api.proxy.ProxyServer
import gg.grounds.i18n.Translations
import gg.grounds.proxy.api.PlayerSessionTransfer
import gg.grounds.proxy.api.ProxyServiceRegistry
import gg.grounds.proxy.velocity.ProxyHop
import gg.grounds.proxy.velocity.ProxySystemMessage
import gg.grounds.proxy.velocity.RegionCatalog
import java.net.InetSocketAddress
import java.util.UUID
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.TimeUnit
Expand Down Expand Up @@ -45,7 +46,7 @@ class ProxyHopListener(
fun send(player: Player, ticket: ProxyHop.Ticket): Boolean {
val target = address() ?: return false
val payload = ProxyHop.encode(ticket)
val stage = Pending(payload, target)
val stage = Pending(payload, target, ticket.target)
pending[player.uniqueId] = stage
try {
player.storeCookie(COOKIE_KEY, payload)
Expand Down Expand Up @@ -135,12 +136,19 @@ class ProxyHopListener(

private fun complete(player: Player, stage: Pending) {
if (!pending.remove(player.uniqueId, stage) || !player.isActive) return
player.transferToHost(
InetSocketAddress.createUnresolved(stage.target.host, stage.target.port)
)
val transfer = ProxyServiceRegistry.get(PlayerSessionTransfer::class.java)
if (
transfer?.transferToHost(player.uniqueId, stage.target.host, stage.target.port) != true
) {
giveUp(player, stage.wantedProxy)
}
}

private class Pending(val payload: ByteArray, val target: RegionCatalog.Region)
private class Pending(
val payload: ByteArray,
val target: RegionCatalog.Region,
val wantedProxy: String,
)

private companion object {
val COOKIE_KEY: Key = Key.key(ProxyHop.KEY)
Expand Down
Loading