fixes in UnifiedRequester

0.5.1

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.5.2
+
+* `Ktor`:
+    * `Client`:
+        * Fixes in `UnifiedRequester`
+
+## 0.5.1
+
+* `Versions`:
+    * `Kotlin Serialization`: `1.2.0` -> `1.2.1`
+
 ## 0.5.0
 
 **Notice**: This version is still depend on Kotlin

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx2g
 
 kotlin_version=1.5.0
 kotlin_coroutines_version=1.5.0
-kotlin_serialisation_core_version=1.2.0
+kotlin_serialisation_core_version=1.2.1
 kotlin_exposed_version=0.31.1
 
 ktor_version=1.5.4
@@ -45,5 +45,5 @@ dokka_version=1.4.32
 # Project data
 
 group=dev.inmo
-version=0.5.0
+version=0.5.2
-android_code_version=41
+android_code_version=43

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

@@ -15,30 +15,21 @@ class UnifiedRequester(
     suspend fun <ResultType> uniget(
         url: String,
         resultDeserializer: DeserializationStrategy<ResultType>
-    ): ResultType = client.get<StandardKtorSerialInputData>(
+    ): ResultType = client.uniget(url, resultDeserializer, serialFormat)
-        url
-    ).let {
-        serialFormat.decodeDefault(resultDeserializer, it)
-    }
-
 
     fun <T> encodeUrlQueryValue(
         serializationStrategy: SerializationStrategy<T>,
         value: T
-    ) = serialFormat.encodeHex(
+    ) = serializationStrategy.encodeUrlQueryValue(
-        serializationStrategy,
+        value,
-        value
+        serialFormat
     )
 
     suspend fun <BodyType, ResultType> unipost(
         url: String,
         bodyInfo: BodyPair<BodyType>,
         resultDeserializer: DeserializationStrategy<ResultType>
-    ) = client.post<StandardKtorSerialInputData>(url) {
+    ) = client.unipost(url, bodyInfo, resultDeserializer, serialFormat)
-        body = serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
-    }.let {
-        serialFormat.decodeDefault(resultDeserializer, it)
-    }
 
     fun <T> createStandardWebsocketFlow(
         url: String,
@@ -51,14 +42,30 @@ val defaultRequester = UnifiedRequester()
 
 suspend fun <ResultType> HttpClient.uniget(
     url: String,
-    resultDeserializer: DeserializationStrategy<ResultType>
+    resultDeserializer: DeserializationStrategy<ResultType>,
-) = defaultRequester.uniget(url, resultDeserializer)
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = get<StandardKtorSerialInputData>(
+    url
+).let {
+    serialFormat.decodeDefault(resultDeserializer, it)
+}
 
 
-fun <T> SerializationStrategy<T>.encodeUrlQueryValue(value: T) = defaultRequester.encodeUrlQueryValue(this, value)
+fun <T> SerializationStrategy<T>.encodeUrlQueryValue(
+    value: T,
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = serialFormat.encodeHex(
+    this,
+    value
+)
 
 suspend fun <BodyType, ResultType> HttpClient.unipost(
     url: String,
     bodyInfo: BodyPair<BodyType>,
-    resultDeserializer: DeserializationStrategy<ResultType>
+    resultDeserializer: DeserializationStrategy<ResultType>,
-) = defaultRequester.unipost(url, bodyInfo, resultDeserializer)
+    serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
+) = post<StandardKtorSerialInputData>(url) {
+    body = serialFormat.encodeDefault(bodyInfo.first, bodyInfo.second)
+}.let {
+    serialFormat.decodeDefault(resultDeserializer, it)
+}