upgrade up to multiplatform project

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/SauceNaoAPI.kt

@@ -5,20 +5,18 @@ import com.github.insanusmokrassar.SauceNaoAPI.exceptions.sauceNaoAPIException
 import com.github.insanusmokrassar.SauceNaoAPI.models.*
 import com.github.insanusmokrassar.SauceNaoAPI.utils.*
 import io.ktor.client.HttpClient
-import io.ktor.client.call.call
-import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.features.ClientRequestException
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.readText
 import io.ktor.http.*
+import io.ktor.utils.io.core.Closeable
 import io.ktor.utils.io.core.Input
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.json.Json
-import java.io.Closeable
-import java.util.logging.Logger
+import kotlinx.serialization.json.nonstrict
 import kotlin.Result
 import kotlin.coroutines.*
 
@@ -35,15 +33,21 @@ private const val MINIMAL_SIMILARITY_FIELD = "minsim"
 
 private const val SEARCH_URL = "https://saucenao.com/search.php"
 
+val defaultSauceNaoParser = Json {
+    allowSpecialFloatingPointValues = true
+    allowStructuredMapKeys = true
+    ignoreUnknownKeys = true
+    useArrayPolymorphism = true
+}
+
 data class SauceNaoAPI(
     private val apiToken: String? = null,
     private val outputType: OutputType = JsonOutputType,
-    private val client: HttpClient = HttpClient(OkHttp),
+    private val client: HttpClient = HttpClient(),
     private val searchUrl: String = SEARCH_URL,
-    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default)
+    private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    private val parser: Json = defaultSauceNaoParser
 ) : Closeable {
-    private val logger = Logger.getLogger("SauceNaoAPI")
-
     private val requestsChannel = Channel<Pair<Continuation<SauceNaoAnswer>, HttpRequestBuilder>>(Channel.UNLIMITED)
     private val timeManager = TimeManager(scope)
     private val quotaManager = RequestQuotaManager(scope)
@@ -61,7 +65,6 @@ data class SauceNaoAPI(
 
                     quotaManager.updateQuota(answer.header, timeManager)
                 } catch (e: TooManyRequestsException) {
-                    logger.warning("Exceed time limit. Answer was:\n${e.answerContent}")
                     quotaManager.happenTooManyRequests(timeManager, e)
                     requestsChannel.send(callback to requestBuilder)
                 } catch (e: Exception) {
@@ -87,7 +90,7 @@ data class SauceNaoAPI(
 
     suspend fun request(
         mediaInput: Input,
-        mimeType: ContentType = mediaInput.mimeType,
+        mimeType: ContentType,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
     ): SauceNaoAnswer? = makeRequest(
@@ -138,9 +141,8 @@ data class SauceNaoAPI(
         return try {
             val call = client.request<HttpResponse>(builder)
             val answerText = call.readText()
-            logger.info(answerText)
             timeManager.addTimeAndClear()
-            Json.nonstrict.parse(
+            parser.decodeFromString(
                 SauceNaoAnswerSerializer,
                 answerText
             )

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/exceptions/TooManyRequestsException.kt

@@ -9,6 +9,7 @@ import io.ktor.http.HttpStatusCode.Companion.TooManyRequests
 import io.ktor.utils.io.errors.IOException
 
 internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception  {
+    val response = response ?: return this
         return when (response.status) {
             TooManyRequests -> {
                 val answerContent = response.readText()
@@ -21,14 +22,14 @@ internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception  {
         }
     }
 
-sealed class TooManyRequestsException : IOException() {
+sealed class TooManyRequestsException(message: String, cause: Throwable? = null) : IOException(message, cause) {
     abstract val answerContent: String
     abstract val waitTime: TimeSpan
 }
 
-class TooManyRequestsShortException(override val answerContent: String) : TooManyRequestsException() {
+class TooManyRequestsShortException(override val answerContent: String) : TooManyRequestsException("Too many requests were sent in the short period") {
     override val waitTime: TimeSpan = SHORT_TIME_RECALCULATING_MILLIS
 }
-class TooManyRequestsLongException(override val answerContent: String) : TooManyRequestsException() {
+class TooManyRequestsLongException(override val answerContent: String) : TooManyRequestsException("Too many requests were sent in the long period") {
     override val waitTime: TimeSpan = LONG_TIME_RECALCULATING_MILLIS
 }

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/Header.kt

@@ -1,9 +1,12 @@
 package com.github.insanusmokrassar.SauceNaoAPI.models
 
+import com.github.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
 import kotlinx.serialization.*
-import kotlinx.serialization.internal.StringDescriptor
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonObjectSerializer
+import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
 
 @Serializable
 data class Header(
@@ -39,21 +42,24 @@ data class Header(
 )
 
 internal object IndexesSerializer : KSerializer<List<HeaderIndex?>> {
-    override val descriptor: SerialDescriptor = StringDescriptor
+    override val descriptor: SerialDescriptor = String.serializer().descriptor
 
     override fun deserialize(decoder: Decoder): List<HeaderIndex?> {
-        val json = JsonObjectSerializer.deserialize(decoder)
+        val json = JsonObject.serializer().deserialize(decoder)
         val parsed = json.keys.mapNotNull { it.toIntOrNull() }.sorted().mapNotNull {
-            val jsonObject = json.getObjectOrNull(it.toString()) ?: return@mapNotNull null
-            val index = Json.nonstrict.parse(HeaderIndex.serializer(), Json.stringify(JsonObjectSerializer, jsonObject))
+            val jsonObject = json[it.toString()] ?.jsonObject ?: return@mapNotNull null
+            val index = defaultSauceNaoParser.decodeFromString(
+                HeaderIndex.serializer(),
+                defaultSauceNaoParser.encodeToString(JsonObject.serializer(), jsonObject)
+            )
             it to index
         }.toMap()
-        return Array<HeaderIndex?>(parsed.keys.max() ?: 0) {
+        return Array<HeaderIndex?>(parsed.keys.maxOrNull() ?: 0) {
             parsed[it]
         }.toList()
     }
 
-    override fun serialize(encoder: Encoder, obj: List<HeaderIndex?>) {
+    override fun serialize(encoder: Encoder, value: List<HeaderIndex?>) {
         TODO()
     }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt

@@ -0,0 +1,55 @@
+package com.github.insanusmokrassar.SauceNaoAPI.models
+
+import com.github.insanusmokrassar.SauceNaoAPI.defaultSauceNaoParser
+import kotlinx.serialization.*
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import kotlinx.serialization.json.*
+
+@Serializable
+private data class TemporalSauceNaoAnswerRepresentation(
+    val header: Header,
+    val results: List<Result> = emptyList(),
+)
+
+@Serializable(SauceNaoAnswerSerializer::class)
+data class SauceNaoAnswer internal constructor(
+    val header: Header,
+    val results: List<Result> = emptyList(),
+    val raw: JsonObject = JsonObject(emptyMap())
+)
+
+@Serializer(SauceNaoAnswer::class)
+object SauceNaoAnswerSerializer : KSerializer<SauceNaoAnswer> {
+    private val resultsSerializer = ListSerializer(Result.serializer())
+    private const val headerField = "header"
+    private const val resultsField = "results"
+    private val serializer = defaultSauceNaoParser
+
+    override fun deserialize(decoder: Decoder): SauceNaoAnswer {
+        val raw = JsonObject.serializer().deserialize(decoder)
+
+        return serializer.decodeFromJsonElement(
+            TemporalSauceNaoAnswerRepresentation.serializer(),
+            raw
+        ).let {
+            SauceNaoAnswer(
+                it.header,
+                it.results,
+                raw
+            )
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: SauceNaoAnswer) {
+        val resultObject = buildJsonObject {
+            value.raw.forEach {
+                put(it.key, it.value)
+            }
+            put(headerField, serializer.encodeToJsonElement(Header.serializer(), value.header))
+            put(resultsField, serializer.encodeToJsonElement(resultsSerializer, value.results))
+        }
+        JsonObject.serializer().serialize(encoder, resultObject)
+    }
+}

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/CommonMultivariantStringSerializer.kt

@@ -3,6 +3,8 @@ package com.github.insanusmokrassar.SauceNaoAPI.utils
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.json.*
 
 
 @Serializer(String::class)
@@ -10,10 +12,10 @@ object CommonMultivariantStringSerializer : KSerializer<String> by String.serial
     private val stringArraySerializer = ListSerializer(String.serializer())
 
     override fun deserialize(decoder: Decoder): String {
-        return try {
-            decoder.decodeSerializableValue(String.serializer())
-        } catch (e: Exception) {
-            decoder.decodeSerializableValue(stringArraySerializer).joinToString()
+        return when (val parsed = JsonElement.serializer().deserialize(decoder)) {
+            is JsonPrimitive -> parsed.content
+            is JsonArray -> parsed.joinToString { it.jsonPrimitive.content }
+            else -> error("Unexpected answer object has been received: $parsed")
         }
     }
 }

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/RequestQuotaManager.kt

@@ -7,9 +7,9 @@ import com.github.insanusmokrassar.SauceNaoAPI.exceptions.TooManyRequestsLongExc
 import com.github.insanusmokrassar.SauceNaoAPI.models.Header
 import com.github.insanusmokrassar.SauceNaoAPI.models.LimitsState
 import com.soywiz.klock.DateTime
+import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import java.io.Closeable
 import kotlin.coroutines.suspendCoroutine
 import kotlin.math.max
 import kotlin.math.min

src/commonMain/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/TimeManager.kt

@@ -3,11 +3,10 @@ package com.github.insanusmokrassar.SauceNaoAPI.utils
 import com.github.insanusmokrassar.SauceNaoAPI.additional.LONG_TIME_RECALCULATING_MILLIS
 import com.github.insanusmokrassar.SauceNaoAPI.additional.SHORT_TIME_RECALCULATING_MILLIS
 import com.soywiz.klock.DateTime
-import com.soywiz.klock.TimeSpan
+import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
-import java.io.Closeable
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.suspendCoroutine
 
@@ -44,7 +43,7 @@ private data class TimeManagerMostOldestInLongGetter(
 ) : TimeManagerAction {
     override suspend fun makeChangeWith(times: MutableList<DateTime>) {
         times.clearTooOldTimes()
-        continuation.resumeWith(Result.success(times.min()))
+        continuation.resumeWith(Result.success(times.minOrNull()))
     }
 }
 
@@ -62,7 +61,7 @@ private data class TimeManagerMostOldestInShortGetter(
             Result.success(
                 times.asSequence().filter {
                     limitTime < it
-                }.min()
+                }.minOrNull()
             )
         )
     }

src/jvmTest/kotlin/Launcher.kt

@@ -1,5 +1,4 @@
-package com.github.insanusmokrassar.SauceNaoAPI
-
+import com.github.insanusmokrassar.SauceNaoAPI.SauceNaoAPI
 import io.ktor.http.ContentType
 import io.ktor.utils.io.streams.asInput
 import kotlinx.coroutines.*

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/models/SauceNaoAnswer.kt

@@ -1,44 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.models
-
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.ListSerializer
-import kotlinx.serialization.json.*
-
-@Serializable
-data class SauceNaoAnswer internal constructor(
-    val header: Header,
-    val results: List<Result> = emptyList(),
-    val raw: JsonObject = JsonObject(emptyMap())
-)
-
-@Serializer(SauceNaoAnswer::class)
-object SauceNaoAnswerSerializer : KSerializer<SauceNaoAnswer> {
-    private val resultsSerializer = ListSerializer(Result.serializer())
-    private const val headerField = "header"
-    private const val resultsField = "results"
-    private val serializer = Json.nonstrict
-
-    override fun deserialize(decoder: Decoder): SauceNaoAnswer {
-        val raw = JsonObjectSerializer.deserialize(decoder)
-        val stringRaw = serializer.stringify(JsonObjectSerializer, raw)
-
-        return serializer.parse(
-            SauceNaoAnswer.serializer(),
-            stringRaw
-        ).copy(
-            raw = raw
-        )
-    }
-
-    override fun serialize(encoder: Encoder, obj: SauceNaoAnswer) {
-        val resultObject = JsonObject(
-            obj.raw.content.let {
-                it + mapOf(
-                    headerField to serializer.toJson(Header.serializer(), obj.header),
-                    resultsField to serializer.toJson(resultsSerializer, obj.results)
-                )
-            }
-        )
-        JsonObject.serializer().serialize(encoder, resultObject)
-    }
-}

src/main/kotlin/com/github/insanusmokrassar/SauceNaoAPI/utils/MimeTypeDecoder.kt

@@ -1,16 +0,0 @@
-package com.github.insanusmokrassar.SauceNaoAPI.utils
-
-import io.ktor.http.ContentType
-import io.ktor.util.asStream
-import io.ktor.utils.io.core.Input
-import java.io.InputStream
-import java.net.URLConnection
-
-val InputStream.mimeType: ContentType
-    get() {
-        val contentType = URLConnection.guessContentTypeFromStream(this)
-        return ContentType.parse(contentType)
-    }
-
-val Input.mimeType: ContentType
-    get() = asStream().mimeType