fix build

Author: StefanBratanov

libp2p/src/main/kotlin/io/libp2p/transport/implementation/PlainNettyTransport.kt

@@ -19,7 +19,8 @@ import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.Channel
 import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelOption
-import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.MultiThreadIoEventLoopGroup
+import io.netty.channel.nio.NioIoHandler
 import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.channel.socket.nio.NioSocketChannel
 import java.net.InetSocketAddress
@@ -39,8 +40,12 @@ abstract class PlainNettyTransport(
     private val listeners = mutableMapOf<Multiaddr, Channel>()
     private val channels = mutableListOf<Channel>()
 
-    private var workerGroup by lazyVar { NioEventLoopGroup() }
-    private var bossGroup by lazyVar { NioEventLoopGroup(1) }
+    private var workerGroup by lazyVar {
+        MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
+    }
+    private var bossGroup by lazyVar {
+        MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory())
+    }
 
     private var client by lazyVar {
         Bootstrap().apply {

libp2p/src/main/kotlin/io/libp2p/transport/quic/QuicTransport.kt

@@ -32,10 +32,11 @@ import io.netty.buffer.PooledByteBufAllocator
 import io.netty.channel.*
 import io.netty.channel.epoll.Epoll
 import io.netty.channel.epoll.EpollDatagramChannel
-import io.netty.channel.nio.NioEventLoopGroup
+import io.netty.channel.nio.NioIoHandler
 import io.netty.channel.socket.nio.NioDatagramChannel
 import io.netty.handler.codec.quic.*
 import io.netty.handler.ssl.ClientAuth
+import org.slf4j.LoggerFactory
 import java.net.InetSocketAddress
 import java.net.SocketAddress
 import java.time.Duration
@@ -49,14 +50,20 @@ class QuicTransport(
     private val protocols: List<ProtocolBinding<*>>
 ) : NettyTransport {
 
+    private val logger = LoggerFactory.getLogger(QuicTransport::class.java)
+
     private var closed = false
     var connectTimeout = Duration.ofSeconds(15)
 
     private val listeners = mutableMapOf<Multiaddr, Channel>()
     private val channels = mutableListOf<Channel>()
 
-    private var workerGroup by lazyVar { NioEventLoopGroup() }
-    private var bossGroup by lazyVar { NioEventLoopGroup(1) }
+    private var workerGroup by lazyVar {
+        MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
+    }
+    private var bossGroup by lazyVar {
+        MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory())
+    }
     private var allocator by lazyVar { PooledByteBufAllocator(true) }
     private var multistreamProtocol: MultistreamProtocol = MultistreamProtocolV1
     private var incomingMultistreamProtocol: MultistreamProtocol by lazyVar { multistreamProtocol }
@@ -166,7 +173,7 @@ class QuicTransport(
                         listeners -= addr
                     }
                 }
-                println("Quic server listening on " + addr)
+                logger.info("Quic server listening on $addr")
                 res.complete(null)
             }
         }
@@ -300,38 +307,23 @@ class QuicTransport(
 
     override fun handles(addr: Multiaddr) =
         handlesHost(addr) &&
-                addr.has(UDP) &&
-                addr.has(QUICV1) &&
-                !addr.has(WS)
+            addr.has(UDP) &&
+            addr.has(QUICV1) &&
+            !addr.has(WS)
 
     fun quicSslContext(expectedRemotePeerId: PeerId?, trustManager: Libp2pTrustManager): QuicSslContext {
         val connectionKeys = if (certAlgorithm.equals("ECDSA")) generateEcdsaKeyPair() else generateEd25519KeyPair()
         val javaPrivateKey = getJavaKey(connectionKeys.first)
         val isClient = expectedRemotePeerId != null
         val cert = buildCert(localKey, connectionKeys.first)
-        println("Building " + certAlgorithm + " keys and cert for peerid " + PeerId.fromPubKey(localKey.publicKey()))
+        logger.debug("Building {} keys and cert for peerid {}", certAlgorithm, PeerId.fromPubKey(localKey.publicKey()))
         return (
-                if (isClient) {
-                    QuicSslContextBuilder.forClient().keyManager(javaPrivateKey, null, cert)
-                } else {
-                    QuicSslContextBuilder.forServer(javaPrivateKey, null, cert).clientAuth(ClientAuth.REQUIRE)
-                }
-                )
-//            .option(BoringSSLContextOption.GROUPS, arrayOf("x25519"))
-//            .option(
-//                BoringSSLContextOption.SIGNATURE_ALGORITHMS,
-//                arrayOf(
-// //                    "ed25519",
-//                    "ecdsa_secp256r1_sha256",
-//                    "rsa_pkcs1_sha256",
-//                    "rsa_pss_rsae_sha256",
-//                    "ecdsa_secp384r1_sha384",
-//                    "rsa_pkcs1_sha384",
-//                    "rsa_pss_rsae_sha384",
-//                    "rsa_pss_rsae_sha512",
-//                    "rsa_pkcs1_sha512",
-//                )
-//            )
+            if (isClient) {
+                QuicSslContextBuilder.forClient().keyManager(javaPrivateKey, null, cert)
+            } else {
+                QuicSslContextBuilder.forServer(javaPrivateKey, null, cert).clientAuth(ClientAuth.REQUIRE)
+            }
+            )
             .trustManager(trustManager)
             .applicationProtocols("libp2p")
             .build()

libp2p/src/main/kotlin/io/libp2p/transport/ws/WebSocketClientInitializer.kt

@@ -12,12 +12,12 @@ internal class WebSocketClientInitializer(
     private val url: String
 ) : ChannelInitializer<SocketChannel>() {
 
-    public override fun initChannel(ch: SocketChannel) {
+    override fun initChannel(ch: SocketChannel) {
         val pipeline = ch.pipeline()
 
         pipeline.addLast(HttpClientCodec())
         pipeline.addLast(HttpObjectAggregator(65536))
-        pipeline.addLast(WebSocketClientCompressionHandler.INSTANCE)
+        pipeline.addLast(WebSocketClientCompressionHandler(0))
         pipeline.addLast(
             WebSocketClientHandshake(
                 connectionBuilder,

libp2p/src/main/kotlin/io/libp2p/transport/ws/WebSocketServerInitializer.kt

@@ -12,12 +12,12 @@ internal class WebSocketServerInitializer(
     private val connectionBuilder: ChannelHandler
 ) : ChannelInitializer<SocketChannel>() {
 
-    public override fun initChannel(ch: SocketChannel) {
+    override fun initChannel(ch: SocketChannel) {
         val pipeline = ch.pipeline()
 
         pipeline.addLast(HttpServerCodec())
         pipeline.addLast(HttpObjectAggregator(65536))
-        pipeline.addLast(WebSocketServerCompressionHandler())
+        pipeline.addLast(WebSocketServerCompressionHandler(0))
         pipeline.addLast(WebSocketServerProtocolHandler("/", null, true))
         pipeline.addLast(WebSocketServerHandshakeListener(connectionBuilder))
     } // initChannel