refactor: use netty http headers

Author: 1zun4

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

@@ -97,7 +97,7 @@ internal class HttpServerHandler(private val server: HttpServer) : ChannelInboun
                     val requestContext = RequestContext(
                         msg.method(),
                         URLDecoder.decode(msg.uri(), Charsets.UTF_8),
-                        msg.headers().associate { it.key to it.value },
+                        msg.headers(),
                     )
 
                     localRequestContext.set(requestContext)

src/main/kotlin/net/ccbluex/netty/http/middleware/CorsMiddleware.kt

@@ -2,6 +2,7 @@ package net.ccbluex.netty.http.middleware
 
 import io.netty.handler.codec.http.FullHttpResponse
 import io.netty.handler.codec.http.HttpHeaderNames
+import io.netty.handler.codec.http.HttpHeaders
 import net.ccbluex.netty.http.HttpServer.Companion.logger
 import net.ccbluex.netty.http.model.RequestContext
 import java.net.URI
@@ -32,7 +33,7 @@ class CorsMiddleware(
      */
     override fun invoke(context: RequestContext, response: FullHttpResponse): FullHttpResponse {
         val httpHeaders = response.headers()
-        val requestOrigin = context.headers["origin"] ?: context.headers["Origin"]
+        val requestOrigin = context.headers[HttpHeaderNames.ORIGIN]
 
         if (requestOrigin != null) {
             try {

src/main/kotlin/net/ccbluex/netty/http/model/RequestContext.kt

@@ -19,9 +19,10 @@
  */
 package net.ccbluex.netty.http.model
 
+import io.netty.handler.codec.http.HttpHeaders
 import io.netty.handler.codec.http.HttpMethod
 
-data class RequestContext(var httpMethod: HttpMethod, var uri: String, var headers: Map<String, String>) {
+data class RequestContext(var httpMethod: HttpMethod, var uri: String, var headers: HttpHeaders) {
     val contentBuffer = StringBuilder()
     val path = uri.substringBefore('?', uri)
     val params = getUriParams(uri)
@@ -43,7 +44,7 @@ private fun getUriParams(uri: String): Map<String, String> {
             val index = param.indexOf('=')
             if (index == -1) null
             else {
-                val key = param.substring(0, index)
+                val key = param.take(index)
                 val value = param.substring(index + 1)
                 if (key.isNotEmpty()) key to value else null
             }

src/main/kotlin/net/ccbluex/netty/http/model/RequestObject.kt

@@ -19,6 +19,7 @@
  */
 package net.ccbluex.netty.http.model
 
+import io.netty.handler.codec.http.HttpHeaders
 import io.netty.handler.codec.http.HttpMethod
 import net.ccbluex.netty.http.util.DEFAULT_GSON
 
@@ -42,7 +43,7 @@ data class RequestObject(
     val body: String,
     val params: Map<String, String>,
     val queryParams: Map<String, String>,
-    val headers: Map<String, String>
+    val headers: HttpHeaders
 ) {
 
     /**

src/test/kotlin/ZipServantTest.kt

@@ -18,6 +18,8 @@
  *
  */
 
+import io.netty.handler.codec.http.EmptyHttpHeaders
+import io.netty.handler.codec.http.HttpHeaders
 import io.netty.handler.codec.http.HttpMethod
 import io.netty.handler.codec.http.HttpResponseStatus
 import net.ccbluex.netty.http.model.RequestObject
@@ -102,7 +104,7 @@ class ZipServantTest {
             body = "",
             params = emptyMap(),
             queryParams = emptyMap(),
-            headers = emptyMap()
+            headers = EmptyHttpHeaders.INSTANCE
         )
     }