diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt new file mode 100644 index 00000000000..55f4b00d6b1 --- /dev/null +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/HttpException.kt @@ -0,0 +1,13 @@ +package eu.kanade.tachiyomi.network + +import okhttp3.Response + +/** + * Exception that handles HTTP codes considered not successful by OkHttp. + * Use it to have a standardized error message in the app across the extensions. + * + * @see Response.isSuccessful + * @since tachiyomix 1.6 + * @param code [Int] the HTTP status code + */ +class HttpException(val code: Int) : IllegalStateException("HTTP error $code") diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt index 202c39063fc..24770bbd6b6 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -60,8 +60,6 @@ class NetworkHelper( } } - val nonCloudflareClient = clientBuilder.build() - val client = clientBuilder .addInterceptor( CloudflareInterceptor(context, cookieJar, ::defaultUserAgentProvider), diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt index 072c50c81e7..fd791727876 100644 --- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt +++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.network -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.json.Json @@ -23,6 +22,7 @@ import kotlin.coroutines.resumeWithException val jsonMime = "application/json; charset=utf-8".toMediaType() @OptIn(ExperimentalAtomicApi::class) +@Deprecated("Use suspend APIs instead") fun Call.asObservable(): Observable { return Observable.unsafeCreate { subscriber -> // Since Call is a one-shot type, clone it for each new subscriber. @@ -61,6 +61,7 @@ fun Call.asObservable(): Observable { } } +@Deprecated("Use suspend APIs instead") fun Call.asObservableSuccess(): Observable { return asObservable().doOnNext { response -> if (!response.isSuccessful) { @@ -70,35 +71,31 @@ fun Call.asObservableSuccess(): Observable { } } -// Based on https://github.com/gildor/kotlin-coroutines-okhttp -@OptIn(ExperimentalCoroutinesApi::class) +// Based on https://github.com/square/okhttp/blob/master/okhttp-coroutines/src/main/kotlin/okhttp3/coroutines/ExecuteAsync.kt +// and https://github.com/gildor/kotlin-coroutines-okhttp private suspend fun Call.await(callStack: Array): Response { return suspendCancellableCoroutine { continuation -> - val callback = - object : Callback { - override fun onResponse(call: Call, response: Response) { - continuation.resume(response) { _, _, _ -> - response.body.close() - } - } - - override fun onFailure(call: Call, e: IOException) { - // Don't bother with resuming the continuation if it is already cancelled. - if (continuation.isCancelled) return - val exception = IOException(e.message, e).apply { stackTrace = callStack } - continuation.resumeWithException(exception) - } - } - - enqueue(callback) - continuation.invokeOnCancellation { try { - cancel() - } catch (ex: Throwable) { - // Ignore cancel exception + this.cancel() + } catch (_: Throwable) { + // ignore } } + + this.enqueue(object : Callback { + override fun onFailure(call: Call, e: IOException) { + if (continuation.isCancelled) return + val exception = IOException(e.message, e).apply { stackTrace = callStack } + continuation.resumeWithException(exception) + } + + override fun onResponse(call: Call, response: Response) { + continuation.resume(response) { _, value, _ -> + value.close() + } + } + }) } } @@ -108,7 +105,7 @@ suspend fun Call.await(): Response { } /** - * @since extensions-lib 1.5 + * Similar to [await] but throws [HttpException] if [Response.isSuccessful] returns false */ suspend fun Call.awaitSuccess(): Response { val callStack = Exception().stackTrace.run { copyOfRange(1, size) } @@ -148,12 +145,3 @@ fun decodeFromJsonResponse( json.decodeFromBufferedSource(deserializer, it) } } - -/** - * Exception that handles HTTP codes considered not successful by OkHttp. - * Use it to have a standardized error message in the app across the extensions. - * - * @since extensions-lib 1.5 - * @param code [Int] the HTTP status code - */ -class HttpException(val code: Int) : IllegalStateException("HTTP error $code") diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt index 712b281b31a..dabcba678eb 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -108,6 +108,7 @@ abstract class HttpSource : CatalogueSource { * * @param page the page number to retrieve. */ + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPopularManga")) override fun fetchPopularManga(page: Int): Observable { return client.newCall(popularMangaRequest(page)) @@ -139,6 +140,7 @@ abstract class HttpSource : CatalogueSource { * @param query the search query. * @param filters the list of filters to apply. */ + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getSearchManga")) override fun fetchSearchManga( page: Int, @@ -184,6 +186,7 @@ abstract class HttpSource : CatalogueSource { * * @param page the page number to retrieve. */ + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getLatestUpdates")) override fun fetchLatestUpdates(page: Int): Observable { return client.newCall(latestUpdatesRequest(page)) @@ -219,6 +222,7 @@ abstract class HttpSource : CatalogueSource { return fetchMangaDetails(manga).awaitSingle() } + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getMangaDetails")) override fun fetchMangaDetails(manga: SManga): Observable { return client.newCall(mangaDetailsRequest(manga)) @@ -257,6 +261,7 @@ abstract class HttpSource : CatalogueSource { return fetchChapterList(manga).awaitSingle() } + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList")) override fun fetchChapterList(manga: SManga): Observable> { return client.newCall(chapterListRequest(manga)) @@ -302,6 +307,7 @@ abstract class HttpSource : CatalogueSource { return fetchPageList(chapter).awaitSingle() } + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getPageList")) override fun fetchPageList(chapter: SChapter): Observable> { return client.newCall(pageListRequest(chapter)) @@ -340,6 +346,7 @@ abstract class HttpSource : CatalogueSource { return fetchImageUrl(page).awaitSingle() } + @Suppress("DEPRECATION") @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getImageUrl")) open fun fetchImageUrl(page: Page): Observable { return client.newCall(imageUrlRequest(page))