Use ktor to retrieve html

desktopApp/compose-desktop.pro

@@ -106,3 +106,9 @@
 # Compose Markdown
 
 -keep class com.mikepenz.markdown.model.** { *; }
+
+# Ktor
+
+-keep class kotlin.reflect.jvm.internal.** { *; }
+-keep class kotlin.text.RegexOption { *; }
+-keep class io.ktor.serialization.kotlinx.json.KotlinxSerializationJsonExtensionProvider { *; }

gradle/libs.versions.toml

@@ -53,8 +53,8 @@ kotlinx-date-time = "0.6.0-RC.2"
 androidx-browser = "1.8.0"
 readability4j = "1.0.8"
 compose-webview = "1.9.8"
-okhttp = "4.12.0"
 voyager = "1.0.0"
+ktor = "2.3.11"
 
 [libraries]
 about-libraries-compose = { module = "com.mikepenz:aboutlibraries-compose", version.ref = "about-libraries" }
@@ -116,9 +116,11 @@ kotlinx-date-time = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version
 androidx-browser = { module = "androidx.browser:browser", version.ref = "androidx-browser" }
 readability4j = { module = "net.dankito.readability4j:readability4j", version.ref = "readability4j" }
 compose-webview = { module = "io.github.kevinnzou:compose-webview-multiplatform", version.ref = "compose-webview" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
 voyager-transition = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 
 [bundles]
 compose = [

shared/build.gradle.kts

@@ -64,6 +64,7 @@ kotlin {
  implementation(libs.com.prof18.rss.parser)
  implementation(libs.multiplatform.settings)
  implementation(libs.kotlinx.date.time)
+ implementation(libs.ktor.client.core)
 
  api(project(":core"))
  api(project(":i18n"))
@@ -86,7 +87,7 @@ kotlin {
  dependencies {
  implementation(libs.jsoup)
  implementation(libs.readability4j)
- implementation(libs.okhttp)
+ implementation(libs.ktor.client.okhttp)
  }
  }
 
@@ -134,6 +135,7 @@ kotlin {
 
  dependencies {
  api(libs.touchlab.kermit.simple)
+ implementation(libs.ktor.client.darwin)
  }
  }
 

shared/src/androidMain/kotlin/com/prof18/feedflow/shared/di/KoinAndroid.kt

@@ -5,9 +5,7 @@ import app.cash.sqldelight.db.SqlDriver
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.database.createDatabaseDriver
 import com.prof18.feedflow.shared.domain.HtmlParser
-import com.prof18.feedflow.shared.domain.HtmlRetriever
 import com.prof18.feedflow.shared.domain.JvmHtmlParser
-import com.prof18.feedflow.shared.domain.JvmHtmlRetriever
 import com.prof18.feedflow.shared.domain.ReaderModeExtractor
 import com.prof18.feedflow.shared.domain.opml.OpmlFeedHandler
 import com.prof18.feedflow.shared.presentation.BaseViewModel
@@ -61,13 +59,6 @@ internal actual fun getPlatformModule(appEnvironment: AppEnvironment): Module =
  }
  }
 
- factory<HtmlRetriever> {
- JvmHtmlRetriever(
- dispatcherProvider = get(),
- logger = getWith("JvmHtmlRetriever"),
- )
- }
-
  factory {
  ReaderModeExtractor(
  dispatcherProvider = get(),

shared/src/commonMain/kotlin/com/prof18/feedflow/shared/di/Koin.kt

@@ -7,6 +7,7 @@ import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.database.DatabaseHelper
 import com.prof18.feedflow.shared.data.SettingsHelper
 import com.prof18.feedflow.shared.domain.DateFormatter
+import com.prof18.feedflow.shared.domain.HtmlRetriever
 import com.prof18.feedflow.shared.domain.browser.BrowserSettingsRepository
 import com.prof18.feedflow.shared.domain.feed.FeedSourceLogoRetriever
 import com.prof18.feedflow.shared.domain.feed.FeedUrlRetriever
@@ -23,6 +24,7 @@ import com.prof18.feedflow.shared.presentation.ImportExportViewModel
 import com.prof18.feedflow.shared.presentation.SearchViewModel
 import com.prof18.feedflow.shared.presentation.SettingsViewModel
 import com.prof18.rssparser.RssParser
+import io.ktor.client.HttpClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import org.koin.core.KoinApplication
@@ -196,6 +198,17 @@ private val coreModule = module {
  htmlRetriever = get(),
  )
  }
+
+ single {
+ HttpClient()
+ }
+
+ factory {
+ HtmlRetriever(
+ logger = getWith("HtmlRetriever"),
+ client = get(),
+ )
+ }
 }
 
 internal expect fun getPlatformModule(appEnvironment: AppEnvironment): Module

shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/HtmlRetriever.kt

@@ -1,5 +1,21 @@
 package com.prof18.feedflow.shared.domain
 
-internal interface HtmlRetriever {
- suspend fun retrieveHtml(url: String): String?
+import co.touchlab.kermit.Logger
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
+
+internal class HtmlRetriever(
+ private val logger: Logger,
+ private val client: HttpClient,
+) {
+ suspend fun retrieveHtml(url: String): String? {
+ try {
+ val response = client.get(url)
+ return response.bodyAsText()
+ } catch (e: Throwable) {
+ logger.e(e) { "Unable to retrieve HTML, skipping" }
+ return null
+ }
+ }
 }

shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt

@@ -8,8 +8,6 @@ import com.prof18.feedflow.i18n.EnFeedFlowStrings
 import com.prof18.feedflow.i18n.FeedFlowStrings
 import com.prof18.feedflow.i18n.feedFlowStrings
 import com.prof18.feedflow.shared.domain.HtmlParser
-import com.prof18.feedflow.shared.domain.HtmlRetriever
-import com.prof18.feedflow.shared.domain.IosHtmlRetriever
 import com.prof18.feedflow.shared.domain.browser.BrowserSettingsRepository
 import com.prof18.feedflow.shared.domain.opml.OpmlFeedHandler
 import com.prof18.feedflow.shared.domain.settings.SettingsRepository
@@ -80,13 +78,6 @@ internal actual fun getPlatformModule(appEnvironment: AppEnvironment): Module =
  single<Settings> {
  KeychainSettings(service = "FeedFlow")
  }
-
- factory<HtmlRetriever> {
- IosHtmlRetriever(
- dispatcherProvider = get(),
- logger = getWith("IosHtmlRetriever"),
- )
- }
 }
 
 @Suppress("unused") // Called from Swift

shared/src/jvmMain/kotlin/com/prof18/feedflow/shared/di/KoinDesktop.kt

@@ -4,9 +4,7 @@ import app.cash.sqldelight.db.SqlDriver
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.database.createDatabaseDriver
 import com.prof18.feedflow.shared.domain.HtmlParser
-import com.prof18.feedflow.shared.domain.HtmlRetriever
 import com.prof18.feedflow.shared.domain.JvmHtmlParser
-import com.prof18.feedflow.shared.domain.JvmHtmlRetriever
 import com.prof18.feedflow.shared.domain.ReaderModeExtractor
 import com.prof18.feedflow.shared.domain.opml.OpmlFeedHandler
 import com.prof18.feedflow.shared.presentation.BaseViewModel
@@ -72,13 +70,6 @@ internal actual fun getPlatformModule(appEnvironment: AppEnvironment): Module =
  PreferencesSettings(preferences)
  }
 
- factory<HtmlRetriever> {
- JvmHtmlRetriever(
- dispatcherProvider = get(),
- logger = getWith("JvmHtmlRetriever"),
- )
- }
-
  factory {
  ReaderModeExtractor(
  dispatcherProvider = get(),

sharedUI/src/commonMain/kotlin/com/prof18/feedflow/shared/ui/addfeed/CategoriesSelector.kt

@@ -17,7 +17,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowRight
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.outlined.AddCircleOutline
 import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.material3.Icon
@@ -85,7 +85,7 @@ internal fun CategoriesSelector(
  Text(header)
 
  Icon(
- imageVector = Icons.Default.KeyboardArrowRight,
+ imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
  contentDescription = null,
  modifier = Modifier.rotate(degrees),
  )