Merge pull request #185 from InsanusMokrassar/0.17.2

0.17.2

.github/workflows/build_and_publish.yml

@@ -16,8 +16,13 @@ jobs:
           mv gradle.properties.tmp gradle.properties
       - name: Build
         run: ./gradlew build
+      - name: Publish to Gitea
+        continue-on-error: true
+        run: ./gradlew publishAllPublicationsToGiteaRepository
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
       - name: Publish
-        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel -x signJsPublication -x signJvmPublication -x signKotlinMultiplatformPublication
+        run: ./gradlew publishAllPublicationsToGithubPackagesRepository --no-parallel
         continue-on-error: true
         env:
           GITHUBPACKAGES_USER: ${{ github.actor }}

.gitignore

@@ -8,3 +8,4 @@ settings.xml
 .gradle/
 build/
 out/
+kotlin-js-store/

CHANGELOG.md

@@ -1,5 +1,100 @@
 # SauceNaoAPI Changelog
 
+## 0.17.2
+
+* Versions:
+  * `Coroutines`: `1.7.3`
+  * `Ktor`: `2.3.4`
+  * `MicroUtils`: `0.19.9`
+
+## 0.17.1
+
+* Versions:
+  * `Coroutines`: `1.7.2`
+  * `Ktor`: `2.3.2`
+  * `MicroUtils`: `0.19.7`
+
+## 0.17.0
+
+* Versions:
+  * `Kotlin`: `1.8.22`
+  * `Serialization`: `1.5.1`
+  * `Ktor`: `2.3.1`
+  * `MicroUtils`: `0.19.2`
+  * `Klock`: `4.0.3`
+
+## 0.16.0
+
+Add `MicroUtils` as used micro utils
+
+* Versions:
+  * `Kotlin`: `1.8.21`
+  * `Ktor`: `2.3.0`
+
+## 0.15.1
+
+* Versions:
+  * `Ktor`: `2.2.4`
+
+## 0.15.0
+
+* Versions:
+  * `Kotlin`: `1.8.10`
+  * `Serialization`: `1.5.0`
+  * `Ktor`: `2.2.3`
+
+## 0.14.0
+
+* `LimitStatus` is `Comparable<LimitStatus>` since this update
+* `Limits` is `Comparable<Limits>` since this update
+* Main API has been changed
+
+## 0.13.0
+
+* Versions:
+  * `Kotlin`: `1.7.20` -> `1.7.22`
+  * `Serialization`: `1.4.0` -> `1.4.1`
+  * `Klock`: `3.2.0` -> `3.4.0`
+  * `Ktor`: `2.1.2` -> `2.2.1`
+* Now it is possible to subscribe onto API limits changes
+
+## 0.12.2
+
+* Versions:
+  * `Kotlin`: `1.7.10` -> `1.7.20`
+  * `Serialization`: `1.4.0-RC` -> `1.4.0`
+  * `Klock`: `3.0.0` -> `3.2.0`
+  * `Ktor`: `2.1.0` -> `2.1.2`
+
+## 0.12.1
+
+* Versions:
+  * `Ktor`: `2.0.3` -> `2.1.0`
+
+## 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:

build.gradle

@@ -28,11 +28,19 @@ repositories {
 }
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
     js(IR) {
         browser()
         nodejs()
     }
