Merge pull request #139 from InsanusMokrassar/0.12.0

0.12.0

.github/workflows/build_and_publish.yml

@@ -0,0 +1,24 @@
+name: Publish package to GitHub Packages
+on: [push]
+jobs:
+  publishing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Rewrite version
+        run: |
+          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
+          cat gradle.properties | sed -e "s/^library_version=\([0-9\.]*\)/library_version=\1-branch_$branch-build${{ github.run_number }}/" > gradle.properties.tmp
+          rm gradle.properties
+          mv gradle.properties.tmp gradle.properties
+      - name: Build
+        run: ./gradlew build
+      - name: Publish
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
+        continue-on-error: true
+        env:
+          GITHUBPACKAGES_USER: ${{ github.actor }}
+          GITHUBPACKAGES_PASSWORD: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,71 @@
 # SauceNaoAPI Changelog
 
+## 0.11.1
+
+* Versions updates:
+  * `Ktor`: `2.0.1` -> `2.0.3`
+  * `Coroutines`: `1.6.1` -> `1.6.4`
+
+## 0.11.0
+
+* Versions updates:
+  * `Kotlin`: `1.6.10` -> `1.6.21`
+  * `Serialization`: `1.3.2` -> `1.3.3`
+  * `Klock`: `2.6.3` -> `2.7.0`
+  * `Ktor`: `1.6.8` -> `2.0.1`
+
+## 0.10.1
+
+* Versions updates:
+  * `Klock`: `2.6.2` -> `2.6.3`
+  * `Ktor`: `1.6.7` -> `1.6.8`
+
+## 0.10.0
+
+Migration onto libs versions toml
+
+## 0.9.1
+
+* Versions updates:
+  * `Kotlin`: `1.5.30` -> `1.5.31`
+  * `Klock`: `2.4.0` -> `2.4.2`
+  * `Coroutines`: `1.5.1` -> `1.5.2`
+* Add several extensions to `ResultData`: `authors`, `froms`, `charactersList`, `titles`, `urls`
+
+## 0.9.0
+
+* Versions updates:
+  * `Kotlin`: `1.5.10` -> `1.5.30`
+  * `Klock`: `2.1.2` -> `2.4.0`
+  * `Ktor`: `1.5.4` -> `1.6.3`
+  * `Serialization`: `1.2.1` -> `1.2.2`
+  * `Coroutines`: `1.5.0` -> `1.5.1`
+
+## 0.8.2
+
+* Versions updates:
+  * `Kotlin`: `1.4.32` -> `1.5.10`
+  * `Klock`: `2.0.7` -> `2.1.2`
+  * `Ktor`: `1.5.3` -> `1.5.4`
+  * `Serialization`: `1.1.0` -> `1.2.1`
+  * `Coroutines`: `1.4.3` -> `1.5.0`
+
+## 0.8.1
+
+* Versions updates:
+  * `Kotlin`: `1.4.31` -> `1.4.32`
+  * `Klock`: `2.0.6` -> `2.0.7`
+  * `Ktor`: `1.5.2` -> `1.5.3`
+
+## 0.8.0
+
+* Versions updates:
+  * `Kotlin`: `1.4.21` -> `1.4.31`
+  * `Klock`: `2.0.4` -> `2.0.6`
+  * `Ktor`: `1.5.1` -> `1.5.2`
+  * `Kotlin Serialisation`: `1.0.1` -> `1.1.0`
+  * `Kotlin Coroutines`: `1.4.2` -> `1.4.3`
+
 ## 0.7.2
 
 * Versions updates:

README.md

@@ -1,6 +1,7 @@
 # SauceNaoAPI
 
