Images proxy #357

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/DetectReaderModeUseCase.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
 import org.koitharu.kotatsu.core.model.findChapter
+import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaDataRepository
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -14,7 +15,6 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.runCatchingCancellable
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.util.ext.printStackTraceDebug
@@ -28,6 +28,7 @@ class DetectReaderModeUseCase @Inject constructor(
 	private val settings: AppSettings,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
 	@MangaHttpClient private val okHttpClient: OkHttpClient,
+	private val imageProxyInterceptor: ImageProxyInterceptor,
 ) {
 
 	suspend operator fun invoke(manga: Manga, state: ReaderState?): ReaderMode {
@@ -70,7 +71,7 @@ class DetectReaderModeUseCase @Inject constructor(
 			}
 		} else {
 			val request = PageLoader.createPageRequest(page, url)
-			okHttpClient.newCall(request).await().use {
+			imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use {
 				runInterruptible(Dispatchers.IO) {
 					getBitmapSize(it.body?.byteStream())
 				}

app/src/main/kotlin/org/koitharu/kotatsu/reader/domain/PageLoader.kt

@@ -22,18 +22,19 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okio.source
 import org.koitharu.kotatsu.core.network.CommonHeaders
+import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
 import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.util.RetainedLifecycleCoroutineScope
+import org.koitharu.kotatsu.core.util.ext.ensureSuccess
 import org.koitharu.kotatsu.core.util.ext.withProgress
 import org.koitharu.kotatsu.core.util.progress.ProgressDeferred
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.util.ext.printStackTraceDebug
 import java.io.File
@@ -51,6 +52,7 @@ class PageLoader @Inject constructor(
 	private val cache: PagesCache,
 	private val settings: AppSettings,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val imageProxyInterceptor: ImageProxyInterceptor,
 ) : RetainedLifecycle.OnClearedListener {
 
 	init {
@@ -191,10 +193,7 @@ class PageLoader @Inject constructor(
 			}
 		} else {
 			val request = createPageRequest(page, pageUrl)
-			okHttp.newCall(request).await().use { response ->
-				check(response.isSuccessful) {
-					"Invalid response: ${response.code} ${response.message} at $pageUrl"
-				}
+			imageProxyInterceptor.interceptPageRequest(request, okHttp).ensureSuccess().use { response ->
 				val body = checkNotNull(response.body) {
 					"Null response"
 				}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/MangaPageFetcher.kt

@@ -9,21 +9,24 @@ import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.request.Options
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okhttp3.OkHttpClient
 import okio.Path.Companion.toOkioPath
 import okio.buffer
 import okio.source
+import org.koitharu.kotatsu.core.network.ImageProxyInterceptor
+import org.koitharu.kotatsu.core.network.MangaHttpClient
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.data.util.withExtraCloseable
 import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.mimeType
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import java.util.zip.ZipFile
+import javax.inject.Inject
 
 class MangaPageFetcher(
 	private val context: Context,
@@ -32,6 +35,7 @@ class MangaPageFetcher(
 	private val options: Options,
 	private val page: MangaPage,
 	private val mangaRepositoryFactory: MangaRepository.Factory,
+	private val imageProxyInterceptor: ImageProxyInterceptor,
 ) : Fetcher {
 
 	override suspend fun fetch(): FetchResult {
@@ -66,7 +70,7 @@ class MangaPageFetcher(
 			)
 		} else {
 			val request = PageLoader.createPageRequest(page, pageUrl)
-			okHttpClient.newCall(request).await().use { response ->
+			imageProxyInterceptor.interceptPageRequest(request, okHttpClient).use { response ->
 				check(response.isSuccessful) {
 					"Invalid response: ${response.code} ${response.message} at $pageUrl"
 				}
@@ -89,11 +93,12 @@ class MangaPageFetcher(
 		}
 	}
 
-	class Factory(
-		private val context: Context,
-		private val okHttpClient: OkHttpClient,
+	class Factory @Inject constructor(
+		@ApplicationContext private val context: Context,
+		@MangaHttpClient private val okHttpClient: OkHttpClient,
 		private val pagesCache: PagesCache,
 		private val mangaRepositoryFactory: MangaRepository.Factory,
+		private val imageProxyInterceptor: ImageProxyInterceptor,
 	) : Fetcher.Factory<MangaPage> {
 
 		override fun create(data: MangaPage, options: Options, imageLoader: ImageLoader): Fetcher {
@@ -104,6 +109,7 @@ class MangaPageFetcher(
 				page = data,
 				context = context,
 				mangaRepositoryFactory = mangaRepositoryFactory,
+				imageProxyInterceptor = imageProxyInterceptor,
 			)
 		}
 	}