iOS decode json

data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt

@@ -26,10 +26,10 @@ import me.tatarka.inject.annotations.Provides
 interface DataComponent {
 
     @Provides
-    fun ktorfit(http: Http, serverPreferences: ServerPreferences) = Ktorfit
+    fun ktorfit(http: Http, serverPreferences: ServerPreferences, flowIOResponseConverter: FlowIOResponseConverter) = Ktorfit
         .Builder()
         .httpClient(http)
-        .responseConverter(FlowIOResponseConverter())
+        .responseConverter(flowIOResponseConverter)
         .baseUrl(serverPreferences.serverUrl().get().toString().addSuffix('/'))
         .build()
 

data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIOResponseConverter.kt

@@ -10,14 +10,15 @@ import ca.gosyer.jui.core.lang.IO
 import de.jensklingenberg.ktorfit.Ktorfit
 import de.jensklingenberg.ktorfit.converter.request.ResponseConverter
 import de.jensklingenberg.ktorfit.internal.TypeData
-import io.ktor.client.call.body
 import io.ktor.client.statement.HttpResponse
 import io.ktor.util.reflect.TypeInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.serialization.json.Json
+import me.tatarka.inject.annotations.Inject
 
-class FlowIOResponseConverter : ResponseConverter {
+class FlowIOResponseConverter @Inject constructor(private val json: Json) : ResponseConverter {
 
     override fun supportedType(typeData: TypeData, isSuspend: Boolean): Boolean {
         return typeData.qualifiedName == "kotlinx.coroutines.flow.Flow"
@@ -34,7 +35,7 @@ class FlowIOResponseConverter : ResponseConverter {
                 if (info.type == HttpResponse::class) {
                     emit(response!!)
                 } else {
-                    emit(response!!.body(info))
+                    emit(decodeType(response!!, info, json))
                 }
             } catch (exception: Exception) {
                 throw exception
@@ -42,3 +43,5 @@ class FlowIOResponseConverter : ResponseConverter {
         }.flowOn(Dispatchers.IO)
     }
 }
+
+expect suspend fun decodeType(response: HttpResponse, typeInfo: TypeInfo, json: Json): Any

data/src/iosMain/kotlin/ca/gosyer/jui/data/IosFlowIOResponseConverter.kt

@@ -0,0 +1,17 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.jui.data
+
+import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.bodyAsText
+import io.ktor.util.reflect.TypeInfo
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.serializer
+
+actual suspend fun decodeType(response: HttpResponse, typeInfo: TypeInfo, json: Json): Any {
+    return json.decodeFromString(serializer(typeInfo.kotlinType!!), response.bodyAsText())!!
+}

data/src/jvmMain/kotlin/ca/gosyer/jui/data/JvmFlowIOResponseConverter.kt

@@ -0,0 +1,16 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package ca.gosyer.jui.data
+
+import io.ktor.client.call.body
+import io.ktor.client.statement.HttpResponse
+import io.ktor.util.reflect.TypeInfo
+import kotlinx.serialization.json.Json
+
+actual suspend fun decodeType(response: HttpResponse, typeInfo: TypeInfo, json: Json): Any {
+    return response.body(typeInfo)
+}

domain/src/commonMain/kotlin/ca/gosyer/jui/domain/SharedDomainComponent.kt

@@ -22,6 +22,7 @@ import ca.gosyer.jui.domain.source.service.CatalogPreferences
 import ca.gosyer.jui.domain.ui.service.UiPreferences
 import ca.gosyer.jui.domain.updates.interactor.UpdateChecker
 import ca.gosyer.jui.domain.updates.service.UpdatePreferences
+import kotlinx.serialization.json.Json
 import me.tatarka.inject.annotations.Provides
 
 interface SharedDomainComponent : CoreComponent {
@@ -58,6 +59,8 @@ interface SharedDomainComponent : CoreComponent {
 
     val serverListeners: ServerListeners
 
+    val json: Json
+
     @get:AppScope
     @get:Provides
     val serverPreferencesFactory: ServerPreferences
@@ -103,7 +106,7 @@ interface SharedDomainComponent : CoreComponent {
     @get:AppScope
     @get:Provides
     val httpFactory: Http
-        get() = httpProvider.get(serverPreferences)
+        get() = httpProvider.get()
 
     @get:AppScope
     @get:Provides
@@ -119,4 +122,14 @@ interface SharedDomainComponent : CoreComponent {
     @get:Provides
     val serverListenersFactory: ServerListeners
         get() = ServerListeners()
+
+    @get:AppScope
+    @get:Provides
+    val jsonFactory: Json
+        get() = Json {
+            isLenient = false
+            ignoreUnknownKeys = true
+            allowSpecialFloatingPointValues = true
+            useArrayPolymorphism = false
+        }
 }

domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt

@@ -41,8 +41,11 @@ expect val Engine: HttpClientEngineFactory<HttpClientEngineConfig>
 
 expect fun HttpClientConfig<HttpClientEngineConfig>.configurePlatform()
 
-class HttpProvider @Inject constructor() {
+class HttpProvider @Inject constructor(
-    fun get(serverPreferences: ServerPreferences): Http {
+    private val serverPreferences: ServerPreferences,
+    private val json: Json
+) {
+    fun get(): Http {
         return HttpClient(Engine) {
             configurePlatform()
 
@@ -95,14 +98,7 @@ class HttpProvider @Inject constructor() {
                 socketTimeoutMillis = 2.minutes.inWholeMilliseconds
             }
             install(ContentNegotiation) {
-                json(
+                json(json)
-                    Json {
-                        isLenient = false
-                        ignoreUnknownKeys = true
-                        allowSpecialFloatingPointValues = true
-                        useArrayPolymorphism = false
-                    }
-                )
             }
             install(WebSockets)
             install(Logging) {