- [ ![Download](https://api.bintray.com/packages/insanusmokrassar/SauceNaoAPI/saucenaoapi/images/download.svg) ](https://bintray.com/insanusmokrassar/SauceNaoAPI/saucenaoapi/_latestVersion)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi/badge.svg)](https://maven-badges.herokuapp.com/maven-central/dev.inmo/saucenaoapi)
+
 
 It is wrapper for [SauceNAO](https://saucenao.com/) API. For now, library is
 in preview state. It can be fully used, but some of info can be unavailable from

build.gradle

@@ -1,20 +1,19 @@
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath libs.buildscript.kt.gradle
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath libs.buildscript.kt.serialization
-        classpath "com.github.breadmoirai:github-release:$gradle_github_release_plugin_version"
+        classpath libs.buildscript.gh.release
     }
 }
 
 plugins {
-    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    alias(libs.plugins.multiplatform)
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+    alias(libs.plugins.serialization)
 }
 
 project.version = "$library_version"
@@ -25,14 +24,12 @@ apply from: "github_release.gradle"
 
 repositories {
     mavenLocal()
-    jcenter()
     mavenCentral()
-    maven { url "https://kotlin.bintray.com/kotlinx" }
 }
 
 kotlin {
     jvm()
-    js(BOTH) {
+    js(IR) {
         browser()
         nodejs()
     }
@@ -43,10 +40,10 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib')
 
-                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api libs.kt.coroutines
-                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_version"
+                api libs.kt.serialization
-                api "com.soywiz.korlibs.klock:klock:$klock_version"
+                api libs.klock
-                api "io.ktor:ktor-client-core:$ktor_version"
+                api libs.ktor.client
             }
         }
         commonTest {
@@ -58,7 +55,7 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation kotlin('test-junit')
-                implementation "io.ktor:ktor-client-okhttp:$ktor_version"
+                implementation libs.ktor.client.okhttp
             }
         }
         jsTest {

github_release.gradle

@@ -19,7 +19,7 @@ if (new File(projectDir, "secret.gradle").exists()) {
         owner "InsanusMokrassar"
         repo "${rootProject.name}"
 
-        tagName "${project.version}"
+        tagName "v${project.version}"
         releaseName "${project.version}"
         targetCommitish "${project.version}"
 

gradle.properties

@@ -1,10 +1,3 @@
 kotlin.code.style=official
-kotlin_version=1.4.21
-kotlin_coroutines_version=1.4.2
-kotlin_serialisation_version=1.0.1
-klock_version=2.0.4
-ktor_version=1.5.1
 
-gradle_github_release_plugin_version=2.2.12
+library_version=0.12.0
-
-library_version=0.7.2

gradle/libs.versions.toml

@@ -0,0 +1,30 @@
+[versions]
+
+kt = "1.7.10"
+kt-serialization = "1.4.0-RC"
+kt-coroutines = "1.6.4"
+
+klock = "3.0.0"
+ktor = "2.0.3"
+
+gh-release = "2.4.1"
+
+[libraries]
+
+kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
+kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
+kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
+
+klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }
+
+ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+
+buildscript-kt-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kt" }
+buildscript-kt-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kt" }
+buildscript-gh-release = { module = "com.github.breadmoirai:github-release", version.ref = "gh-release" }
+
+[plugins]
+
+multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kt" }
+serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kt" }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

publication.kpsb

@@ -1 +0,0 @@
-{"bintrayConfig":{"repo":"SauceNaoAPI","packageName":"${project.name}","packageVcs":"https://github.com/InsanusMokrassar/${project.name}","autoPublish":true,"overridePublish":true},"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}]}}

publish.gradle

@@ -3,22 +3,6 @@ apply plugin: 'maven-publish'
 task javadocsJar(type: Jar) {
     classifier = 'javadoc'
 }
-task sourceJar (type : Jar) {
-    classifier = 'sources'
-}
-
-afterEvaluate {
-    project.publishing.publications.all {
-        // rename artifacts
-        groupId "${project.group}"
-        if (it.name.contains('kotlinMultiplatform')) {
-            artifactId = "${project.name}"
-            artifact sourceJar
-        } else {
-            artifactId = "${project.name}-$name"
-        }
-    }
-}
 
 publishing {
     publications.all {
@@ -48,22 +32,48 @@ publishing {
                 
                     license {
                         name = "Apache Software License 2.0"
-                        url = "https://github.com/InsanusMokrassar/TelegramBotAPI/blob/master/LICENSE"
+                        url = "https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"
                     }
                 
             }
         }
-        
         repositories {
-            maven {
+            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                name = "bintray"
+                maven {
-                url = uri("https://api.bintray.com/maven/${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}/SauceNaoAPI/${project.name}/;publish=1;override=1")
+                    name = "GithubPackages"
-                credentials {
+                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI")
-                    username = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+                    credentials {
-                    password = project.hasProperty('BINTRAY_KEY') ? project.property('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    }
+                }
+            }
+            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+                maven {
+                    name = "sonatype"
+                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                    credentials {
+                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    }
                 }
             }
         }
-        
     }
-}
+}
+    
+if (project.hasProperty("signing.gnupg.keyName")) {
+    apply plugin: 'signing'
+    
+    signing {
+        useGpgCmd()
+    
+        sign publishing.publications
+    }
+    
+    task signAll {
+        tasks.withType(Sign).forEach {
+            dependsOn(it)
+        }
+    }
+}

publish.kpsb

@@ -0,0 +1 @@
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/SauceNaoAPI/blob/master/LICENSE"}],"mavenConfig":{"name":"SauceNao API","description":"SauceNao API library","url":"https://insanusmokrassar.github.io/${project.name}","vcsUrl":"https://github.com/insanusmokrassar/${project.name}.git","developers":[{"id":"InsanusMokrassar","name":"Ovsyannikov Alexey","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

settings.gradle

@@ -1 +1,3 @@
 rootProject.name = 'saucenaoapi'
+
+enableFeaturePreview("VERSION_CATALOGS")

src/commonMain/kotlin/dev/inmo/saucenaoapi/SauceNaoAPI.kt

@@ -5,18 +5,16 @@ import dev.inmo.saucenaoapi.exceptions.sauceNaoAPIException
 import dev.inmo.saucenaoapi.models.*
 import dev.inmo.saucenaoapi.utils.*
 import io.ktor.client.HttpClient
-import io.ktor.client.features.ClientRequestException
+import io.ktor.client.plugins.ClientRequestException
 import io.ktor.client.request.*
 import io.ktor.client.request.forms.MultiPartFormDataContent
 import io.ktor.client.request.forms.formData
-import io.ktor.client.statement.HttpResponse
+import io.ktor.client.statement.bodyAsText
-import io.ktor.client.statement.readText
 import io.ktor.http.*
 import io.ktor.utils.io.core.Input
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.json.Json
-import kotlin.coroutines.*
 
 private const val API_TOKEN_FIELD = "api_key"
 private const val OUTPUT_TYPE_FIELD = "output_type"
@@ -40,26 +38,30 @@ val defaultSauceNaoParser = Json {
 
 data class SauceNaoAPI(
     private val apiToken: String? = null,
-    private val outputType: dev.inmo.saucenaoapi.OutputType = dev.inmo.saucenaoapi.JsonOutputType,
     private val client: HttpClient = HttpClient(),
     private val searchUrl: String = SEARCH_URL,
     private val scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     private val parser: Json = defaultSauceNaoParser
 ) : SauceCloseable {
-    private val requestsChannel = Channel<Pair<Continuation<SauceNaoAnswer>, HttpRequestBuilder>>(Channel.UNLIMITED)
+    private val requestsChannel = Channel<Pair<CompletableDeferred<SauceNaoAnswer>, HttpRequestBuilder>>(Channel.UNLIMITED)
-    private val timeManager = TimeManager(scope)
+    private val subscope = CoroutineScope(scope.coroutineContext + SupervisorJob(scope.coroutineContext.job)).also {
-    private val quotaManager = RequestQuotaManager(scope)
+        it.coroutineContext.job.invokeOnCompletion {
+            requestsChannel.close(it)
+        }
+    }
+    private val timeManager = TimeManager(subscope)
+    private val quotaManager = RequestQuotaManager(subscope)
 
     val limitsState: LimitsState
         get() = quotaManager.limitsState
 
-    private val requestsJob = scope.launch {
+    private val requestsJob = subscope.launch {
         for ((callback, requestBuilder) in requestsChannel) {
             quotaManager.getQuota()
             launch {
                 try {
                     val answer = makeRequest(requestBuilder)
-                    callback.resume(answer)
+                    callback.complete(answer)
 
                     quotaManager.updateQuota(answer.header, timeManager)
                 } catch (e: TooManyRequestsException) {
@@ -67,7 +69,7 @@ data class SauceNaoAPI(
                     requestsChannel.send(callback to requestBuilder)
                 } catch (e: Exception) {
                     try {
-                        callback.resumeWithException(e)
+                        callback.completeExceptionally(e)
                     } catch (e: IllegalStateException) { // may happen when already resumed and api was closed
                         // do nothing
                     }
@@ -80,7 +82,7 @@ data class SauceNaoAPI(
         url: String,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         url.asSauceRequestSubject,
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
@@ -91,18 +93,29 @@ data class SauceNaoAPI(
         mimeType: ContentType,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         mediaInput.asSauceRequestSubject(mimeType),
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
     )
 
+    suspend fun request(
+        file: MPPFile,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = request(
+        file.input,
+        file.contentType,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
     suspend fun requestByDb(
         url: String,
         db: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         url.asSauceRequestSubject,
         db = db,
         resultsCount = resultsCount,
@@ -114,7 +127,7 @@ data class SauceNaoAPI(
         dbmask: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         url.asSauceRequestSubject,
         dbmask = dbmask,
         resultsCount = resultsCount,
@@ -126,7 +139,7 @@ data class SauceNaoAPI(
         dbmaski: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         url.asSauceRequestSubject,
         dbmaski = dbmaski,
         resultsCount = resultsCount,
@@ -137,8 +150,8 @@ data class SauceNaoAPI(
         builder: HttpRequestBuilder
     ): SauceNaoAnswer {
         return try {
-            val call = client.request<HttpResponse>(builder)
+            val call = client.request(builder)
-            val answerText = call.readText()
+            val answerText = call.bodyAsText()
             timeManager.addTimeAndClear()
             parser.decodeFromString(
                 SauceNaoAnswerSerializer,
@@ -156,29 +169,32 @@ data class SauceNaoAPI(
         dbmaski: Int? = null,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? {
+    ): SauceNaoAnswer {
-        return suspendCoroutine<SauceNaoAnswer> {
+        val deferred = CompletableDeferred<SauceNaoAnswer>()
-            requestsChannel.offer(
-                it to HttpRequestBuilder().apply {
-                    url(searchUrl)
 
-                    apiToken ?.also { parameter(API_TOKEN_FIELD, it) }
+        requestsChannel.trySend(
-                    parameter(OUTPUT_TYPE_FIELD, outputType.typeCode)
+            deferred to HttpRequestBuilder().apply {
-                    db ?.also { parameter(DB_FIELD, it) }
+                url(searchUrl)
-                    dbmask ?.also { parameter(DBMASK_FIELD, it) }
-                    dbmaski ?.also { parameter(DBMASKI_FIELD, it) }
-                    resultsCount ?.also { parameter(RESULTS_COUNT_FIELD, it) }
-                    minSimilarity ?.also { parameter(MINIMAL_SIMILARITY_FIELD, it) }
 
-                    when (request) {
+                apiToken ?.also { parameter(API_TOKEN_FIELD, it) }
-                        is UrlSauceRequestSubject -> {
+                parameter(OUTPUT_TYPE_FIELD, JsonOutputType.typeCode)
-                            parameter(URL_FIELD, request.url)
+                db ?.also { parameter(DB_FIELD, it) }
-                        }
+                dbmask ?.also { parameter(DBMASK_FIELD, it) }
-                        is InputRequestSubject -> {
+                dbmaski ?.also { parameter(DBMASKI_FIELD, it) }
-                            val mimeType = request.mimeType
+                resultsCount ?.also { parameter(RESULTS_COUNT_FIELD, it) }
+                minSimilarity ?.also { parameter(MINIMAL_SIMILARITY_FIELD, it) }
 
-                            method = HttpMethod.Post
+                when (request) {
-                            body = MultiPartFormDataContent(formData {
+                    is UrlSauceRequestSubject -> {
+                        parameter(URL_FIELD, request.url)
+                    }
+                    is InputRequestSubject -> {
+                        val mimeType = request.mimeType
+
+                        method = HttpMethod.Post
+                        setBody(
+                            MultiPartFormDataContent(
+                                formData {
                                     appendInput(
                                         FILE_FIELD,
                                         Headers.build {
@@ -197,19 +213,18 @@ data class SauceNaoAPI(
                                         },
                                         block = request::input
                                     )
-                            })
+                                }
-                        }
+                            )
+                        )
                     }
                 }
-            )
+            }
-        }
+        )
+
+        return deferred.await()
     }
 
     override fun close() {
-        requestsChannel.close()
+        subscope.cancel()
-        client.close()
-        requestsJob.cancel()
-        timeManager.close()
-        quotaManager.close()
     }
-}
+}

src/commonMain/kotlin/dev/inmo/saucenaoapi/exceptions/TooManyRequestsException.kt

@@ -1,17 +1,17 @@
 package dev.inmo.saucenaoapi.exceptions
 
+import com.soywiz.klock.TimeSpan
 import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
 import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
-import com.soywiz.klock.TimeSpan
+import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.features.ClientRequestException
+import io.ktor.client.statement.bodyAsText
-import io.ktor.client.statement.readText
 import io.ktor.http.HttpStatusCode.Companion.TooManyRequests
 import io.ktor.utils.io.errors.IOException
 
 internal suspend fun ClientRequestException.sauceNaoAPIException(): Exception  {
     return when (response.status) {
         TooManyRequests -> {
-            val answerContent = response.readText()
+            val answerContent = response.bodyAsText()
             when {
                 answerContent.contains("daily limit") -> TooManyRequestsLongException(answerContent)
                 else -> TooManyRequestsShortException(answerContent)

src/commonMain/kotlin/dev/inmo/saucenaoapi/models/ResultData.kt

@@ -159,3 +159,18 @@ data class ResultData(
     @SerialName("ext_urls")
     val extUrls: List<String> = emptyList()
 )
+
+val ResultData.froms: List<String>
+    get() = material ?.split(", ") ?: emptyList()
+
+val ResultData.authors: List<String>
+    get() = (creator ?.split(", ") ?: emptyList()) + (memberName ?.split(", ") ?: emptyList())
+
+val ResultData.charactersList: List<String>
+    get() = characters ?.split(", ") ?: emptyList()
+
+val ResultData.titles: List<String>
+    get() = title ?.split(", ") ?: emptyList()
+
+val ResultData.urls: List<String>
+    get() = extUrls + (url ?.split(", ") ?: emptyList())

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/MPPFile.kt

@@ -0,0 +1,9 @@
+package dev.inmo.saucenaoapi.utils
+
+import io.ktor.http.ContentType
+import io.ktor.utils.io.core.Input
+
+expect class MPPFile
+
+expect val MPPFile.input: Input
+expect val MPPFile.contentType: ContentType

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/RequestQuotaManager.kt

@@ -1,21 +1,20 @@
 package dev.inmo.saucenaoapi.utils
 
+import com.soywiz.klock.DateTime
 import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
 import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
 import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
 import dev.inmo.saucenaoapi.exceptions.TooManyRequestsLongException
 import dev.inmo.saucenaoapi.models.Header
 import dev.inmo.saucenaoapi.models.LimitsState
-import com.soywiz.klock.DateTime
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
-import kotlin.coroutines.suspendCoroutine
 import kotlin.math.max
 import kotlin.math.min
 
 internal class RequestQuotaManager (
     scope: CoroutineScope
-) : SauceCloseable {
+) {
     private var longQuota = 1
     private var shortQuota = 1
     private var longMaxQuota = 1
@@ -35,6 +34,10 @@ internal class RequestQuotaManager (
         for (callback in quotaActions) {
             callback()
         }
+    }.also {
+        it.invokeOnCompletion {
+            quotaActions.close(it)
+        }
     }
 
     private suspend fun updateQuota(
@@ -83,21 +86,16 @@ internal class RequestQuotaManager (
     )
 
     suspend fun getQuota() {
-        return suspendCoroutine {
+        val job = Job()
-            lateinit var callback: suspend () -> Unit
+        lateinit var callback: suspend () -> Unit
-            callback = suspend {
+        callback = suspend {
-                if (longQuota > 0 && shortQuota > 0) {
+            if (longQuota > 0 && shortQuota > 0) {
-                    it.resumeWith(Result.success(Unit))
+                job.complete()
-                } else {
+            } else {
-                    quotaActions.send(callback)
+                quotaActions.send(callback)
-                }
             }
-            quotaActions.offer(callback)
         }
-    }
+        quotaActions.trySend(callback)
-
+        return job.join()
-    override fun close() {
-        quotaJob.cancel()
-        quotaActions.close()
     }
 }

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/SauceCloseable.kt

@@ -6,12 +6,13 @@ interface SauceCloseable {
     fun close()
 }
 
-fun <T> SauceCloseable.use(block: (SauceCloseable) -> T): T = try {
+inline fun <T> SauceCloseable.use(block: (SauceCloseable) -> T): T = try {
     block(this)
 } finally {
     close()
 }
 
+@Deprecated("Useless")
 suspend fun <T> SauceCloseable.useSafe(block: suspend (SauceCloseable) -> T): T = try {
     supervisorScope {
         block(this@useSafe)

src/commonMain/kotlin/dev/inmo/saucenaoapi/utils/TimeManager.kt

@@ -1,13 +1,10 @@
 package dev.inmo.saucenaoapi.utils
 
+import com.soywiz.klock.DateTime
 import dev.inmo.saucenaoapi.additional.LONG_TIME_RECALCULATING_MILLIS
 import dev.inmo.saucenaoapi.additional.SHORT_TIME_RECALCULATING_MILLIS
-import com.soywiz.klock.DateTime
+import kotlinx.coroutines.*
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.launch
-import kotlin.coroutines.Continuation
-import kotlin.coroutines.suspendCoroutine
 
 private fun MutableList<DateTime>.clearTooOldTimes(relatedTo: DateTime = DateTime.now()) {
     val limitValue = relatedTo - LONG_TIME_RECALCULATING_MILLIS
@@ -38,16 +35,16 @@ private data class TimeManagerTimeAdder(
 }
 
 private data class TimeManagerMostOldestInLongGetter(
-    private val continuation: Continuation<DateTime?>
+    private val deferred: CompletableDeferred<DateTime?>
 ) : TimeManagerAction {
     override suspend fun makeChangeWith(times: MutableList<DateTime>) {
         times.clearTooOldTimes()
-        continuation.resumeWith(Result.success(times.minOrNull()))
+        deferred.complete(times.minOrNull())
     }
 }
 
 private data class TimeManagerMostOldestInShortGetter(
-    private val continuation: Continuation<DateTime?>
+    private val deferred: CompletableDeferred<DateTime?>
 ) : TimeManagerAction {
     override suspend fun makeChangeWith(times: MutableList<DateTime>) {
         times.clearTooOldTimes()
@@ -56,19 +53,17 @@ private data class TimeManagerMostOldestInShortGetter(
 
         val limitTime = now - SHORT_TIME_RECALCULATING_MILLIS
 
-        continuation.resumeWith(
+        deferred.complete(
-            Result.success(
+            times.asSequence().filter {
-                times.asSequence().filter {
+                limitTime < it
-                    limitTime < it
+            }.minOrNull()
-                }.minOrNull()
-            )
         )
     }
 }
 
 internal class TimeManager(
     scope: CoroutineScope
-) : SauceCloseable {
+) {
     private val actionsChannel = Channel<TimeManagerAction>(Channel.UNLIMITED)
 
     private val timeUpdateJob = scope.launch {
@@ -76,6 +71,10 @@ internal class TimeManager(
         for (action in actionsChannel) {
             action(times)
         }
+    }.also {
+        it.invokeOnCompletion {
+            actionsChannel.close(it)
+        }
     }
 
     suspend fun addTimeAndClear() {
@@ -83,21 +82,20 @@ internal class TimeManager(
     }
 
     suspend fun getMostOldestInLongPeriod(): DateTime? {
-        return suspendCoroutine {
+        val deferred = CompletableDeferred<DateTime?>()
-            actionsChannel.offer(
+        return if (actionsChannel.trySend(TimeManagerMostOldestInLongGetter(deferred)).isSuccess) {
-                TimeManagerMostOldestInLongGetter(it)
+            deferred.await()
-            )
+        } else {
+            null
         }
     }
 
     suspend fun getMostOldestInShortPeriod(): DateTime? {
-        return suspendCoroutine {
+        val deferred = CompletableDeferred<DateTime?>()
-            actionsChannel.offer(TimeManagerMostOldestInShortGetter(it))
+        return if (actionsChannel.trySend(TimeManagerMostOldestInShortGetter(deferred)).isSuccess) {
+            deferred.await()
+        } else {
+            null
         }
     }
-
-    override fun close() {
-        actionsChannel.close()
-        timeUpdateJob.cancel()
-    }
 }

src/jsMain/kotlin/dev/inmo/saucenaoapi/utils/ActualMPPFile.kt

@@ -0,0 +1,18 @@
+package dev.inmo.saucenaoapi.utils
+
+import io.ktor.http.ContentType
+import io.ktor.utils.io.core.ByteReadPacket
+import io.ktor.utils.io.core.Input
+import org.khronos.webgl.Int8Array
+import org.w3c.files.File
+import org.w3c.files.FileReaderSync
+
+actual typealias MPPFile = File
+
+actual val MPPFile.input: Input
+    get() {
+        val reader = FileReaderSync()
+        return ByteReadPacket(Int8Array(reader.readAsArrayBuffer(this)) as ByteArray)
+    }
+actual val MPPFile.contentType: ContentType
+    get() = ContentType.parse(type)

src/jvmMain/kotlin/dev/inmo/saucenaoapi/utils/ActualMPPFile.kt

@@ -0,0 +1,14 @@
+package dev.inmo.saucenaoapi.utils
+
+import io.ktor.http.ContentType
+import io.ktor.utils.io.core.Input
+import io.ktor.utils.io.streams.asInput
+import java.io.File
+import java.nio.file.Files
+
+actual typealias MPPFile = File
+
+actual val MPPFile.input: Input
+    get() = inputStream().asInput()
+actual val MPPFile.contentType: ContentType
+    get() = ContentType.parse(Files.probeContentType(toPath()))

src/jvmTest/kotlin/Launcher.kt

@@ -1,30 +1,27 @@
 import dev.inmo.saucenaoapi.SauceNaoAPI
-import dev.inmo.saucenaoapi.utils.useSafe
+import io.ktor.client.HttpClient
-import io.ktor.http.ContentType
-import io.ktor.utils.io.streams.asInput
 import kotlinx.coroutines.*
 import java.io.File
-import java.nio.file.Files
 
 suspend fun main(vararg args: String) {
     val (key, requestSubject) = args
 
-    val scope = CoroutineScope(Dispatchers.Default)
+    val client = HttpClient()
-
+    val scope = CoroutineScope(Dispatchers.IO).also {
-    val api = SauceNaoAPI(key, scope = scope)
+        it.coroutineContext.job.invokeOnCompletion {
-    api.useSafe { _ ->
+            client.close()
-        println(
+        }
-            when {
-                requestSubject.startsWith("/") -> File(requestSubject).let {
-                    api.request(
-                        it.inputStream().asInput(),
-                        ContentType.parse(Files.probeContentType(it.toPath()))
-                    )
-                }
-                else -> api.request(requestSubject)
-            }
-        )
     }
 
+    val api = SauceNaoAPI(key, client,  scope = scope)
+    println(
+        when {
+            requestSubject.startsWith("/") -> File(requestSubject).let {
+                api.request(it)
+            }
+            else -> api.request(requestSubject)
+        }
+    )
+
     scope.cancel()
 }