Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
Stop asking Spotify while it holds the app's requests
Lelonio8f5a2a010da9
diff --git a/app/src/main/java/dev/lelonio/square/data/ApiFactory.kt b/app/src/main/java/dev/lelonio/square/data/ApiFactory.ktindex 8da0265..639a476 100644--- a/app/src/main/java/dev/lelonio/square/data/ApiFactory.kt+++ b/app/src/main/java/dev/lelonio/square/data/ApiFactory.kt@@ -5,6 +5,7 @@ import kotlinx.coroutines.runBlockingimport kotlinx.serialization.json.Jsonimport okhttp3.MediaType.Companion.toMediaTypeimport okhttp3.RequestBody.Companion.toRequestBody+import okhttp3.ResponseBody.Companion.toResponseBodyimport okhttp3.OkHttpClientimport okhttp3.Interceptorimport okhttp3.Response@@ -123,6 +124,24 @@ object ApiFactory {*/private class RateLimitInterceptor : Interceptor {override fun intercept(chain: Interceptor.Chain): Response {+ // Still inside a long back-off: answered here, without asking.+ //+ // Spotify puts a developer app that went over its quota on hold+ // for hours (a report showed Retry-After=70220, nineteen of them),+ // and the app went on asking: seven hundred more 429s in a few+ // minutes, every one of them a reason for Spotify to keep it there.+ val waitMs = blockedUntil - android.os.SystemClock.elapsedRealtime()+ if (waitMs > 0) {+ return Response.Builder()+ .request(chain.request())+ .protocol(okhttp3.Protocol.HTTP_1_1)+ .code(429)+ .message("Rate limited, waiting")+ .header("Retry-After", ((waitMs + 999) / 1000).toString())+ .body("".toResponseBody(null))+ .build()+ }+val response = chain.proceed(chain.request())// Spotify's gateway answers 502 and 503 a few times a day for no@@ -139,6 +158,10 @@ object ApiFactory {val retryAfter = response.header("Retry-After")?.toLongOrNull()android.util.Log.w(TAG, "rate limited, Retry-After=${retryAfter ?: "absent"}")+ if (retryAfter != null && retryAfter > HOLD_FROM_SECONDS) {+ blockedUntil = android.os.SystemClock.elapsedRealtime() + retryAfter * 1000+ android.util.Log.w(TAG, "holding Web API requests for ${retryAfter}s, as Spotify asked")+ }if (retryAfter == null || retryAfter > MAX_WAIT_SECONDS) return responseresponse.close()@@ -160,6 +183,14 @@ object ApiFactory {* subsequent requests and fallbacks can proceed without hanging the UI.*/const val MAX_WAIT_SECONDS = 3L++ /** A back-off longer than this is a hold, and nothing is asked until it ends. */+ const val HOLD_FROM_SECONDS = 60L++ /** When the current hold ends, on the elapsed-realtime clock; 0 for none. */+ @Volatile+ var blockedUntil = 0L+const val TAG = "SquareApi"}}