update ktor utils

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/FlowsWebsockets.kt

@@ -1,8 +1,7 @@
 package dev.inmo.micro_utils.ktor.client
 
 import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.asCorrectWebSocketUrl
+import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import io.ktor.client.HttpClient
 import io.ktor.client.features.websocket.ws
 import io.ktor.http.cio.websocket.*
@@ -17,7 +16,7 @@ import kotlinx.serialization.DeserializationStrategy
 inline fun <T> HttpClient.createStandardWebsocketFlow(
     url: String,
     crossinline checkReconnection: (Throwable?) -> Boolean = { true },
-    crossinline conversation: suspend (ByteArray) -> T
+    crossinline conversation: suspend (StandardKtorSerialInputData) -> T
 ): Flow<T> {
     val correctedUrl = url.asCorrectWebSocketUrl
 
@@ -25,19 +24,11 @@ inline fun <T> HttpClient.createStandardWebsocketFlow(
         val producerScope = this@channelFlow
         do {
             val reconnect = try {
-                safely(
+                safely ({ throw it }) {
-                    {
+                    ws(correctedUrl) {
-                        throw it
+                        for (received in incoming) {
-                    }
+                            when (received) {
-                ) {
+                                is Frame.Binary -> producerScope.send(conversation(received.readBytes()))
-                    ws(
-                        correctedUrl
-                    ) {
-                        while (true) {
-                            when (val received = incoming.receive()) {
-                                is Frame.Binary -> producerScope.send(
-                                    conversation(received.readBytes())
-                                )
                                 else -> {
                                     producerScope.close()
                                     return@ws
@@ -57,7 +48,7 @@ inline fun <T> HttpClient.createStandardWebsocketFlow(
         } while (reconnect)
         if (!producerScope.isClosedForSend) {
             safely(
-                { /* do nothing */ }
+                { it.printStackTrace() }
             ) {
                 producerScope.close()
             }
@@ -77,6 +68,5 @@ inline fun <T> HttpClient.createStandardWebsocketFlow(
     url,
     checkReconnection
 ) {
-    standardKtorSerialFormat.decodeFromByteArray(deserializer, it)
+    standardKtorSerialFormat.decodeDefault(deserializer, it)
 }
-

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt

@@ -1,6 +1,6 @@
 package dev.inmo.micro_utils.ktor.client
 
-import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
+import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import io.ktor.client.request.post
@@ -11,13 +11,14 @@ typealias BodyPair<T> = Pair<SerializationStrategy<T>, T>
 suspend fun <ResultType> HttpClient.uniget(
     url: String,
     resultDeserializer: DeserializationStrategy<ResultType>
-) = get<ByteArray>(
+) = get<StandardKtorSerialInputData>(
     url
 ).let {
-    standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it)
+    standardKtorSerialFormat.decodeDefault(resultDeserializer, it)
 }
 
-fun <T> SerializationStrategy<T>.encodeUrlQueryValue(value: T) = standardKtorSerialFormat.encodeToHexString(
+
+fun <T> SerializationStrategy<T>.encodeUrlQueryValue(value: T) = standardKtorSerialFormat.encodeHex(
     this,
     value
 )
@@ -26,8 +27,8 @@ suspend fun <BodyType, ResultType> HttpClient.unipost(
     url: String,
     bodyInfo: BodyPair<BodyType>,
     resultDeserializer: DeserializationStrategy<ResultType>
-) = post<ByteArray>(url) {
+) = post<StandardKtorSerialInputData>(url) {
-    body = standardKtorSerialFormat.encodeToByteArray(bodyInfo.first, bodyInfo.second)
+    body = standardKtorSerialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
 }.let {
-    standardKtorSerialFormat.decodeFromByteArray(resultDeserializer, it)
+    standardKtorSerialFormat.decodeDefault(resultDeserializer, it)
 }

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/BuildStandardUrl.kt

@@ -21,3 +21,4 @@ fun buildStandardUrl(
     subpart: String,
     vararg parameters: QueryParam
 ) = buildStandardUrl(basePart, subpart, parameters.toList())
+

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/CollectionsSerializers.kt

@@ -1,6 +0,0 @@
-package dev.inmo.micro_utils.ktor.common
-
-import kotlinx.serialization.builtins.SetSerializer
-import kotlinx.serialization.builtins.serializer
-
-val setIdsSerializer = SetSerializer(String.serializer())

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/CorrectWebsocketUrl.kt

@@ -1,6 +1,6 @@
 package dev.inmo.micro_utils.ktor.common
 
-private val schemaRegex = Regex("[^:]*//")
+private val schemaRegex = Regex("^[^:]*://")
 
 val String.asCorrectWebSocketUrl: String
     get() = if (startsWith("ws")) {

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/QueryParamsBuilder.kt

@@ -11,7 +11,7 @@ val List<QueryParam>.asUrlQuery: String
 
 fun String.includeQueryParams(
     queryParams: QueryParams
-): String = "$this${if (contains("?")) "&" else "?"}${queryParams.asUrlQuery}"
+): String = "$this${if(queryParams.isNotEmpty()) "${if (contains("?")) "&" else "?"}${queryParams.asUrlQuery}" else ""}"
 
 fun String.includeQueryParams(
     queryParams: List<QueryParam>

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/StandardSerializer.kt

@@ -1,5 +1,32 @@
 package dev.inmo.micro_utils.ktor.common
 
+import kotlinx.serialization.*
 import kotlinx.serialization.cbor.Cbor
 
-val standardKtorSerialFormat = Cbor
+typealias StandardKtorSerialFormat = BinaryFormat
+typealias StandardKtorSerialInputData = ByteArray
+val standardKtorSerialFormat: StandardKtorSerialFormat = Cbor {  }
+
+inline fun <T> StandardKtorSerialFormat.decodeDefault(
+    deserializationStrategy: DeserializationStrategy<T>,
+    input: StandardKtorSerialInputData
+): T = decodeFromByteArray(deserializationStrategy, input)
+
+inline fun <T> StandardKtorSerialFormat.encodeDefault(
+    serializationStrategy: SerializationStrategy<T>,
+    data: T
+): StandardKtorSerialInputData = encodeToByteArray(serializationStrategy, data)
+
+val cbor = Cbor {}
+
+inline fun <T> StandardKtorSerialFormat.decodeHex(
+    deserializationStrategy: DeserializationStrategy<T>,
+    input: String
+): T = decodeFromHexString(deserializationStrategy, input)
+
+inline fun <T> StandardKtorSerialFormat.encodeHex(
+    serializationStrategy: SerializationStrategy<T>,
+    data: T
+): String = encodeToHexString(serializationStrategy, data)
+
+

ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/common/WebSockets.kt

@@ -1,7 +0,0 @@
-package dev.inmo.micro_utils.ktor.common
-
-const val clientWebsocketHelloMessage = "Start getting of updates"
-const val serverWebsocketHelloMessage = "Accepted"
-
-const val serverWebsocketNewMessageMessage = "NewMessage"
-const val websocketFinalizationMessage = "Final"

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.*
-import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 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(
+    respondBytes (
-        standardKtorSerialFormat.encodeToByteArray(answerSerializer, answer),
+        standardKtorSerialFormat.encodeDefault(answerSerializer, answer),
         standardKtorSerialFormatContentType
     )
 }
 
 suspend fun <T> ApplicationCall.uniload(
     deserializer: DeserializationStrategy<T>
-) = standardKtorSerialFormat.decodeFromByteArray(
+) = safely {
+    standardKtorSerialFormat.decodeDefault(
         deserializer,
-    request.receiveChannel().toByteArray()
+        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)