+    linuxX64()
+    mingwX64()
 
 
     sourceSets {
@@ -44,6 +52,9 @@ kotlin {
                 api libs.kt.serialization
                 api libs.klock
                 api libs.ktor.client
+                api libs.microutils.common
+                api libs.microutils.ktor.common
+                api libs.microutils.mimetypes
             }
         }
         commonTest {
@@ -65,3 +76,8 @@ kotlin {
         }
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

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,3 +1,3 @@
 kotlin.code.style=official
 
-library_version=0.10.0
+library_version=0.17.2

gradle/libs.versions.toml

@@ -1,13 +1,15 @@
 [versions]
 
-kt = "1.6.10"
+kt = "1.8.22"
-kt-serialization = "1.3.2"
+kt-serialization = "1.5.1"
-kt-coroutines = "1.6.0"
+kt-coroutines = "1.7.3"
 
-klock = "2.6.2"
+klock = "4.0.3"
-ktor = "1.6.7"
+ktor = "2.3.4"
 
-gh-release = "2.2.12"
+microutils = "0.19.9"
+
+gh-release = "2.4.1"
 
 [libraries]
 
@@ -20,6 +22,10 @@ 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" }
 
+microutils-common = { module = "dev.inmo:micro_utils.common", version.ref = "microutils" }
+microutils-ktor-common = { module = "dev.inmo:micro_utils.ktor.common", version.ref = "microutils" }
+microutils-mimetypes = { module = "dev.inmo:micro_utils.mime_types", version.ref = "microutils" }
+
 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" }

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-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip

publish.gradle

@@ -42,20 +42,40 @@ publishing {
                 maven {
                     name = "GithubPackages"
                     url = uri("https://maven.pkg.github.com/InsanusMokrassar/SauceNaoAPI")
+            
                     credentials {
                         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('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
+                maven {
+                    name = "Gitea"
+                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
+            
+                    credentials(HttpHeaderCredentials) {
+                        name = "Authorization"
+                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
+                    }
+            
+                    authentication {
+                        header(HttpHeaderAuthentication)
+                    }
+            
                 }
             }
             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')
                     }
+            
                 }
             }
         }

publish.kpsb

@@ -1 +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"}}}
+{"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":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}

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

@@ -1,22 +1,22 @@
 package dev.inmo.saucenaoapi
 
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.ktor.common.input
 import dev.inmo.saucenaoapi.exceptions.TooManyRequestsException
 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"
@@ -24,6 +24,7 @@ private const val URL_FIELD = "url"
 private const val FILE_FIELD = "file"
 private const val FILENAME_FIELD = "filename"
 private const val DB_FIELD = "db"
+private const val DBS_FIELD = "dbs[]"
 private const val DBMASK_FIELD = "dbmask"
 private const val DBMASKI_FIELD = "dbmaski"
 private const val RESULTS_COUNT_FIELD = "numres"
@@ -40,26 +41,34 @@ 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
+    val limitsState: LimitsState by quotaManager::limitsState
-        get() = quotaManager.limitsState
+    val longQuotaFlow by quotaManager::longQuotaFlow
+    val shortQuotaFlow by quotaManager::shortQuotaFlow
+    val longMaxQuotaFlow by quotaManager::longMaxQuotaFlow
+    val shortMaxQuotaFlow by quotaManager::shortMaxQuotaFlow
+    val limitsStateFlow by quotaManager::limitsStateFlow
 
-    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 +76,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,65 +89,203 @@ data class SauceNaoAPI(
         url: String,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         url.asSauceRequestSubject,
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
     )
 
