Update http config with more gracefully request

ChrisKruegerDev · Dec 4, 2024 · 19758ca · 19758ca
1 parent f388d53
commit 19758ca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/tmdb-api/src/commonMain/kotlin/app/moviebase/tmdb/TmdbClientConfig.kt b/tmdb-api/src/commonMain/kotlin/app/moviebase/tmdb/TmdbClientConfig.kt
@@ -12,9 +12,9 @@ class TmdbClientConfig {
     internal var tmdbAuthCredentials: TmdbAuthCredentials? = null
 
     var expectSuccess: Boolean = true
-    var useCache: Boolean = false
-    var useTimeout: Boolean = false
-    var maxRetriesOnException: Int? = null
+    var useCache: Boolean = true
+    var useTimeout: Boolean = true
+    var maxRequestRetries: Int? = 5
 
     internal var httpClientConfigBlock: (HttpClientConfig<*>.() -> Unit)? = null
     internal var httpClientBuilder: (() -> HttpClient)? = null

diff --git a/tmdb-api/src/commonMain/kotlin/app/moviebase/tmdb/core/HttpClientFactory.kt b/tmdb-api/src/commonMain/kotlin/app/moviebase/tmdb/core/HttpClientFactory.kt
@@ -82,10 +82,16 @@ internal object HttpClientFactory {
             }
 
             // see https://ktor.io/docs/client-retry.html
-            config.maxRetriesOnException?.let {
+            config.maxRequestRetries?.let {
                 install(HttpRequestRetry) {
                     exponentialDelay()
-                    retryOnServerErrors(maxRetries = it)
+                    retryIf(it) { _, httpResponse ->
+                        when {
+                            httpResponse.status.value in 500..599 -> true
+                            httpResponse.status == HttpStatusCode.TooManyRequests -> true
+                            else -> false
+                        }
+                    }
 
                     retryOnExceptionIf(maxRetries = it) { _, cause ->
                         when {

diff --git a/tmdb-api/src/jvmTest/kotlin/app/moviebase/tmdb/TmdbTestEnvironment.kt b/tmdb-api/src/jvmTest/kotlin/app/moviebase/tmdb/TmdbTestEnvironment.kt
@@ -44,7 +44,7 @@ fun defaultTmdbConfiguration(
 
     useCache = true
     useTimeout = true
-    maxRetriesOnException = 3
+    maxRequestRetries = 3
 
     httpClient(OkHttp) {
         logging {