Make flaresolverr session options configurable (#854)

Signed-off-by: Chance Zibolski <[email protected]>
Suwayomi · Jan 25, 2024 · dc124fb · dc124fb
1 parent 9109d1c
commit dc124fb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/CloudflareInterceptor.kt
@@ -169,8 +169,8 @@ object CFClearance {
                                     FlareSolverRequest(
                                         "request.get",
                                         originalRequest.url.toString(),
-                                        session = "suwayomi",
-                                        sessionTtlMinutes = 15,
+                                        session = serverConfig.flareSolverrSessionName.value,
+                                        sessionTtlMinutes = serverConfig.flareSolverrSessionTtl.value,
                                         cookies =
                                             network.cookieStore.get(originalRequest.url).map {
                                                 FlareSolverCookie(it.name, it.value)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/mutations/SettingsMutation.kt
@@ -91,6 +91,8 @@ class SettingsMutation {
         updateSetting(settings.flareSolverrEnabled, serverConfig.flareSolverrEnabled)
         updateSetting(settings.flareSolverrUrl, serverConfig.flareSolverrUrl)
         updateSetting(settings.flareSolverrTimeout, serverConfig.flareSolverrTimeout)
+        updateSetting(settings.flareSolverrSessionName, serverConfig.flareSolverrSessionName)
+        updateSetting(settings.flareSolverrSessionTtl, serverConfig.flareSolverrSessionTtl)
     }
 
     fun setSettings(input: SetSettingsInput): SetSettingsPayload {

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt b/server/src/main/kotlin/suwayomi/tachidesk/graphql/types/SettingsType.kt
@@ -76,6 +76,8 @@ interface Settings : Node {
     val flareSolverrEnabled: Boolean?
     val flareSolverrUrl: String?
     val flareSolverrTimeout: Int?
+    val flareSolverrSessionName: String?
+    val flareSolverrSessionTtl: Int?
 }
 
 data class PartialSettingsType(
@@ -127,6 +129,8 @@ data class PartialSettingsType(
     override val flareSolverrEnabled: Boolean?,
     override val flareSolverrUrl: String?,
     override val flareSolverrTimeout: Int?,
+    override val flareSolverrSessionName: String?,
+    override val flareSolverrSessionTtl: Int?,
 ) : Settings
 
 class SettingsType(
@@ -178,6 +182,8 @@ class SettingsType(
     override val flareSolverrEnabled: Boolean,
     override val flareSolverrUrl: String,
     override val flareSolverrTimeout: Int,
+    override val flareSolverrSessionName: String,
+    override val flareSolverrSessionTtl: Int,
 ) : Settings {
     constructor(config: ServerConfig = serverConfig) : this(
         config.ip.value,
@@ -228,5 +234,7 @@ class SettingsType(
         config.flareSolverrEnabled.value,
         config.flareSolverrUrl.value,
         config.flareSolverrTimeout.value,
+        config.flareSolverrSessionName.value,
+        config.flareSolverrSessionTtl.value,
     )
 }
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/ServerConfig.kt
@@ -135,6 +135,8 @@ class ServerConfig(getConfig: () -> Config, val moduleName: String = SERVER_CONF
     val flareSolverrEnabled: MutableStateFlow<Boolean> by OverrideConfigValue(BooleanConfigAdapter)
     val flareSolverrUrl: MutableStateFlow<String> by OverrideConfigValue(StringConfigAdapter)
     val flareSolverrTimeout: MutableStateFlow<Int> by OverrideConfigValue(IntConfigAdapter)
+    val flareSolverrSessionName: MutableStateFlow<String> by OverrideConfigValue(StringConfigAdapter)
+    val flareSolverrSessionTtl: MutableStateFlow<Int> by OverrideConfigValue(IntConfigAdapter)
 
     @OptIn(ExperimentalCoroutinesApi::class)
     fun <T> subscribeTo(

diff --git a/server/src/main/resources/server-reference.conf b/server/src/main/resources/server-reference.conf
@@ -60,4 +60,6 @@ server.localSourcePath = ""
 # Cloudflare bypass
 server.flareSolverrEnabled = false
 server.flareSolverrUrl = "http://localhost:8191"
-server.flareSolverrTimeout = 60 # time in seconds
+server.flareSolverrTimeout = 60 # time in seconds
+server.flareSolverrSessionName = "suwayomi"
+server.flareSolverrSessionTtl = 15 # time in minutes