Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Operation table: cache by bundle set when the build id is missing
liliapk09a7849cf910
diff --git a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/GqlOpsUpdater.kt b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/GqlOpsUpdater.ktindex 1d17126a..187df0e3 100644--- a/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/GqlOpsUpdater.kt+++ b/base/api-spotify/src/main/kotlin/app/myspoti/spotify/gql/GqlOpsUpdater.kt@@ -34,14 +34,21 @@ class GqlOpsUpdater(private val http: OkHttpClient, private val cache: File) {suspend fun refresh(current: GqlOps): GqlOps? = withContext(Dispatchers.IO) {val html = get("https://open.spotify.com/")val build = script(html, "appServerConfig")?.let { (it["buildVersion"] as? JsonPrimitive)?.content }- val cachedBuild = runCatching { Bridge.json.parseToJsonElement(cache.readText()).jsonObject["buildVersion"]?.jsonPrimitive?.content }.getOrNull()- if (build != null && build == cachedBuild) return@withContext nullval urls = LinkedHashSet<String>()BUNDLE.findAll(html).forEach { urls += it.value }script(html, "__CDN_FILE_URLS__")?.values?.forEach { v ->(v as? JsonPrimitive)?.content?.takeIf { it.endsWith(".js") && it.contains("/web-player/") }?.let(urls::add)}if (urls.isEmpty()) return@withContext null+ // Without a parseable build id, the bundle set is the cache key: otherwise+ // build == null never matches and every launch re-downloads every bundle.+ val bundleKey = java.security.MessageDigest.getInstance("SHA-256")+ .digest(urls.sorted().joinToString("\n").toByteArray())+ .joinToString("") { "%02x".format(it) }+ val cached = runCatching { Bridge.json.parseToJsonElement(cache.readText()).jsonObject }.getOrNull()+ val cachedBuild = cached?.get("buildVersion")?.jsonPrimitive?.content+ if (build != null && build == cachedBuild) return@withContext null+ if (build == null && bundleKey == cached?.get("bundleKey")?.jsonPrimitive?.content) return@withContext nullval found = HashMap<String, String>()val gate = Semaphore(6)coroutineScope {@@ -52,6 +59,7 @@ class GqlOpsUpdater(private val http: OkHttpClient, private val cache: File) {val merged = current.names.associateWith { current.hash(it) } + foundval json = buildJsonObject {build?.let { put("buildVersion", it) }+ put("bundleKey", bundleKey)putJsonObject("operations") { merged.forEach { (name, hash) -> putJsonObject(name) { put("hash", hash) } } }}cache.parentFile?.mkdirs()