release: 2.5.0

update netty to 4.2.7

Author: MukjepScarlet

build.gradle.kts

@@ -11,7 +11,7 @@ val authorName = "ccbluex"
 val projectUrl = "https://github.com/ccbluex/netty-httpserver"
 
 group = "net.ccbluex"
-version = "2.4.4"
+version = "2.5.0"
 
 repositories {
     mavenCentral()
@@ -35,8 +35,9 @@ dependencies {
 
     testImplementation(kotlin("test"))
     testImplementation(libs.coroutines.test)
-    testImplementation("com.squareup.retrofit2:retrofit:2.9.0")
-    testImplementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    testImplementation(libs.okhttp)
+    testImplementation(libs.retrofit.core)
+    testImplementation(libs.retrofit.gson)
 }
 
 tasks.test {

gradle/libs.versions.toml

@@ -2,13 +2,17 @@
 # https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
 log4j = "2.23.1"
 # https://mvnrepository.com/artifact/io.netty/netty-all
-netty = "4.1.118.Final"
+netty = "4.2.7.Final" # 1.21.11+
 # https://mvnrepository.com/artifact/com.google.code.gson/gson
 gson = "2.10.1"
 # https://mvnrepository.com/artifact/org.apache.tika/tika-core
 tika = "3.2.3"
 # https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-test/overview
 kotlinx_coroutines_version = "1.10.2"
+# https://mvnrepository.com/artifact/com.squareup.retrofit2/retrofit
+retrofit = "2.12.0"
+# https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+okhttp = "4.12.0"
 
 [libraries]
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx_coroutines_version" }
@@ -20,6 +24,10 @@ netty-epoll-classes = { module = "io.netty:netty-transport-classes-epoll", versi
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 tika-core = { module = "org.apache.tika:tika-core", version.ref = "tika" }
 
+retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+
 [bundles]
 netty = [
     "netty-codec-http",

src/main/kotlin/net/ccbluex/netty/http/HttpServer.kt

@@ -33,7 +33,7 @@ import net.ccbluex.netty.http.coroutines.syncSuspend
 import net.ccbluex.netty.http.middleware.Middleware
 import net.ccbluex.netty.http.rest.Node
 import net.ccbluex.netty.http.rest.RouteController
-import net.ccbluex.netty.http.util.TransportType
+import net.ccbluex.netty.http.util.setup
 import net.ccbluex.netty.http.websocket.WebSocketController
 import org.apache.logging.log4j.LogManager
 import java.net.InetSocketAddress
@@ -81,7 +81,7 @@ class HttpServer {
     suspend fun start(port: Int, useNativeTransport: Boolean = true): Int = lock.withLock {
         val b = ServerBootstrap()
 
-        val groups = TransportType.apply(b, useNativeTransport)
+        val groups = b.setup(useNativeTransport)
         bossGroup = groups.first
         workerGroup = groups.second
 

src/main/kotlin/net/ccbluex/netty/http/util/TransportDetector.kt

@@ -0,0 +1,88 @@
+/*
+ * This file is part of Netty-Rest (https://github.com/CCBlueX/netty-rest)
+ *
+ * Copyright (c) 2024 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Netty-Rest is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Netty-Rest. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+package net.ccbluex.netty.http.util
+
+import io.netty.bootstrap.ServerBootstrap
+import io.netty.channel.ChannelFactory
+import io.netty.channel.EventLoopGroup
+import io.netty.channel.IoHandlerFactory
+import io.netty.channel.MultiThreadIoEventLoopGroup
+import io.netty.channel.ServerChannel
+import io.netty.channel.epoll.Epoll
+import io.netty.channel.epoll.EpollIoHandler
+import io.netty.channel.epoll.EpollServerSocketChannel
+import io.netty.channel.kqueue.KQueue
+import io.netty.channel.kqueue.KQueueIoHandler
+import io.netty.channel.kqueue.KQueueServerSocketChannel
+import io.netty.channel.nio.NioIoHandler
+import io.netty.channel.socket.nio.NioServerSocketChannel
+import net.ccbluex.netty.http.util.TransportType.EPOLL
+import net.ccbluex.netty.http.util.TransportType.KQUEUE
+import net.ccbluex.netty.http.util.TransportType.NIO
+
+internal enum class TransportType(
+    val serverChannelFactory: ChannelFactory<out ServerChannel>,
+) {
+    NIO(::NioServerSocketChannel) {
+        override val isAvailable get() = true
+        override val ioHandlerFactory: IoHandlerFactory = NioIoHandler.newFactory()
+    },
+
+    EPOLL(::EpollServerSocketChannel) {
+        override val isAvailable get() = try {
+            Epoll.isAvailable()
+        } catch (_: Throwable) { false }
+        override val ioHandlerFactory: IoHandlerFactory get() = EpollIoHandler.newFactory()
+    },
+
+    KQUEUE(::KQueueServerSocketChannel) {
+        override val isAvailable get() = try {
+            KQueue.isAvailable()
+        } catch (_: Throwable) { false }
+        override val ioHandlerFactory: IoHandlerFactory get() = KQueueIoHandler.newFactory()
+    };
+
+    abstract val isAvailable: Boolean
+
+    abstract val ioHandlerFactory: IoHandlerFactory
+}
+
+private val available by lazy {
+    arrayOf(EPOLL, KQUEUE, NIO).first { it.isAvailable }
+}
+
+/**
+ * Set the channel factory and event loop groups for the given server bootstrap.
+ *
+ * @receiver The server bootstrap to configure.
+ * @param useNativeTransport Whether to use native transport (Epoll or KQueue).
+ *
+ * @return Parent and child group.
+ */
+@JvmOverloads
+fun ServerBootstrap.setup(useNativeTransport: Boolean = true): Pair<EventLoopGroup, EventLoopGroup> {
+    val type = if (useNativeTransport) available else NIO
+
+    val parentGroup = MultiThreadIoEventLoopGroup(1, type.ioHandlerFactory)
+    val childGroup = MultiThreadIoEventLoopGroup(type.ioHandlerFactory)
+    group(parentGroup, childGroup)
+        .channelFactory(type.serverChannelFactory)
+    return parentGroup to childGroup
+}

src/main/kotlin/net/ccbluex/netty/http/util/TransportType.kt

@@ -112,9 +112,9 @@ class HttpMiddlewareServerTest {
     @Test
     fun testRootEndpoint() {
         val response = makeRequest("/")
-        assertEquals(200, response.code(), "Expected status code 200")
+        assertEquals(200, response.code, "Expected status code 200")
 
-        val responseBody = response.body()?.string()
+        val responseBody = response.body?.string()
         assertNotNull(responseBody, "Response body should not be null")
 
         assertTrue(responseBody.contains("Hello, World!"), "Response should contain 'Hello, World!'")
@@ -127,9 +127,9 @@ class HttpMiddlewareServerTest {
     @Test
     fun testRootEndpointWithQueryParam() {
         val response = makeRequest("/?param1=value1&param2=value2")
-        assertEquals(200, response.code(), "Expected status code 200")
+        assertEquals(200, response.code, "Expected status code 200")
 
-        val responseBody = response.body()?.string()
+        val responseBody = response.body?.string()
         assertNotNull(responseBody, "Response body should not be null")
 
         assertTrue(responseBody.contains("Hello, World!"), "Response should contain 'Hello, World!'")
@@ -150,13 +150,13 @@ class HttpMiddlewareServerTest {
                 override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
                     assertIs<ProtocolException>(t)
                     assertNotNull(response)
-                    assertEquals(HttpResponseStatus.BAD_REQUEST.code(), response.code())
+                    assertEquals(HttpResponseStatus.BAD_REQUEST.code(), response.code)
                     val exceptedResponseBody = httpBadRequest("WebSocket unsupported")
                     val buffer = Buffer()
                     buffer.write(exceptedResponseBody.content().nioBuffer())
                     assertEquals(
                         buffer.readUtf8(),
-                        response.body()!!.string()
+                        response.body!!.string()
                     )
                     future.complete(true)
                 }