From 303828392e3fe4932032281840f75dfb0572232b Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Wed, 7 May 2025 14:46:02 +0800
Subject: [PATCH] updated Netty to 4.2.1

---
 gradle.properties                             |  2 +-
 rbcs-cli/build.gradle                         |  6 ------
 .../rbcs/client/RemoteBuildCacheClient.kt     | 20 ++++++++++---------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 75df4f8..629d03a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.caching=true
 
 rbcs.version = 0.3.0-SNAPSHOT
 
-lys.version = 2025.04.16
+lys.version = 2025.05.07
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net
diff --git a/rbcs-cli/build.gradle b/rbcs-cli/build.gradle
index 953d4f9..1acf788 100644
--- a/rbcs-cli/build.gradle
+++ b/rbcs-cli/build.gradle
@@ -31,12 +31,6 @@ sourceSets {
 
 configurations {
 
-    implementation {
-        resolutionStrategy {
-            exclude group: 'io.netty', module: 'netty-codec-marshalling'
-            exclude group: 'io.netty', module: 'netty-codec-protobuf'
-        }
-    }
     release {
         transitive = false
         canBeConsumed = true
diff --git a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt
index dc3cc3e..44280ed 100644
--- a/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt
+++ b/rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt
@@ -7,8 +7,10 @@ import io.netty.channel.Channel
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelOption
 import io.netty.channel.ChannelPipeline
+import io.netty.channel.IoEventLoopGroup
+import io.netty.channel.MultiThreadIoEventLoopGroup
 import io.netty.channel.SimpleChannelInboundHandler
-import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.nio.NioIoHandler
 import io.netty.channel.pool.AbstractChannelPoolHandler
 import io.netty.channel.pool.ChannelPool
 import io.netty.channel.pool.FixedChannelPool
@@ -32,12 +34,8 @@ import io.netty.handler.timeout.IdleState
 import io.netty.handler.timeout.IdleStateEvent
 import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.concurrent.Future
+import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.util.concurrent.GenericFutureListener
-import net.woggioni.rbcs.api.CacheValueMetadata
-import net.woggioni.rbcs.common.RBCS.loadKeystore
-import net.woggioni.rbcs.common.createLogger
-import net.woggioni.rbcs.common.debug
-import net.woggioni.rbcs.common.trace
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.URI
@@ -50,19 +48,23 @@ import java.util.concurrent.atomic.AtomicInteger
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 import kotlin.random.Random
-import io.netty.util.concurrent.Future as NettyFuture
+import net.woggioni.rbcs.api.CacheValueMetadata
+import net.woggioni.rbcs.common.RBCS.loadKeystore
+import net.woggioni.rbcs.common.createLogger
+import net.woggioni.rbcs.common.debug
+import net.woggioni.rbcs.common.trace
 
 class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable {
     companion object {
         private val log = createLogger<RemoteBuildCacheClient>()
     }
 
-    private val group: NioEventLoopGroup
+    private val group: IoEventLoopGroup
     private val sslContext: SslContext
     private val pool: ChannelPool
 
     init {
-        group = NioEventLoopGroup()
+        group = MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
         sslContext = SslContextBuilder.forClient().also { builder ->
             (profile.authentication as? Configuration.Authentication.TlsClientAuthenticationCredentials)?.let { tlsClientAuthenticationCredentials ->
                 builder.apply {