+    /**
+     * @param db search a specific index number or all without needing to generate a bitmask.
+     * @param dbs search one or more specific index number, set more than once to search multiple.
+     */
+    suspend fun requestByDBs(
+        url: String,
+        db: Int? = null,
+        dbs: Array<Int>? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = makeRequest(
+        url.asSauceRequestSubject,
+        db = db,
+        dbs = dbs,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
+    /**
+     * @param mask Mask for selecting specific indexes to ENABLE. dbmask=8191 will search all of the first 14 indexes. If intending to search all databases, the db=999 option is more appropriate.
+     * @param excludedMask Mask for selecting specific indexes to DISABLE. dbmaski=8191 would search only indexes higher than the first 14. This is ideal when attempting to disable only certain indexes, while allowing future indexes to be included by default.
+     *
+     * Bitmask Note: Index numbers start with 0. Even though pixiv is labeled as index 5, it would be controlled with the 6th bit position, which has a decimal value of 32 when set.
+     * db=<index num or 999 for all>
+     */
+    suspend fun requestByMasks(
+        url: String,
+        mask: Int?,
+        excludedMask: Int? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = makeRequest(
+        url.asSauceRequestSubject,
+        dbmask = mask,
+        dbmaski = excludedMask,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
     suspend fun request(
         mediaInput: Input,
         mimeType: ContentType,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = makeRequest(
         mediaInput.asSauceRequestSubject(mimeType),
         resultsCount = resultsCount,
         minSimilarity = minSimilarity
     )
 
+    /**
+     * @param db search a specific index number or all without needing to generate a bitmask.
+     * @param dbs search one or more specific index number, set more than once to search multiple.
+     */
+    suspend fun requestByDBs(
+        mediaInput: Input,
+        mimeType: ContentType,
+        db: Int? = null,
+        dbs: Array<Int>? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = makeRequest(
+        mediaInput.asSauceRequestSubject(mimeType),
+        db = db,
+        dbs = dbs,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
+    /**
+     * @param mask Mask for selecting specific indexes to ENABLE. dbmask=8191 will search all of the first 14 indexes. If intending to search all databases, the db=999 option is more appropriate.
+     * @param excludedMask Mask for selecting specific indexes to DISABLE. dbmaski=8191 would search only indexes higher than the first 14. This is ideal when attempting to disable only certain indexes, while allowing future indexes to be included by default.
+     *
+     * Bitmask Note: Index numbers start with 0. Even though pixiv is labeled as index 5, it would be controlled with the 6th bit position, which has a decimal value of 32 when set.
+     * db=<index num or 999 for all>
+     */
+    suspend fun requestByMasks(
+        mediaInput: Input,
+        mimeType: ContentType,
+        mask: Int?,
+        excludedMask: Int? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = makeRequest(
+        mediaInput.asSauceRequestSubject(mimeType),
+        dbmask = mask,
+        dbmaski = excludedMask,
+        resultsCount = resultsCount,
+        minSimilarity = minSimilarity
+    )
+
+    suspend fun request(
+        file: MPPFile,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = request(
+        file.input(),
+        file.contentType,
+        resultsCount,
+        minSimilarity
+    )
+
+    /**
+     * @param db search a specific index number or all without needing to generate a bitmask.
+     * @param dbs search one or more specific index number, set more than once to search multiple.
+     */
+    suspend fun requestByDBs(
+        file: MPPFile,
+        db: Int? = null,
+        dbs: Array<Int>? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = requestByDBs(
+        file.input(),
+        file.contentType,
+        db,
+        dbs,
+        resultsCount,
+        minSimilarity
+    )
+
+    /**
+     * @param mask Mask for selecting specific indexes to ENABLE. dbmask=8191 will search all of the first 14 indexes. If intending to search all databases, the db=999 option is more appropriate.
+     * @param excludedMask Mask for selecting specific indexes to DISABLE. dbmaski=8191 would search only indexes higher than the first 14. This is ideal when attempting to disable only certain indexes, while allowing future indexes to be included by default.
+     *
+     * Bitmask Note: Index numbers start with 0. Even though pixiv is labeled as index 5, it would be controlled with the 6th bit position, which has a decimal value of 32 when set.
+     * db=<index num or 999 for all>
+     */
+    suspend fun requestByMasks(
+        file: MPPFile,
+        mask: Int?,
+        excludedMask: Int? = null,
+        resultsCount: Int? = null,
+        minSimilarity: Float? = null
+    ): SauceNaoAnswer = requestByMasks(
+        file.input(),
+        file.contentType,
+        mask,
+        excludedMask,
+        resultsCount,
+        minSimilarity
+    )
+
+    @Deprecated("Renamed", ReplaceWith("requestByDBs(url, db, null, resultsCount, minSimilarity)"))
     suspend fun requestByDb(
         url: String,
         db: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = requestByDBs(
-        url.asSauceRequestSubject,
+        url,
-        db = db,
+        db,
-        resultsCount = resultsCount,
+        null,
-        minSimilarity = minSimilarity
+        resultsCount,
+        minSimilarity
     )
 
-    suspend fun requestByMask(
+    @Deprecated("Renamed", ReplaceWith("requestByMasks(url, dbmask, null, resultsCount, minSimilarity)"))
+    suspend fun request(
         url: String,
         dbmask: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = requestByMasks(
-        url.asSauceRequestSubject,
+        url,
-        dbmask = dbmask,
+        dbmask,
-        resultsCount = resultsCount,
+        null,
-        minSimilarity = minSimilarity
+        resultsCount,
+        minSimilarity
     )
 
+    @Deprecated("Renamed", ReplaceWith("requestByMasks(url, null, dbmaski, resultsCount, minSimilarity)"))
     suspend fun requestByMaskI(
         url: String,
         dbmaski: Int,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? = makeRequest(
+    ): SauceNaoAnswer = requestByMasks(
-        url.asSauceRequestSubject,
+        url,
-        dbmaski = dbmaski,
+        null,
-        resultsCount = resultsCount,
+        dbmaski,
-        minSimilarity = minSimilarity
+        resultsCount,
+        minSimilarity
     )
 
     private suspend fun makeRequest(
         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,
@@ -152,33 +299,38 @@ data class SauceNaoAPI(
     private suspend fun makeRequest(
         request: SauceRequestSubject,
         db: Int? = null,
+        dbs: Array<Int>? = null,
         dbmask: Int? = null,
         dbmaski: Int? = null,
         resultsCount: Int? = null,
         minSimilarity: Float? = null
-    ): SauceNaoAnswer? {
+    ): SauceNaoAnswer {
-        return suspendCoroutine<SauceNaoAnswer> {
+        val deferred = CompletableDeferred<SauceNaoAnswer>()
-            requestsChannel.trySend(
-                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) }
-                        }
+                dbs ?.forEach { parameter(DBS_FIELD, it) }
-                        is InputRequestSubject -> {
+                dbmask ?.also { parameter(DBMASK_FIELD, it) }
-                            val mimeType = request.mimeType
+                dbmaski ?.also { parameter(DBMASKI_FIELD, it) }
+                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 +349,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/additional/Utils.kt

@@ -1,6 +1,6 @@
 package dev.inmo.saucenaoapi.additional
 
-import com.soywiz.klock.TimeSpan
+import korlibs.time.TimeSpan
 
 typealias AccountType = Int
 const val defaultAccountType: AccountType = 1 // "basic"

src/commonMain/kotlin/dev/inmo/saucenaoapi/additional/header/AccountInfo.kt

@@ -29,15 +29,27 @@ val Header.accountInfo
 data class LimitStatus(
     val remain: Int = Int.MAX_VALUE,
     val limit: Int = Int.MAX_VALUE
-)
+) : Comparable<LimitStatus> {
+    override fun compareTo(other: LimitStatus): Int = when {
+        limit == other.limit && remain == other.remain -> 0
+        else -> remain.compareTo(other.remain)
+    }
+}
 
 data class Limits(
     val short: LimitStatus = LimitStatus(),
     val long: LimitStatus = LimitStatus()
-)
+) : Comparable<Limits> {
+    override fun compareTo(other: Limits): Int = when {
+        long == other.long && short == other.short -> 0
+        else -> short.remain.compareTo(other.short.remain)
+    }
+}
 
 data class AccountInfo(
     val accountType: AccountType = defaultAccountType,
     val userId: UserId? = null,
     val limits: Limits = Limits()
-)
+) : Comparable<AccountInfo> {
+    override fun compareTo(other: AccountInfo): Int = limits.compareTo(other.limits)
+}

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

@@ -1,17 +1,17 @@
 package dev.inmo.saucenaoapi.exceptions
 
+import korlibs.time.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/LimitsState.kt

@@ -8,4 +8,6 @@ data class LimitsState(
     val maxLongQuota: Int,
     val knownShortQuota: Int,
     val knownLongQuota: Int
-)
+) : Comparable<LimitsState> {
+    override fun compareTo(other: LimitsState): Int = knownShortQuota.compareTo(other.knownShortQuota)
+}

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

@@ -0,0 +1,26 @@
+package dev.inmo.saucenaoapi.utils
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
+import dev.inmo.micro_utils.ktor.common.input
+import dev.inmo.micro_utils.mime_types.KnownMimeTypes
+import dev.inmo.micro_utils.mime_types.getMimeType
+import io.ktor.http.ContentType
+import io.ktor.utils.io.core.Input
+
+@Deprecated(
+    "MPPFile from microutils is preferable since 0.16.0",
+    ReplaceWith("MPPFile", "dev.inmo.micro_utils.common.MPPFile")
+)
+typealias MPPFile = MPPFile
+
+@Deprecated(
+    "input() from microutils is preferable since 0.16.0",
+    ReplaceWith("this.input()", "dev.inmo.micro_utils.ktor.common.input")
+)
+val MPPFile.input: Input
+    get() = input()
+val MPPFile.contentType: ContentType
+    get() = ContentType.parse(
+        getMimeType(stringWithExtension = filename.extension) ?.raw ?: KnownMimeTypes.Any.raw
+    )

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

@@ -1,26 +1,47 @@
 package dev.inmo.saucenaoapi.utils
 
+import korlibs.time.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 kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
 import kotlin.math.max
 import kotlin.math.min
 
 internal class RequestQuotaManager (
     scope: CoroutineScope
-) : SauceCloseable {
+) {
-    private var longQuota = 1
+    private val _longQuotaFlow = MutableStateFlow(1)
-    private var shortQuota = 1
+    private val _shortQuotaFlow = MutableStateFlow(1)
-    private var longMaxQuota = 1
+    private val _longMaxQuotaFlow = MutableStateFlow(1)
-    private var shortMaxQuota = 1
+    private val _shortMaxQuotaFlow = MutableStateFlow(1)
+    private var longQuota by _longQuotaFlow::value
+    private var shortQuota by _shortQuotaFlow::value
+    private var longMaxQuota by _longMaxQuotaFlow::value
+    private var shortMaxQuota by _shortMaxQuotaFlow::value
 
+    val longQuotaFlow = _longQuotaFlow.asStateFlow()
+    val shortQuotaFlow = _shortQuotaFlow.asStateFlow()
+    val longMaxQuotaFlow = _longMaxQuotaFlow.asStateFlow()
+    val shortMaxQuotaFlow = _shortMaxQuotaFlow.asStateFlow()
+    val limitsStateFlow = merge(
+        longQuotaFlow, shortQuotaFlow, longMaxQuotaFlow, shortMaxQuotaFlow
+    ).map { _ ->
+        LimitsState(
+            shortMaxQuota,
+            longMaxQuota,
+            shortQuota,
+            longQuota
+        )
+    }
     val limitsState: LimitsState
         get() = LimitsState(
             shortMaxQuota,
@@ -35,6 +56,10 @@ internal class RequestQuotaManager (
         for (callback in quotaActions) {
             callback()
         }
+    }.also {
+        it.invokeOnCompletion {
+            quotaActions.close(it)
+        }
     }
 
     private suspend fun updateQuota(
@@ -83,21 +108,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.trySend(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 korlibs.time.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.trySend(
+        return if (actionsChannel.trySend(TimeManagerMostOldestInLongGetter(deferred)).isSuccess) {
-                TimeManagerMostOldestInLongGetter(it)
+            deferred.await()
-            )
+        } else {
+            null
         }
     }
 
     suspend fun getMostOldestInShortPeriod(): DateTime? {
-        return suspendCoroutine {
+        val deferred = CompletableDeferred<DateTime?>()
-            actionsChannel.trySend(TimeManagerMostOldestInShortGetter(it))
+        return if (actionsChannel.trySend(TimeManagerMostOldestInShortGetter(deferred)).isSuccess) {
+            deferred.await()
+        } else {
+            null
         }
     }
-
-    override fun close() {
-        actionsChannel.close()
-        timeUpdateJob.cancel()
-    }
 }

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()
 }