First working request

Author: ogesaku

README.md

@@ -17,3 +17,12 @@ dependencies {
   implementation("com.coditory.ktserver:ktserver-jdk:$version")
 }
 ```
+
+## TBD
+
+- Check nested routing
+- Check 404 and error handling
+- Upload file
+- Serve files
+- Websocket
+- klog api

build.gradle.kts

@@ -10,11 +10,13 @@ allprojects {
 }
 
 dependencies {
-    project(":ktserver")
+    project(":ktserver-api")
+    project(":ktserver-core")
     project(":ktserver-jdk")
     project(":ktserver-sample")
 
     // merged coverage report
-    kover(project(":ktserver"))
+    kover(project(":ktserver-api"))
+    kover(project(":ktserver-core"))
     kover(project(":ktserver-jdk"))
 }

gradle/libs.versions.toml

@@ -26,6 +26,7 @@ kotlinx-serialization-json-io = { module = "org.jetbrains.kotlinx:kotlinx-serial
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kotlinx-io" }
 quark-uri = { module = "com.coditory.quark:quark-uri", version = "0.0.10" }
+klog = { module = "com.coditory.klog:klog", version = "0.0.19" }
 # Test dependencies
 kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }

ktserver/build.gradle.kts ktserver-api/build.gradle.ktsktserver/build.gradle.kts renamed to ktserver-api/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     id("build.publish")
 }
 
-description = "KtServer - Kotlin async http server"
+description = "KtServer - API"
 
 dependencies {
     implementation(libs.kotlin.reflect)

…tlin/com/coditory/ktserver/HttpAction.kt …tlin/com/coditory/ktserver/HttpAction.ktktserver/src/main/kotlin/com/coditory/ktserver/HttpAction.kt renamed to ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpAction.kt ktserver/src/main/kotlin/com/coditory/ktserver/HttpAction.kt renamed to ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpAction.kt

@@ -1,8 +1,7 @@
 package com.coditory.ktserver
 
-import com.coditory.ktserver.http.HttpRequest
 import com.coditory.ktserver.http.HttpResponse
 
 fun interface HttpAction {
-    suspend fun handle(request: HttpRequest): HttpResponse
+    suspend fun handle(exchange: HttpExchange): HttpResponse
 }

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpChain.kt

@@ -0,0 +1,7 @@
+package com.coditory.ktserver
+
+import com.coditory.ktserver.http.HttpResponse
+
+fun interface HttpChain {
+    suspend fun doFilter(exchange: HttpExchange): HttpResponse
+}

…lin/com/coditory/ktserver/HttpChannel.kt …lin/com/coditory/ktserver/HttpChannel.ktktserver/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt renamed to ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt ktserver/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt renamed to ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpChannel.kt

@@ -0,0 +1,18 @@
+package com.coditory.ktserver
+
+import com.coditory.ktserver.http.HttpResponse
+import com.coditory.ktserver.http.HttpStatus
+
+interface HttpErrorHandler {
+    fun handle(exchange: HttpExchange, e: Throwable): HttpResponse
+
+    companion object {
+        private val DEFAULT = object : HttpErrorHandler {
+            override fun handle(exchange: HttpExchange, e: Throwable): HttpResponse {
+                return HttpResponse.SentResponse(HttpStatus.InternalServerError)
+            }
+        }
+
+        fun default() = DEFAULT
+    }
+}

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpErrorHandler.kt

@@ -0,0 +1,35 @@
+package com.coditory.ktserver
+
+import com.coditory.ktserver.http.HttpParams
+import com.coditory.ktserver.http.HttpRequest
+import com.coditory.ktserver.http.HttpResponseHead
+import com.coditory.ktserver.http.HttpStatus
+import com.coditory.ktserver.http.MutableHttpParams
+import kotlinx.io.Sink
+import kotlinx.io.writeString
+
+data class HttpExchange(
+    val request: HttpRequest,
+    val responseBody: Sink,
+) {
+    val attributes = mutableMapOf<String, Any>()
+    val responseHeaders = MutableHttpParams.empty()
+    private var sentResponseHead = false
+
+    suspend fun sendResponseHead(status: HttpStatus, headers: HttpParams = HttpParams.empty()) {
+        sendResponseHead(HttpResponseHead(status, headers))
+    }
+
+    suspend fun sendResponseHead(response: HttpResponseHead) {
+        require(!sentResponseHead) { "Response head was already sent" }
+        responseBody.writeInt(response.status.code)
+        responseBody.writeString("\n")
+        response.headers.forEachEntry { name, value ->
+            responseBody.writeString(name)
+            responseBody.writeString(": ")
+            responseBody.writeString(value)
+            responseBody.writeString("\n")
+        }
+        sentResponseHead = true
+    }
+}

ktserver-api/src/main/kotlin/com/coditory/ktserver/HttpExchange.kt

@@ -1,7 +1,7 @@
 package com.coditory.ktserver
 
-import com.sun.net.httpserver.HttpExchange
+import com.coditory.ktserver.http.HttpResponse
 
 interface HttpFilter {
-    suspend fun doFilter(exchange: HttpExchange, chain: HttpChain)
+    suspend fun doFilter(exchange: HttpExchange, chain: HttpChain): HttpResponse
 }