fix building

Author: MukjepScarlet

README.md

@@ -62,10 +62,10 @@ import com.google.gson.JsonObject
 import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.util.httpOk
 
-fun main() {
+suspend fun main() {
     val server = HttpServer()
 
-    server.routeController.apply {
+    server.routing {
         get("/hello") {
             httpOk(JsonObject().apply {
                 addProperty("message", "Hello, World!")

examples/echo-server/src/main/kotlin/EchoServerExample.kt

@@ -4,10 +4,10 @@ import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.model.RequestObject
 import net.ccbluex.netty.http.util.httpOk
 
-fun main() {
+suspend fun main() {
     val server = HttpServer()
 
-    server.routeController.apply {
+    server.routing {
         post("/echo", ::postEcho) // /echo
     }
 

examples/file-server/src/main/kotlin/FileServerExample.kt

@@ -9,12 +9,12 @@ import java.io.File
 const val FOLDER_NAME = "files"
 val folder = File(FOLDER_NAME)
 
-fun main() {
+suspend fun main() {
     val server = HttpServer()
 
     println("Serving files from: ${folder.absolutePath}")
 
-    server.routeController.apply {
+    server.routing {
         get("/", ::getRoot)
         get("/conflicting", ::getConflictingPath)
         get("/a/b/c", ::getConflictingPath)

examples/hello-world/src/main/kotlin/HelloWorldExample.kt

@@ -4,10 +4,10 @@ import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.model.RequestObject
 import net.ccbluex.netty.http.util.httpOk
 
-fun main() {
+suspend fun main() {
     val server = HttpServer()
 
-    server.routeController.apply {
+    server.routing {
         get("/", ::getRoot)
         get("/hello", ::getHello) // /hello?name=World
         get("/hello/:name", ::getHello) // /hello/World

examples/zip-server/src/main/kotlin/ZipServerExample.kt

@@ -22,10 +22,10 @@ import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.rest.RouteController
 import java.io.File
 
-fun main() {
+suspend fun main() {
     // Start server
     val server = HttpServer()
-    server.routeController.apply {
+    server.routing {
         zip("/static", File("example.zip").inputStream())
     }
 

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

@@ -25,11 +25,13 @@ import io.netty.channel.ChannelOption
 import io.netty.channel.EventLoopGroup
 import io.netty.handler.logging.LogLevel
 import io.netty.handler.logging.LoggingHandler
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import net.ccbluex.netty.http.coroutines.awaitSuspend
 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.websocket.WebSocketController
@@ -44,7 +46,7 @@ import java.net.InetSocketAddress
  */
 class HttpServer {
 
-    val routeController = RouteController()
+    internal val routeController = RouteController()
 
     private val lock = Mutex()
 
@@ -64,6 +66,10 @@ class HttpServer {
         middlewares += middleware
     }
 
+    fun routing(block: Node.() -> Unit) {
+        routeController.apply(block)
+    }
+
     /**
      * Starts the Netty server on the specified port.
      *
@@ -119,4 +125,8 @@ class HttpServer {
         logger.info("Netty server stopped.")
     }
 
+    fun stopBlocking() = runBlocking {
+        stop()
+    }
+
 }

src/main/kotlin/net/ccbluex/netty/http/rest/RouteControl.kt

@@ -19,13 +19,7 @@
  */
 package net.ccbluex.netty.http.rest
 
-import io.netty.handler.codec.http.FullHttpResponse
 import io.netty.handler.codec.http.HttpMethod
-import net.ccbluex.netty.http.util.httpFile
-import net.ccbluex.netty.http.util.httpForbidden
-import net.ccbluex.netty.http.util.httpNotFound
-import net.ccbluex.netty.http.model.RequestObject
-import java.io.File
 
 /**
  * Controller for handling routing of HTTP requests.

src/test/kotlin/HttpMiddlewareServerTest.kt

@@ -1,6 +1,7 @@
 import com.google.gson.JsonObject
 import io.netty.handler.codec.http.FullHttpResponse
 import io.netty.handler.codec.http.HttpResponseStatus
+import kotlinx.coroutines.runBlocking
 import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.middleware.Middleware
 import net.ccbluex.netty.http.model.RequestObject
@@ -50,18 +51,18 @@ class HttpMiddlewareServerTest {
      * It stops the server and deletes the temporary directory.
      */
     @AfterAll
-    fun cleanup() {
+    fun cleanup() = runBlocking {
         server.stop()
     }
 
     /**
      * This function starts the HTTP server with routing configured for
      * different difficulty levels.
      */
-    private fun startHttpServer(): HttpServer {
+    private fun startHttpServer(): HttpServer = runBlocking {
         val server = HttpServer()
 
-        server.routeController.apply {
+        server.routing {
             get("/", ::static)
         }
 
@@ -81,7 +82,7 @@ class HttpMiddlewareServerTest {
         })
 
         server.start(8080)  // Start the server on port 8080
-        return server
+        server
     }
 
     @Suppress("UNUSED_PARAMETER")

src/test/kotlin/HttpServerTest.kt

@@ -1,5 +1,6 @@
 import com.google.gson.JsonObject
 import io.netty.handler.codec.http.FullHttpResponse
+import kotlinx.coroutines.runBlocking
 import net.ccbluex.netty.http.HttpServer
 import net.ccbluex.netty.http.model.RequestObject
 import net.ccbluex.netty.http.util.httpOk
@@ -55,18 +56,18 @@ class HttpServerTest {
      */
     @AfterAll
     fun cleanup() {
-        server.stop()
+        server.stopBlocking()
         folder.deleteRecursively() // Clean up the temporary folder
     }
 
     /**
      * This function starts the HTTP server with routing configured for
      * different difficulty levels.
      */
-    private fun startHttpServer(folder: File): HttpServer {
+    private fun startHttpServer(folder: File): HttpServer = runBlocking {
         val server = HttpServer()
 
-        server.routeController.apply {
+        server.routing {
             // Routes with difficulty levels
             get("/a", ::a)
             get("/b", ::b)
@@ -95,7 +96,7 @@ class HttpServerTest {
         }
 
         server.start(8080)  // Start the server on port 8080
-        return server
+        server
     }
 
     @Suppress("UNUSED_PARAMETER")