Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ class ClientNettyClientImpl(
ConnectionImpl.connect(
inetSocketAddress,
configHolder.config.connectionConfig.nettyConfig.useEpoll,
connection
connection,
configHolder
)

ConnectionTickScope.launch {
Expand Down Expand Up @@ -205,7 +206,7 @@ class ClientNettyClientImpl(
useEpoll: Boolean,
): ConnectionImpl {
val connection = ConnectionImpl(PacketFlow.CLIENTBOUND, EncryptionManager.instance)
ConnectionImpl.connect(address, useEpoll, connection)
ConnectionImpl.connect(address, useEpoll, connection, configHolder)
return connection
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,8 @@ class ConnectionImpl(
suspend fun connect(
address: InetSocketAddress,
useEpoll: Boolean,
connection: ConnectionImpl
connection: ConnectionImpl,
configHolder: AbstractSurfCloudConfigHolder<*>
) {
val channelClass: Class<out SocketChannel>
val eventLoopGroup: EventLoopGroup
Expand All @@ -1248,23 +1249,33 @@ class ConnectionImpl(
val pipeline = channel.pipeline()
.addLast(HandlerNames.TIMEOUT, ReadTimeoutHandler(30))

configureSerialization(pipeline, PacketFlow.CLIENTBOUND, local = false)
configureSerialization(
pipeline,
PacketFlow.CLIENTBOUND,
false,
configHolder
)
connection.configurePacketHandler(channel, pipeline)
}
})
.connect(address.address, address.port)
.suspend()
}

fun configureSerialization(pipeline: ChannelPipeline, side: PacketFlow, local: Boolean) {
fun configureSerialization(
pipeline: ChannelPipeline,
side: PacketFlow,
local: Boolean,
configHolder: AbstractSurfCloudConfigHolder<*>
) {
val opposite = side.getOpposite()
val receivingSide = side == PacketFlow.SERVERBOUND
val sendingSide = opposite == PacketFlow.SERVERBOUND


pipeline.addFirst(
HandlerNames.LOGGER,
LoggingHandler(bean<AbstractSurfCloudConfigHolder<*>>().config.logging.nettyLogLevel)
LoggingHandler(configHolder.config.logging.nettyLogLevel)
)
// .addLast(HandlerNames.SSL_HANDLER_ENFORCER, EnforceSslHandler())
.addLast(HandlerNames.COMPRESS, ZstdEncoder(8))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ class ServerConnectionListener(
ConnectionImpl.configureSerialization(
pipeline,
PacketFlow.SERVERBOUND,
false
false,
configHolder
)

val connection =
Expand Down Expand Up @@ -206,7 +207,11 @@ class ServerConnectionListener(
}
}

fun broadcast(packet: NettyPacket, flush: Boolean = true, except: (ConnectionImpl) -> Boolean = { false }) {
fun broadcast(
packet: NettyPacket,
flush: Boolean = true,
except: (ConnectionImpl) -> Boolean = { false }
) {
require(packet !is RespondingNettyPacket<*>) { "Cannot broadcast responding packets" }

val activeProtocols = packet.protocols
Expand Down
Loading