diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index 0fe38c49db..fdd4db2495 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -34,11 +34,16 @@ object BattleNetInstall { internal const val STATE = "BNET_STATE " internal const val DONE = "BNET_DONE " internal const val ERROR = "BNET_ERROR " - private const val VERSIONS = "https://%s.version.battle.net/v2/products/%s/versions" + private const val CN = "cn" private const val BUILD_INFO = ".build.info" private const val CHECK_AGAIN_MS = 30 * 60_000L private const val START_WAIT_MS = 60_000L + /** Blizzard serves China from battlenet.com.cn; its global version hostnames do not answer for that region. */ + internal fun versionsUrl(region: String, product: String): String = + "https://" + (if (region == CN) "cn.version.battlenet.com.cn" else "$region.version.battle.net") + + "/v2/products/$product/versions" + internal val LOCALES = listOf( "enUS", "enGB", "esMX", "esES", "ptBR", "ptPT", "frFR", "deDE", "itIT", "ruRU", "jaJP", "koKR", "plPL", "trTR", "zhTW", "zhCN", "thTH", "arSA", @@ -187,7 +192,7 @@ object BattleNetInstall { checks.execute { val local = runCatching { buildKey(File(folder, BUILD_INFO).readText()) }.getOrNull() ?: return@execute retryLater() - val latest = runCatching { latestBuild(fetch(VERSIONS.format(Locale.ROOT, local.first, product)), local.first) } + val latest = runCatching { latestBuild(fetch(versionsUrl(local.first, product)), local.first) } .onFailure { Log.w(TAG, "versions of $product: ${it.javaClass.simpleName}") }.getOrNull() ?: return@execute retryLater() val behind = latest != local.second diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt index 027a1db73b..05a5708158 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -38,6 +38,11 @@ class BattleNetInstallTest { assertNull(BattleNetInstall.latestBuild("", "us")) } + @Test fun theVersionServiceIsBlizzardsChineseOneForChina() { + assertEquals("https://us.version.battle.net/v2/products/wow/versions", BattleNetInstall.versionsUrl("us", "wow")) + assertEquals("https://cn.version.battlenet.com.cn/v2/products/d3cn/versions", BattleNetInstall.versionsUrl("cn", "d3cn")) + } + @Test fun theDeviceLanguagePicksABlizzardLocale() { assertEquals("enUS", BattleNetInstall.locale(Locale.US)) assertEquals("enGB", BattleNetInstall.locale(Locale.UK)) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 0f78812eac..2f93eeaafc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -113,7 +113,9 @@ function field(text, name) { } function install() { - var form = call("POST", "/install", '{"uid":"' + uid + '","instructions_patch_url":"http://' + zone + '.patch.battle.net:1119/' + + // Blizzard's China repository moved to cn.patch.battlenet.com.cn; cn.patch.battle.net only redirects away from it. + var patch = zone == "cn" ? "cn.patch.battlenet.com.cn" : zone + ".patch.battle.net"; + var form = call("POST", "/install", '{"uid":"' + uid + '","instructions_patch_url":"http://' + patch + ':1119/' + product + '","instructions_product":"NGDP","monitor_pid":12345,"priority":{"insert_at_head":true,"value":900}}'); save(".form", form); if (form.indexOf('"' + lang + '"') < 0) lang = "enUS"; diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index c0d0a76311..c99cb3e680 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1130,6 +1130,11 @@ class AgentTest(Temp): self.assertIn("lang = a(5), country = a(6), region = a(7), out = a(8)", script) self.assertIn('"--internalclienttools"', (BIN / "droiddeck-battlenet").read_text()) + def test_the_driver_asks_blizzards_chinese_repository_for_chinese_installs(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn('var patch = zone == "cn" ? "cn.patch.battlenet.com.cn" : zone + ".patch.battle.net";', script) + self.assertIn("+ patch + ':1119/'", script) + class AgentJobTest(Harness): def setUp(self):