From db10fe1b2ca2dd6e6406034197ffc7b3c064226f Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 27 Apr 2022 18:24:51 +0600
Subject: [PATCH] several fixes

---
 .../ktor/client/StandardHttpClientGetPost.kt          | 11 +++++------
 .../micro_utils/ktor/server/ServerRoutingShortcuts.kt |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt
index 69a0f37e4cd..8ac3e7d571a 100644
--- a/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt
+++ b/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/StandardHttpClientGetPost.kt
@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.common.MPPFile
 import dev.inmo.micro_utils.common.filename
 import dev.inmo.micro_utils.ktor.common.*
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.statement.readBytes
@@ -104,10 +105,8 @@ suspend fun <ResultType> HttpClient.uniget(
     url: String,
     resultDeserializer: DeserializationStrategy<ResultType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
-) = get(
-    url
-).let {
-    serialFormat.decodeDefault(resultDeserializer, it.readBytes())
+) = get(url).let {
+    serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>())
 }
 
 
@@ -129,7 +128,7 @@ suspend fun <BodyType, ResultType> HttpClient.unipost(
         serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
     )
 }.let {
-    serialFormat.decodeDefault(resultDeserializer, it.readBytes())
+    serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>())
 }
 
 suspend fun <ResultType> HttpClient.unimultipart(
@@ -158,7 +157,7 @@ suspend fun <ResultType> HttpClient.unimultipart(
     }
 ) {
     requestBuilder()
-}.let { serialFormat.decodeDefault(resultDeserializer, it.readBytes()) }
+}.let { serialFormat.decodeDefault(resultDeserializer, it.body<StandardKtorSerialInputData>()) }
 
 suspend fun <BodyType, ResultType> HttpClient.unimultipart(
     url: String,
diff --git a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt
index e0adaaeb0fc..cc4bb0e9d37 100644
--- a/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt
+++ b/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ServerRoutingShortcuts.kt
@@ -14,8 +14,7 @@ import io.ktor.server.response.respondBytes
 import io.ktor.server.routing.Route
 import io.ktor.server.websocket.WebSocketServerSession
 import io.ktor.util.pipeline.PipelineContext
-import io.ktor.utils.io.core.Input
-import io.ktor.utils.io.core.use
+import io.ktor.utils.io.core.*
 import io.ktor.utils.io.streams.asInput
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.DeserializationStrategy
@@ -132,7 +131,7 @@ suspend fun ApplicationCall.uniloadMultipart(
             is PartData.FormItem -> onFormItem(it)
             is PartData.FileItem -> {
                 when (it.name) {
-                    "bytes" -> resultInput = it.streamProvider().asInput()
+                    "bytes" -> resultInput = it.provider()
                     else -> onCustomFileItem(it)
                 }
             }
@@ -154,7 +153,7 @@ suspend fun <T> ApplicationCall.uniloadMultipart(
         onFormItem,
         {
             if (it.name == "data") {
-                data = standardKtorSerialFormat.decodeDefault(deserializer, it.streamProvider().readBytes()).optional
+                data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional
             } else {
                 onCustomFileItem(it)
             }
@@ -201,7 +200,7 @@ suspend fun <T> ApplicationCall.uniloadMultipartFile(
                             }
                         }
                     }
-                    "data" -> data = standardKtorSerialFormat.decodeDefault(deserializer, it.streamProvider().readBytes()).optional
+                    "data" -> data = standardKtorSerialFormat.decodeDefault(deserializer, it.provider().readBytes()).optional
                     else -> onCustomFileItem(it)
                 }
             }