update ktor utils

ktor/server/build.gradle

@@ -17,6 +17,7 @@ kotlin {
         jvmMain {
             dependencies {
                 api "io.ktor:ktor-server:$ktor_version"
+                api "io.ktor:ktor-server-cio:$ktor_version"
                 api "io.ktor:ktor-server-host-common:$ktor_version"
                 api "io.ktor:ktor-websockets:$ktor_version"
             }

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/FlowsWebsocket.kt

@@ -1,8 +1,7 @@
 package dev.inmo.micro_utils.ktor.server
 
 import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.CorrectCloseException
-import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
+import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.http.cio.websocket.*
 import io.ktor.routing.Route
 import io.ktor.websocket.webSocket
@@ -20,15 +19,16 @@ private suspend fun DefaultWebSocketSession.checkReceivedAndCloseIfExists() {
 fun <T> Route.includeWebsocketHandling(
     suburl: String,
     flow: Flow<T>,
-    converter: (T) -> ByteArray
+    converter: (T) -> StandardKtorSerialInputData
 ) {
     webSocket(suburl) {
+//        println("connected")
         safely {
             flow.collect {
-                checkReceivedAndCloseIfExists()
                 send(converter(it))
             }
         }
+//        println("disconnected")
     }
 }
 
@@ -40,5 +40,5 @@ fun <T> Route.includeWebsocketHandling(
     suburl,
     flow
 ) {
-    standardKtorSerialFormat.encodeToByteArray(serializer, it)
+    standardKtorSerialFormat.encodeDefault(serializer, it)
 }

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/PaginationInUrl.kt

@@ -0,0 +1,10 @@
+package dev.inmo.micro_utils.ktor.server
+
+import dev.inmo.micro_utils.pagination.*
+import io.ktor.http.Parameters
+
+val Parameters.extractPagination: Pagination
+    get() = SimplePagination(
+        get("page") ?.toIntOrNull() ?: 0,
+        get("size") ?.toIntOrNull() ?: defaultMediumPageSize
+    )

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt

@@ -1,8 +1,10 @@
 package dev.inmo.micro_utils.ktor.server
 
-import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
+import dev.inmo.micro_utils.coroutines.safely
+import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.application.ApplicationCall
 import io.ktor.http.HttpStatusCode
+import io.ktor.request.receive
 import io.ktor.response.respond
 import io.ktor.response.respondBytes
 import io.ktor.util.toByteArray
@@ -12,18 +14,20 @@ suspend fun <T> ApplicationCall.unianswer(
     answerSerializer: SerializationStrategy<T>,
     answer: T
 ) {
-    respondBytes(
-        standardKtorSerialFormat.encodeToByteArray(answerSerializer, answer),
+    respondBytes (
+        standardKtorSerialFormat.encodeDefault(answerSerializer, answer),
         standardKtorSerialFormatContentType
     )
 }
 
 suspend fun <T> ApplicationCall.uniload(
     deserializer: DeserializationStrategy<T>
-) = standardKtorSerialFormat.decodeFromByteArray(
-    deserializer,
-    request.receiveChannel().toByteArray()
-)
+) = safely {
+    standardKtorSerialFormat.decodeDefault(
+        deserializer,
+        receive()
+    )
+}
 
 suspend fun ApplicationCall.getParameterOrSendError(
     field: String
@@ -49,7 +53,7 @@ fun <T> ApplicationCall.decodeUrlQueryValue(
     field: String,
     deserializer: DeserializationStrategy<T>
 ) = getQueryParameter(field) ?.let {
-    standardKtorSerialFormat.decodeFromHexString(
+    standardKtorSerialFormat.decodeHex(
         deserializer,
         it
     )

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/StartServer.kt

@@ -0,0 +1,33 @@
+package dev.inmo.micro_utils.ktor.server
+
+import io.ktor.application.Application
+import io.ktor.server.cio.CIO
+import io.ktor.server.engine.*
+import kotlin.random.Random
+
+fun <TEngine : ApplicationEngine, TConfiguration : ApplicationEngine.Configuration> createKtorServer(
+    engine: ApplicationEngineFactory<TEngine, TConfiguration>,
+    host: String = "localhost",
+    port: Int = Random.nextInt(1024, 65535),
+    block: Application.() -> Unit
+): TEngine {
+    val env = applicationEngineEnvironment {
+        module(block)
+        connector {
+            this@connector.host = host
+            this@connector.port = port
+        }
+    }
+    return embeddedServer(engine, env)
+}
+
+/**
+ * Create server with [CIO] server engine without starting of it
+ *
+ * @see ApplicationEngine.start
+ */
+fun createKtorServer(
+    host: String = "localhost",
+    port: Int = Random.nextInt(1024, 65535),
+    block: Application.() -> Unit
+): ApplicationEngine = createKtorServer(CIO, host, port, block)