From c7cd2b55af4d2e6677e3808385abcc8392568b13 Mon Sep 17 00:00:00 2001 From: Zeratullo Date: Wed, 18 Nov 2026 06:23:00 +0100 Subject: [PATCH 01/60] fix(xbox): hand Xodus a launch folder the Linux guest can see (#2751) * fix(xbox): log and show why an Xbox launch could not be prepared * fix(xbox): hand Xodus a launch folder the Linux guest can see --------- Co-authored-by: Zeratullo <8460122+Zeratullo@users.noreply.github.com> --- .../droiddeck/launcher/stores/StoreLaunchRequests.kt | 6 +++++- .../droiddeck/launcher/stores/xbox/XboxLaunchViews.kt | 3 ++- .../launcher/stores/xbox/XboxLaunchViewsTest.kt | 11 +++++++++++ tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index c4af9891d0..af4ea74964 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -58,7 +58,11 @@ object StoreLaunchRequests { } "xbox-renew" -> JSONObject().put("ok", com.droiddeck.launcher.stores.xbox.XboxRuntime.renew(app, request.optString("id"), request.optString("lease"))) "xbox-prepare" -> runCatching { com.droiddeck.launcher.stores.xbox.XboxRuntime.prepare(app, request.getString("id")) } - .getOrElse { JSONObject().put("ok", false).put("reason", "Xbox account service is unavailable. Sign in again and retry.") } + .getOrElse { + StoresState.logLine("Xbox: launch prepare failed (${it.javaClass.simpleName}: ${it.message})") + val reason = (it as? IllegalStateException)?.message ?: "Xbox account service is unavailable. Sign in again and retry." + JSONObject().put("ok", false).put("reason", reason) + } "ea-prepare" -> runCatching { lastLaunched = Store.EA to request.optString("id"); com.droiddeck.launcher.stores.ea.EaLaunch.prepare(app, request) } .getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } "ea-exited" -> { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt index 9316ab27ef..c18bb9bb2e 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViews.kt @@ -18,7 +18,8 @@ internal class XboxLaunchViews { parent.listFiles()?.filter { it.name.startsWith("launch-") }?.forEach(::remove) recovered.add(parent.path) } - return Files.createTempDirectory(parent.toPath(), "launch-").toFile() + // The guest binds the files directory by the path Android reports, not its canonical one. + return File(files, "xbox-runtime/views/" + Files.createTempDirectory(parent.toPath(), "launch-").fileName) } companion object { diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt index f14d294c01..145cb45e66 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLaunchViewsTest.kt @@ -50,4 +50,15 @@ class XboxLaunchViewsTest { assertEquals("preserve", evidence.readText()) } finally { root.deleteRecursively() } } + + @Test fun viewsKeepTheFilesPathTheGuestBinds() { + val root = Files.createTempDirectory("xbox-view-alias").toFile() + try { + val real = root.resolve("data/data/app/files").apply { mkdirs() } + val alias = root.resolve("user0").also { Files.createSymbolicLink(it.toPath(), real.parentFile!!.toPath()) }.resolve("files") + val view = XboxLaunchViews().create(alias) + assertEquals(alias.resolve("xbox-runtime/views").path, view.parentFile!!.path) + assertTrue(real.resolve("xbox-runtime/views").resolve(view.name).isDirectory) + } finally { root.deleteRecursively() } + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index 2b97aa3c9e..f15e0b694a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -390,7 +390,7 @@ def launch(command, env): raise RuntimeError('No Xbox account channel; start the game from DroidDeck') reply = store['ask'](Path(launch_dir) / 'stores', {'op': 'xbox-prepare', 'id': sidecar['id']}, timeout=190) if not reply or not reply.get('ok'): - raise RuntimeError('Xbox account service is unavailable; sign in again and retry') + raise RuntimeError((reply or {}).get('reason') or 'Xbox account service is unavailable; sign in again and retry') stopped = threading.Event() close = lambda: None try: From 8faaac3b89e52bc388fc7f295cf72b0ce3aedb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= Date: Wed, 18 Nov 2026 06:25:36 +0100 Subject: [PATCH 02/60] fix(agent): force clearing focus on a tap in the Agent conversation (#2769) A tap on the conversation while the composer held focus could crash the app: FocusManager.clearFocus() without force walks the focused chain for a custom exit and throws IllegalArgumentException ("ActiveParent with no focused child") when a parent is ActiveParent with no active child. The forced path skips that walk and treats a missing child as cleared. Nothing in the Agent UI sets a custom focus exit, so forcing changes no behaviour. Co-authored-by: Jan Pokorny <4580066+JanPokorny@users.noreply.github.com> --- app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 0a02ebf9ba..cf9080417e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -292,7 +292,8 @@ private fun AgentPageContent( awaitEachGesture { awaitFirstDown(requireUnconsumed = false, pass = PointerEventPass.Initial) if (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE) panel = AgentPanel.NONE - if (composer.focused) focusManager.clearFocus() + // Forced: the unforced path walks the focus chain and throws ("ActiveParent with no focused child") when a tap lands while focus is moving. + if (composer.focused) focusManager.clearFocus(force = true) } }, list, following = !readingBack, onRevise = { composer.open() }, onSent = toLatest, From 8953eea9e0b451d1038643d160a5f533b61e3c5e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:26:07 -0500 Subject: [PATCH 03/60] fix(battlenet): keep the launch behavior a player chose in Battle.net (#2750) --- .../overlay/usr/local/bin/droiddeck-battlenet | 14 +++++++- tools/tests/test_battlenet.py | 34 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 1944635308..066f9c572e 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -321,6 +321,15 @@ def install_path(root, library): return letter.upper() + ":\\" + path[len(target):].strip("/").replace("/", "\\") +def keeps_open(root): + try: + with open(os.path.join(drive_c(root), *CONFIG), encoding="utf-8-sig") as f: + client = json.load(f).get("Client") + except (OSError, ValueError, AttributeError): + return False + return isinstance(client, dict) and LAUNCH_BEHAVIOR[0] in client and client[LAUNCH_BEHAVIOR[0]] != LAUNCH_BEHAVIOR[1] + + def write_config(root, library=None): path = os.path.join(drive_c(root), *CONFIG) key, value = LAUNCH_BEHAVIOR @@ -338,7 +347,7 @@ def write_config(root, library=None): return None client = config["Client"] changes = [] - if client.get(key) != value: + if key not in client: client[key] = value changes.append("launch") if client.get("HardwareAcceleration") != "false": @@ -875,6 +884,9 @@ class Tidy: self.game_since = self.game_since if self.game_since is not None else now if own and not self.closed_for_game and now - self.game_since >= self.settle: self.closed_for_game, self.agent_seen, self.agent_lost = True, False, None + if keeps_open(steam_root()): + say("Battle.net is set to stay open as a game launches: left open") + return False if any(is_client(argv) for _, argv in own) and any(shares_sign_in(argv) for argv in games): say("Battle.net stayed open beside a game signing in with its token: left open") return False diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index cc92c78cc4..ece44f60d6 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -180,7 +180,7 @@ class ConfigAndMenuTest(Temp): self.assertEqual(config["Client"]["Streaming"]["StreamingEnabled"], "false") self.assertEqual(config["Client"]["GameLaunchWindowBehavior"], "2") self.assertIsNone(BNET["write_config"](root)) - path.write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "0"}, "Games": {"osi": {}}}') + path.write_text('{"Client": {"HardwareAcceleration": "false"}, "Games": {"osi": {}}}') self.assertEqual(BNET["write_config"](root), "launch 32-bit") config = json.loads(path.read_text()) self.assertEqual(config, {"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, @@ -189,6 +189,29 @@ class ConfigAndMenuTest(Temp): self.assertEqual(BNET["write_config"](root), "acceleration 32-bit") self.assertEqual(json.loads(path.read_text())["Client"]["HardwareAcceleration"], "false") + def test_a_launch_behavior_the_player_chose_is_kept(self): + root = str(self.tmp) + path = self.config_path() + path.parent.mkdir(parents=True) + for behavior in ("0", "1"): + with self.subTest(behavior): + path.write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "%s"}, ' + '"Games": {"s1": {"Run64Bit": "false", "Run64BitSet": "true"}}}' % behavior) + self.assertIsNone(BNET["write_config"](root)) + self.assertEqual(json.loads(path.read_text())["Client"]["GameLaunchWindowBehavior"], behavior) + self.assertTrue(BNET["keeps_open"](root)) + + def test_only_a_launch_behavior_other_than_exit_keeps_battle_net_open(self): + root = str(self.tmp) + self.assertFalse(BNET["keeps_open"](root)) + path = self.config_path() + path.parent.mkdir(parents=True) + for text in ("{not json", "[1, 2]", '{"Client": "x"}', '{"Client": {}}', + '{"Client": {"GameLaunchWindowBehavior": "2"}}'): + with self.subTest(text): + path.write_text(text) + self.assertFalse(BNET["keeps_open"](root)) + def test_starcraft_starts_its_32_bit_client_until_a_player_picks_one(self): root = str(self.tmp) BNET["write_config"](root) @@ -656,6 +679,7 @@ class TidyTest(unittest.TestCase): "say": lambda message: None, "stop": lambda found, wait=0: self.stopped.append(sorted(pid for pid, _ in found)), "notify": lambda title, body, icon=None: self.notified.append(title), + "keeps_open": lambda root: False, }) patcher.start() self.addCleanup(patcher.stop) @@ -672,6 +696,14 @@ class TidyTest(unittest.TestCase): self.assertEqual(self.stopped, [[1, 2, 3]]) self.assertEqual(self.notified, []) + def test_battle_net_the_player_set_to_stay_open_is_left_open(self): + up = [self.CLIENT, self.PAGE, self.AGENT, self.WINE] + tidy = BNET["Tidy"](settle=20, gone=30) + with mock.patch.dict(BNET, {"keeps_open": lambda root: True}): + closed = self.run_tidy(tidy, [(0, up), (5, up + [self.GAME]), (25, up + [self.GAME]), (60, up + [self.GAME])]) + self.assertEqual(closed, [False, False, False, False]) + self.assertEqual(self.stopped, []) + def test_battle_net_beside_a_game_signing_in_with_its_token_is_left_open(self): d4 = (6, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-nostreamline", "-sso", "-launch", "-uid", "fenris"]) up = [self.CLIENT, self.PAGE, self.AGENT] From d40c962b37fe2aba903be5d1fcc4d446403b8ed5 Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Wed, 18 Nov 2026 01:26:32 -0400 Subject: [PATCH 04/60] Feat: Better SMAA, make nearest the default filter and change the default store order (#2760) * Add SMAA screen effect option * Atualizar o smaa_frag.h * Atualizar o smaa.frag * Fix SMAA endpoint and crossing-edge area weights * Atualizar o smaa.frag * Fix SMAA diagonal edge blending * Regenerate SMAA fragment shader header * Fix SMAA diagonal fallback detection * Add anti-aliasing translations * Fix Korean anti-aliasing label * Change default store tab order * Put Nearest scaling before Linear * Make Nearest the default scaling filter * Improve SMAA diagonal blend weighting * Improve SMAA diagonal detection and corner protection * Reduce false positive SMAA diagonal blending * test: update unknown upscaler fallback expectation --- app/src/main/cpp/shaders/smaa.frag | 13 +- app/src/main/cpp/shaders/smaa_frag.h | 776 +++++++++--------- .../launcher/session/SessionPrefs.kt | 13 +- .../com/droiddeck/launcher/stores/Store.kt | 16 +- .../com/droiddeck/launcher/ui/StoresPage.kt | 19 +- .../launcher/session/SessionDisplayTest.kt | 2 +- 6 files changed, 429 insertions(+), 410 deletions(-) diff --git a/app/src/main/cpp/shaders/smaa.frag b/app/src/main/cpp/shaders/smaa.frag index e6095db9ad..55160fdcff 100644 --- a/app/src/main/cpp/shaders/smaa.frag +++ b/app/src/main/cpp/shaders/smaa.frag @@ -85,17 +85,16 @@ void main() { float crossingPattern = smoothstep(threshold, threshold * 2.5, crossingContrast); float areaWeight = 0.38 * crossingPattern * clamp(span / 4.0, 0.0, 1.0); float diagonalContrast = max(abs(nw - se), abs(ne - sw)); - float cornerFactor = 1.0 - 0.18 * smoothstep(threshold, threshold * 3.0, diagonalContrast); + float cornerFactor = 1.0 - 0.35 * smoothstep(threshold, threshold * 3.0, diagonalContrast); float baseWeight = areaWeight * endpointArea * edgeConfidence * cornerFactor; - float diagonalStrength = abs(abs(nw - se) - abs(ne - sw)); + float diagonalStrength = min(vertical, horizontal); float diagonalPattern = smoothstep(threshold, threshold * 2.5, diagonalStrength); - float diagonalFallback = 0.16 * diagonalPattern * edgeConfidence * cornerFactor; + float diagonalContinuity = smoothstep(1.0, 3.0, span); + float diagonalFallback = 0.16 * diagonalPattern * edgeConfidence + * cornerFactor * diagonalContinuity * crossingPattern; - float weight = clamp( - baseWeight <= 0.0001 ? diagonalFallback : baseWeight, - 0.0, 0.42 - ); + float weight = clamp(max(baseWeight, diagonalFallback), 0.0, 0.42); vec3 across = texture(InputTexture, uv + normal * px).rgb; outColor = vec4(mix(center.rgb, across, weight), center.a); } diff --git a/app/src/main/cpp/shaders/smaa_frag.h b/app/src/main/cpp/shaders/smaa_frag.h index ea8bb4d56a..1467b4efc0 100644 --- a/app/src/main/cpp/shaders/smaa_frag.h +++ b/app/src/main/cpp/shaders/smaa_frag.h @@ -2,7 +2,7 @@ #include static const uint32_t smaa_code[] = { - 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000254u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, + 0x07230203u, 0x00010000u, 0x0008000bu, 0x00000251u, 0x00000000u, 0x00020011u, 0x00000001u, 0x0006000bu, 0x00000001u, 0x4c534c47u, 0x6474732eu, 0x3035342eu, 0x00000000u, 0x0003000eu, 0x00000000u, 0x00000001u, 0x0007000fu, 0x00000004u, 0x00000004u, 0x6e69616du, 0x00000000u, 0x00000072u, 0x000000f6u, 0x00030010u, 0x00000004u, 0x00000007u, 0x00030003u, 0x00000002u, 0x000001c2u, 0x00040005u, 0x00000004u, 0x6e69616du, @@ -53,391 +53,391 @@ static const uint32_t smaa_code[] = { 0x00000200u, 0x67616964u, 0x6c616e6fu, 0x746e6f43u, 0x74736172u, 0x00000000u, 0x00060005u, 0x0000020au, 0x6e726f63u, 0x61467265u, 0x726f7463u, 0x00000000u, 0x00050005u, 0x00000214u, 0x65736162u, 0x67696557u, 0x00007468u, 0x00070005u, 0x0000021cu, 0x67616964u, 0x6c616e6fu, 0x65727453u, 0x6874676eu, 0x00000000u, - 0x00060005u, 0x00000227u, 0x67616964u, 0x6c616e6fu, 0x74746150u, 0x006e7265u, 0x00070005u, 0x0000022du, - 0x67616964u, 0x6c616e6fu, 0x6c6c6146u, 0x6b636162u, 0x00000000u, 0x00040005u, 0x00000235u, 0x67696577u, - 0x00007468u, 0x00040005u, 0x0000023eu, 0x6f726361u, 0x00007373u, 0x00040047u, 0x00000025u, 0x00000021u, - 0x00000000u, 0x00040047u, 0x00000025u, 0x00000022u, 0x00000000u, 0x00030047u, 0x00000064u, 0x00000002u, - 0x00050048u, 0x00000064u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000064u, 0x00000001u, - 0x00000023u, 0x00000010u, 0x00050048u, 0x00000064u, 0x00000002u, 0x00000023u, 0x00000018u, 0x00050048u, - 0x00000064u, 0x00000003u, 0x00000023u, 0x0000001cu, 0x00040047u, 0x00000072u, 0x0000001eu, 0x00000000u, - 0x00040047u, 0x000000f6u, 0x0000001eu, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, - 0x00000002u, 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000003u, - 0x00040020u, 0x00000008u, 0x00000007u, 0x00000007u, 0x00040021u, 0x00000009u, 0x00000006u, 0x00000008u, - 0x00040017u, 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, 0x00000007u, 0x0000000du, - 0x00050021u, 0x0000000fu, 0x00000006u, 0x0000000eu, 0x0000000eu, 0x0004002bu, 0x00000006u, 0x00000019u, - 0x3e59b3d0u, 0x0004002bu, 0x00000006u, 0x0000001au, 0x3f371759u, 0x0004002bu, 0x00000006u, 0x0000001bu, - 0x3d93dd98u, 0x0006002cu, 0x00000007u, 0x0000001cu, 0x00000019u, 0x0000001au, 0x0000001bu, 0x00040020u, - 0x00000020u, 0x00000007u, 0x00000006u, 0x00090019u, 0x00000022u, 0x00000006u, 0x00000001u, 0x00000000u, - 0x00000000u, 0x00000000u, 0x00000001u, 0x00000000u, 0x0003001bu, 0x00000023u, 0x00000022u, 0x00040020u, - 0x00000024u, 0x00000000u, 0x00000023u, 0x0004003bu, 0x00000024u, 0x00000025u, 0x00000000u, 0x00040015u, - 0x00000028u, 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000028u, 0x00000029u, 0x00000000u, 0x0004002bu, - 0x00000006u, 0x0000002cu, 0x00000000u, 0x00040017u, 0x0000002fu, 0x00000006u, 0x00000004u, 0x0004002bu, - 0x00000028u, 0x00000048u, 0x00000001u, 0x0004002bu, 0x00000006u, 0x00000063u, 0x3f800000u, 0x0006001eu, - 0x00000064u, 0x0000002fu, 0x0000000du, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000065u, 0x00000009u, - 0x00000064u, 0x0004003bu, 0x00000065u, 0x00000066u, 0x00000009u, 0x00040015u, 0x00000067u, 0x00000020u, - 0x00000001u, 0x0004002bu, 0x00000067u, 0x00000068u, 0x00000001u, 0x00040020u, 0x00000069u, 0x00000009u, - 0x0000000du, 0x0005002cu, 0x0000000du, 0x0000006cu, 0x00000063u, 0x00000063u, 0x00040020u, 0x00000071u, - 0x00000001u, 0x0000000du, 0x0004003bu, 0x00000071u, 0x00000072u, 0x00000001u, 0x0004002bu, 0x00000006u, - 0x00000075u, 0x3f000000u, 0x00040020u, 0x0000007bu, 0x00000007u, 0x0000002fu, 0x0004002bu, 0x00000006u, - 0x000000deu, 0x3d3851ecu, 0x0004002bu, 0x00000006u, 0x000000e0u, 0x3da3d70au, 0x00020014u, 0x000000f1u, - 0x00040020u, 0x000000f5u, 0x00000003u, 0x0000002fu, 0x0004003bu, 0x000000f5u, 0x000000f6u, 0x00000003u, - 0x00040020u, 0x000000f9u, 0x00000007u, 0x000000f1u, 0x0004002bu, 0x00000006u, 0x00000113u, 0xbf800000u, - 0x00040020u, 0x0000011fu, 0x00000007u, 0x00000067u, 0x0004002bu, 0x00000067u, 0x00000127u, 0x00000006u, - 0x0004002bu, 0x00000006u, 0x00000161u, 0x3f266666u, 0x0004002bu, 0x00000006u, 0x00000182u, 0x40200000u, - 0x0004002bu, 0x00000006u, 0x000001cau, 0x3d6147aeu, 0x0004002bu, 0x00000006u, 0x000001f8u, 0x3ec28f5cu, - 0x0004002bu, 0x00000006u, 0x000001fcu, 0x40800000u, 0x0004002bu, 0x00000006u, 0x0000020bu, 0x3e3851ecu, - 0x0004002bu, 0x00000006u, 0x0000020eu, 0x40400000u, 0x0004002bu, 0x00000006u, 0x0000022eu, 0x3e23d70au, - 0x0004002bu, 0x00000006u, 0x00000237u, 0x38d1b717u, 0x0004002bu, 0x00000006u, 0x0000023cu, 0x3ed70a3du, - 0x0004002bu, 0x00000028u, 0x0000024du, 0x00000003u, 0x00050036u, 0x00000002u, 0x00000004u, 0x00000000u, - 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x0000000eu, 0x00000062u, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x00000070u, 0x00000007u, 0x0004003bu, 0x0000007bu, 0x0000007cu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000080u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000081u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000085u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000008du, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000090u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000098u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000009bu, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000000a3u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000a6u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000000aeu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000b1u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000b6u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000bbu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000c0u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000c5u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000cfu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000d9u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000ddu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000e3u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000e7u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000000ebu, 0x00000007u, 0x0004003bu, 0x000000f9u, 0x000000fau, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x000000feu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000100u, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x0000010bu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000010du, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000011du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000011eu, 0x00000007u, 0x0004003bu, - 0x0000011fu, 0x00000120u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000129u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000012eu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000130u, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x00000136u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000137u, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x0000013eu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000013fu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000143u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000145u, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x0000014bu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000014cu, 0x00000007u, 0x0004003bu, - 0x0000000eu, 0x00000153u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000154u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000017bu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000017fu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000186u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000192u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000195u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001a0u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001a3u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001aeu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001b1u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x000001bbu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001beu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001c7u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001ceu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001d0u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001ddu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001dfu, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001ecu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001f1u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x000001f7u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000200u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000020au, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000214u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000021cu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000227u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x0000022du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000235u, 0x00000007u, 0x0004003bu, - 0x00000008u, 0x0000023eu, 0x00000007u, 0x00050041u, 0x00000069u, 0x0000006au, 0x00000066u, 0x00000068u, - 0x0004003du, 0x0000000du, 0x0000006bu, 0x0000006au, 0x0007000cu, 0x0000000du, 0x0000006du, 0x00000001u, - 0x00000028u, 0x0000006bu, 0x0000006cu, 0x00050050u, 0x0000000du, 0x0000006eu, 0x00000063u, 0x00000063u, - 0x00050088u, 0x0000000du, 0x0000006fu, 0x0000006eu, 0x0000006du, 0x0003003eu, 0x00000062u, 0x0000006fu, - 0x0004003du, 0x0000000du, 0x00000073u, 0x00000072u, 0x0004003du, 0x0000000du, 0x00000074u, 0x00000062u, - 0x0005008eu, 0x0000000du, 0x00000076u, 0x00000074u, 0x00000075u, 0x0004003du, 0x0000000du, 0x00000077u, - 0x00000062u, 0x0005008eu, 0x0000000du, 0x00000078u, 0x00000077u, 0x00000075u, 0x00050083u, 0x0000000du, - 0x00000079u, 0x0000006cu, 0x00000078u, 0x0008000cu, 0x0000000du, 0x0000007au, 0x00000001u, 0x0000002bu, - 0x00000073u, 0x00000076u, 0x00000079u, 0x0003003eu, 0x00000070u, 0x0000007au, 0x0004003du, 0x00000023u, - 0x0000007du, 0x00000025u, 0x0004003du, 0x0000000du, 0x0000007eu, 0x00000070u, 0x00050057u, 0x0000002fu, - 0x0000007fu, 0x0000007du, 0x0000007eu, 0x0003003eu, 0x0000007cu, 0x0000007fu, 0x0004003du, 0x0000002fu, - 0x00000082u, 0x0000007cu, 0x0008004fu, 0x00000007u, 0x00000083u, 0x00000082u, 0x00000082u, 0x00000000u, - 0x00000001u, 0x00000002u, 0x0003003eu, 0x00000081u, 0x00000083u, 0x00050039u, 0x00000006u, 0x00000084u, - 0x0000000bu, 0x00000081u, 0x0003003eu, 0x00000080u, 0x00000084u, 0x0004003du, 0x00000023u, 0x00000086u, - 0x00000025u, 0x0004003du, 0x0000000du, 0x00000087u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000088u, - 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000089u, 0x00000088u, 0x00050050u, 0x0000000du, - 0x0000008au, 0x00000089u, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000008bu, 0x00000087u, 0x0000008au, - 0x00050057u, 0x0000002fu, 0x0000008cu, 0x00000086u, 0x0000008bu, 0x0008004fu, 0x00000007u, 0x0000008eu, - 0x0000008cu, 0x0000008cu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000008du, 0x0000008eu, - 0x00050039u, 0x00000006u, 0x0000008fu, 0x0000000bu, 0x0000008du, 0x0003003eu, 0x00000085u, 0x0000008fu, - 0x0004003du, 0x00000023u, 0x00000091u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000092u, 0x00000070u, - 0x00050041u, 0x00000020u, 0x00000093u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000094u, - 0x00000093u, 0x00050050u, 0x0000000du, 0x00000095u, 0x00000094u, 0x0000002cu, 0x00050081u, 0x0000000du, - 0x00000096u, 0x00000092u, 0x00000095u, 0x00050057u, 0x0000002fu, 0x00000097u, 0x00000091u, 0x00000096u, - 0x0008004fu, 0x00000007u, 0x00000099u, 0x00000097u, 0x00000097u, 0x00000000u, 0x00000001u, 0x00000002u, - 0x0003003eu, 0x00000098u, 0x00000099u, 0x00050039u, 0x00000006u, 0x0000009au, 0x0000000bu, 0x00000098u, - 0x0003003eu, 0x00000090u, 0x0000009au, 0x0004003du, 0x00000023u, 0x0000009cu, 0x00000025u, 0x0004003du, - 0x0000000du, 0x0000009du, 0x00000070u, 0x00050041u, 0x00000020u, 0x0000009eu, 0x00000062u, 0x00000048u, - 0x0004003du, 0x00000006u, 0x0000009fu, 0x0000009eu, 0x00050050u, 0x0000000du, 0x000000a0u, 0x0000002cu, - 0x0000009fu, 0x00050083u, 0x0000000du, 0x000000a1u, 0x0000009du, 0x000000a0u, 0x00050057u, 0x0000002fu, - 0x000000a2u, 0x0000009cu, 0x000000a1u, 0x0008004fu, 0x00000007u, 0x000000a4u, 0x000000a2u, 0x000000a2u, - 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000a3u, 0x000000a4u, 0x00050039u, 0x00000006u, - 0x000000a5u, 0x0000000bu, 0x000000a3u, 0x0003003eu, 0x0000009bu, 0x000000a5u, 0x0004003du, 0x00000023u, - 0x000000a7u, 0x00000025u, 0x0004003du, 0x0000000du, 0x000000a8u, 0x00000070u, 0x00050041u, 0x00000020u, - 0x000000a9u, 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000000aau, 0x000000a9u, 0x00050050u, - 0x0000000du, 0x000000abu, 0x0000002cu, 0x000000aau, 0x00050081u, 0x0000000du, 0x000000acu, 0x000000a8u, - 0x000000abu, 0x00050057u, 0x0000002fu, 0x000000adu, 0x000000a7u, 0x000000acu, 0x0008004fu, 0x00000007u, - 0x000000afu, 0x000000adu, 0x000000adu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000aeu, - 0x000000afu, 0x00050039u, 0x00000006u, 0x000000b0u, 0x0000000bu, 0x000000aeu, 0x0003003eu, 0x000000a6u, - 0x000000b0u, 0x0004003du, 0x00000006u, 0x000000b2u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b3u, - 0x00000085u, 0x00050083u, 0x00000006u, 0x000000b4u, 0x000000b2u, 0x000000b3u, 0x0006000cu, 0x00000006u, - 0x000000b5u, 0x00000001u, 0x00000004u, 0x000000b4u, 0x0003003eu, 0x000000b1u, 0x000000b5u, 0x0004003du, - 0x00000006u, 0x000000b7u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b8u, 0x00000090u, 0x00050083u, - 0x00000006u, 0x000000b9u, 0x000000b7u, 0x000000b8u, 0x0006000cu, 0x00000006u, 0x000000bau, 0x00000001u, - 0x00000004u, 0x000000b9u, 0x0003003eu, 0x000000b6u, 0x000000bau, 0x0004003du, 0x00000006u, 0x000000bcu, - 0x00000080u, 0x0004003du, 0x00000006u, 0x000000bdu, 0x0000009bu, 0x00050083u, 0x00000006u, 0x000000beu, - 0x000000bcu, 0x000000bdu, 0x0006000cu, 0x00000006u, 0x000000bfu, 0x00000001u, 0x00000004u, 0x000000beu, - 0x0003003eu, 0x000000bbu, 0x000000bfu, 0x0004003du, 0x00000006u, 0x000000c1u, 0x00000080u, 0x0004003du, - 0x00000006u, 0x000000c2u, 0x000000a6u, 0x00050083u, 0x00000006u, 0x000000c3u, 0x000000c1u, 0x000000c2u, - 0x0006000cu, 0x00000006u, 0x000000c4u, 0x00000001u, 0x00000004u, 0x000000c3u, 0x0003003eu, 0x000000c0u, - 0x000000c4u, 0x0004003du, 0x00000006u, 0x000000c6u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000c7u, - 0x00000085u, 0x0004003du, 0x00000006u, 0x000000c8u, 0x00000090u, 0x0007000cu, 0x00000006u, 0x000000c9u, - 0x00000001u, 0x00000025u, 0x000000c7u, 0x000000c8u, 0x0004003du, 0x00000006u, 0x000000cau, 0x0000009bu, - 0x0004003du, 0x00000006u, 0x000000cbu, 0x000000a6u, 0x0007000cu, 0x00000006u, 0x000000ccu, 0x00000001u, - 0x00000025u, 0x000000cau, 0x000000cbu, 0x0007000cu, 0x00000006u, 0x000000cdu, 0x00000001u, 0x00000025u, - 0x000000c9u, 0x000000ccu, 0x0007000cu, 0x00000006u, 0x000000ceu, 0x00000001u, 0x00000025u, 0x000000c6u, - 0x000000cdu, 0x0003003eu, 0x000000c5u, 0x000000ceu, 0x0004003du, 0x00000006u, 0x000000d0u, 0x00000080u, - 0x0004003du, 0x00000006u, 0x000000d1u, 0x00000085u, 0x0004003du, 0x00000006u, 0x000000d2u, 0x00000090u, - 0x0007000cu, 0x00000006u, 0x000000d3u, 0x00000001u, 0x00000028u, 0x000000d1u, 0x000000d2u, 0x0004003du, - 0x00000006u, 0x000000d4u, 0x0000009bu, 0x0004003du, 0x00000006u, 0x000000d5u, 0x000000a6u, 0x0007000cu, - 0x00000006u, 0x000000d6u, 0x00000001u, 0x00000028u, 0x000000d4u, 0x000000d5u, 0x0007000cu, 0x00000006u, - 0x000000d7u, 0x00000001u, 0x00000028u, 0x000000d3u, 0x000000d6u, 0x0007000cu, 0x00000006u, 0x000000d8u, - 0x00000001u, 0x00000028u, 0x000000d0u, 0x000000d7u, 0x0003003eu, 0x000000cfu, 0x000000d8u, 0x0004003du, - 0x00000006u, 0x000000dau, 0x000000cfu, 0x0004003du, 0x00000006u, 0x000000dbu, 0x000000c5u, 0x00050083u, - 0x00000006u, 0x000000dcu, 0x000000dau, 0x000000dbu, 0x0003003eu, 0x000000d9u, 0x000000dcu, 0x0004003du, - 0x00000006u, 0x000000dfu, 0x000000d9u, 0x00050085u, 0x00000006u, 0x000000e1u, 0x000000dfu, 0x000000e0u, - 0x0007000cu, 0x00000006u, 0x000000e2u, 0x00000001u, 0x00000028u, 0x000000deu, 0x000000e1u, 0x0003003eu, - 0x000000ddu, 0x000000e2u, 0x0004003du, 0x00000006u, 0x000000e4u, 0x000000b1u, 0x0004003du, 0x00000006u, - 0x000000e5u, 0x000000b6u, 0x0007000cu, 0x00000006u, 0x000000e6u, 0x00000001u, 0x00000028u, 0x000000e4u, - 0x000000e5u, 0x0003003eu, 0x000000e3u, 0x000000e6u, 0x0004003du, 0x00000006u, 0x000000e8u, 0x000000bbu, - 0x0004003du, 0x00000006u, 0x000000e9u, 0x000000c0u, 0x0007000cu, 0x00000006u, 0x000000eau, 0x00000001u, - 0x00000028u, 0x000000e8u, 0x000000e9u, 0x0003003eu, 0x000000e7u, 0x000000eau, 0x0004003du, 0x00000006u, - 0x000000ecu, 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000edu, 0x000000e7u, 0x0007000cu, 0x00000006u, - 0x000000eeu, 0x00000001u, 0x00000028u, 0x000000ecu, 0x000000edu, 0x0003003eu, 0x000000ebu, 0x000000eeu, - 0x0004003du, 0x00000006u, 0x000000efu, 0x000000ebu, 0x0004003du, 0x00000006u, 0x000000f0u, 0x000000ddu, - 0x000500bcu, 0x000000f1u, 0x000000f2u, 0x000000efu, 0x000000f0u, 0x000300f7u, 0x000000f4u, 0x00000000u, - 0x000400fau, 0x000000f2u, 0x000000f3u, 0x000000f4u, 0x000200f8u, 0x000000f3u, 0x0004003du, 0x0000002fu, - 0x000000f7u, 0x0000007cu, 0x0003003eu, 0x000000f6u, 0x000000f7u, 0x000100fdu, 0x000200f8u, 0x000000f4u, - 0x0004003du, 0x00000006u, 0x000000fbu, 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000fcu, 0x000000e7u, - 0x000500beu, 0x000000f1u, 0x000000fdu, 0x000000fbu, 0x000000fcu, 0x0003003eu, 0x000000fau, 0x000000fdu, - 0x0004003du, 0x000000f1u, 0x000000ffu, 0x000000fau, 0x000300f7u, 0x00000102u, 0x00000000u, 0x000400fau, - 0x000000ffu, 0x00000101u, 0x00000106u, 0x000200f8u, 0x00000101u, 0x00050041u, 0x00000020u, 0x00000103u, - 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x00000104u, 0x00000103u, 0x00050050u, 0x0000000du, - 0x00000105u, 0x0000002cu, 0x00000104u, 0x0003003eu, 0x00000100u, 0x00000105u, 0x000200f9u, 0x00000102u, - 0x000200f8u, 0x00000106u, 0x00050041u, 0x00000020u, 0x00000107u, 0x00000062u, 0x00000029u, 0x0004003du, - 0x00000006u, 0x00000108u, 0x00000107u, 0x00050050u, 0x0000000du, 0x00000109u, 0x00000108u, 0x0000002cu, - 0x0003003eu, 0x00000100u, 0x00000109u, 0x000200f9u, 0x00000102u, 0x000200f8u, 0x00000102u, 0x0004003du, - 0x0000000du, 0x0000010au, 0x00000100u, 0x0003003eu, 0x000000feu, 0x0000010au, 0x0004003du, 0x000000f1u, - 0x0000010cu, 0x000000fau, 0x000300f7u, 0x0000010fu, 0x00000000u, 0x000400fau, 0x0000010cu, 0x0000010eu, - 0x00000116u, 0x000200f8u, 0x0000010eu, 0x0004003du, 0x00000006u, 0x00000110u, 0x000000b1u, 0x0004003du, - 0x00000006u, 0x00000111u, 0x000000b6u, 0x000500beu, 0x000000f1u, 0x00000112u, 0x00000110u, 0x00000111u, - 0x000600a9u, 0x00000006u, 0x00000114u, 0x00000112u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, - 0x00000115u, 0x00000114u, 0x0000002cu, 0x0003003eu, 0x0000010du, 0x00000115u, 0x000200f9u, 0x0000010fu, - 0x000200f8u, 0x00000116u, 0x0004003du, 0x00000006u, 0x00000117u, 0x000000bbu, 0x0004003du, 0x00000006u, - 0x00000118u, 0x000000c0u, 0x000500beu, 0x000000f1u, 0x00000119u, 0x00000117u, 0x00000118u, 0x000600a9u, - 0x00000006u, 0x0000011au, 0x00000119u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, 0x0000011bu, - 0x0000002cu, 0x0000011au, 0x0003003eu, 0x0000010du, 0x0000011bu, 0x000200f9u, 0x0000010fu, 0x000200f8u, - 0x0000010fu, 0x0004003du, 0x0000000du, 0x0000011cu, 0x0000010du, 0x0003003eu, 0x0000010bu, 0x0000011cu, - 0x0003003eu, 0x0000011du, 0x0000002cu, 0x0003003eu, 0x0000011eu, 0x0000002cu, 0x0003003eu, 0x00000120u, - 0x00000068u, 0x000200f9u, 0x00000121u, 0x000200f8u, 0x00000121u, 0x000400f6u, 0x00000123u, 0x00000124u, - 0x00000000u, 0x000200f9u, 0x00000125u, 0x000200f8u, 0x00000125u, 0x0004003du, 0x00000067u, 0x00000126u, - 0x00000120u, 0x000500b3u, 0x000000f1u, 0x00000128u, 0x00000126u, 0x00000127u, 0x000400fau, 0x00000128u, - 0x00000122u, 0x00000123u, 0x000200f8u, 0x00000122u, 0x0004003du, 0x0000000du, 0x0000012au, 0x000000feu, - 0x0004003du, 0x00000067u, 0x0000012bu, 0x00000120u, 0x0004006fu, 0x00000006u, 0x0000012cu, 0x0000012bu, - 0x0005008eu, 0x0000000du, 0x0000012du, 0x0000012au, 0x0000012cu, 0x0003003eu, 0x00000129u, 0x0000012du, - 0x0004003du, 0x000000f1u, 0x0000012fu, 0x000000fau, 0x000300f7u, 0x00000132u, 0x00000000u, 0x000400fau, - 0x0000012fu, 0x00000131u, 0x0000013au, 0x000200f8u, 0x00000131u, 0x0004003du, 0x0000000du, 0x00000133u, - 0x00000070u, 0x0004003du, 0x0000000du, 0x00000134u, 0x00000129u, 0x00050083u, 0x0000000du, 0x00000135u, - 0x00000133u, 0x00000134u, 0x0003003eu, 0x00000136u, 0x00000135u, 0x0004003du, 0x0000000du, 0x00000138u, - 0x00000062u, 0x0003003eu, 0x00000137u, 0x00000138u, 0x00060039u, 0x00000006u, 0x00000139u, 0x00000012u, - 0x00000136u, 0x00000137u, 0x0003003eu, 0x00000130u, 0x00000139u, 0x000200f9u, 0x00000132u, 0x000200f8u, - 0x0000013au, 0x0004003du, 0x0000000du, 0x0000013bu, 0x00000070u, 0x0004003du, 0x0000000du, 0x0000013cu, - 0x00000129u, 0x00050083u, 0x0000000du, 0x0000013du, 0x0000013bu, 0x0000013cu, 0x0003003eu, 0x0000013eu, - 0x0000013du, 0x0004003du, 0x0000000du, 0x00000140u, 0x00000062u, 0x0003003eu, 0x0000013fu, 0x00000140u, - 0x00060039u, 0x00000006u, 0x00000141u, 0x00000016u, 0x0000013eu, 0x0000013fu, 0x0003003eu, 0x00000130u, - 0x00000141u, 0x000200f9u, 0x00000132u, 0x000200f8u, 0x00000132u, 0x0004003du, 0x00000006u, 0x00000142u, - 0x00000130u, 0x0003003eu, 0x0000012eu, 0x00000142u, 0x0004003du, 0x000000f1u, 0x00000144u, 0x000000fau, - 0x000300f7u, 0x00000147u, 0x00000000u, 0x000400fau, 0x00000144u, 0x00000146u, 0x0000014fu, 0x000200f8u, - 0x00000146u, 0x0004003du, 0x0000000du, 0x00000148u, 0x00000070u, 0x0004003du, 0x0000000du, 0x00000149u, - 0x00000129u, 0x00050081u, 0x0000000du, 0x0000014au, 0x00000148u, 0x00000149u, 0x0003003eu, 0x0000014bu, - 0x0000014au, 0x0004003du, 0x0000000du, 0x0000014du, 0x00000062u, 0x0003003eu, 0x0000014cu, 0x0000014du, - 0x00060039u, 0x00000006u, 0x0000014eu, 0x00000012u, 0x0000014bu, 0x0000014cu, 0x0003003eu, 0x00000145u, - 0x0000014eu, 0x000200f9u, 0x00000147u, 0x000200f8u, 0x0000014fu, 0x0004003du, 0x0000000du, 0x00000150u, - 0x00000070u, 0x0004003du, 0x0000000du, 0x00000151u, 0x00000129u, 0x00050081u, 0x0000000du, 0x00000152u, - 0x00000150u, 0x00000151u, 0x0003003eu, 0x00000153u, 0x00000152u, 0x0004003du, 0x0000000du, 0x00000155u, - 0x00000062u, 0x0003003eu, 0x00000154u, 0x00000155u, 0x00060039u, 0x00000006u, 0x00000156u, 0x00000016u, - 0x00000153u, 0x00000154u, 0x0003003eu, 0x00000145u, 0x00000156u, 0x000200f9u, 0x00000147u, 0x000200f8u, - 0x00000147u, 0x0004003du, 0x00000006u, 0x00000157u, 0x00000145u, 0x0003003eu, 0x00000143u, 0x00000157u, - 0x0004003du, 0x00000006u, 0x00000158u, 0x0000011du, 0x0004003du, 0x00000067u, 0x00000159u, 0x00000120u, - 0x00050082u, 0x00000067u, 0x0000015au, 0x00000159u, 0x00000068u, 0x0004006fu, 0x00000006u, 0x0000015bu, - 0x0000015au, 0x000500b4u, 0x000000f1u, 0x0000015cu, 0x00000158u, 0x0000015bu, 0x000300f7u, 0x0000015eu, - 0x00000000u, 0x000400fau, 0x0000015cu, 0x0000015du, 0x0000015eu, 0x000200f8u, 0x0000015du, 0x0004003du, - 0x00000006u, 0x0000015fu, 0x0000012eu, 0x0004003du, 0x00000006u, 0x00000160u, 0x000000ddu, 0x00050085u, - 0x00000006u, 0x00000162u, 0x00000160u, 0x00000161u, 0x000500bau, 0x000000f1u, 0x00000163u, 0x0000015fu, - 0x00000162u, 0x000200f9u, 0x0000015eu, 0x000200f8u, 0x0000015eu, 0x000700f5u, 0x000000f1u, 0x00000164u, - 0x0000015cu, 0x00000147u, 0x00000163u, 0x0000015du, 0x000300f7u, 0x00000166u, 0x00000000u, 0x000400fau, - 0x00000164u, 0x00000165u, 0x00000166u, 0x000200f8u, 0x00000165u, 0x0004003du, 0x00000067u, 0x00000167u, - 0x00000120u, 0x0004006fu, 0x00000006u, 0x00000168u, 0x00000167u, 0x0003003eu, 0x0000011du, 0x00000168u, - 0x000200f9u, 0x00000166u, 0x000200f8u, 0x00000166u, 0x0004003du, 0x00000006u, 0x00000169u, 0x0000011eu, - 0x0004003du, 0x00000067u, 0x0000016au, 0x00000120u, 0x00050082u, 0x00000067u, 0x0000016bu, 0x0000016au, - 0x00000068u, 0x0004006fu, 0x00000006u, 0x0000016cu, 0x0000016bu, 0x000500b4u, 0x000000f1u, 0x0000016du, - 0x00000169u, 0x0000016cu, 0x000300f7u, 0x0000016fu, 0x00000000u, 0x000400fau, 0x0000016du, 0x0000016eu, - 0x0000016fu, 0x000200f8u, 0x0000016eu, 0x0004003du, 0x00000006u, 0x00000170u, 0x00000143u, 0x0004003du, - 0x00000006u, 0x00000171u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000172u, 0x00000171u, 0x00000161u, - 0x000500bau, 0x000000f1u, 0x00000173u, 0x00000170u, 0x00000172u, 0x000200f9u, 0x0000016fu, 0x000200f8u, - 0x0000016fu, 0x000700f5u, 0x000000f1u, 0x00000174u, 0x0000016du, 0x00000166u, 0x00000173u, 0x0000016eu, - 0x000300f7u, 0x00000176u, 0x00000000u, 0x000400fau, 0x00000174u, 0x00000175u, 0x00000176u, 0x000200f8u, - 0x00000175u, 0x0004003du, 0x00000067u, 0x00000177u, 0x00000120u, 0x0004006fu, 0x00000006u, 0x00000178u, - 0x00000177u, 0x0003003eu, 0x0000011eu, 0x00000178u, 0x000200f9u, 0x00000176u, 0x000200f8u, 0x00000176u, - 0x000200f9u, 0x00000124u, 0x000200f8u, 0x00000124u, 0x0004003du, 0x00000067u, 0x00000179u, 0x00000120u, - 0x00050080u, 0x00000067u, 0x0000017au, 0x00000179u, 0x00000068u, 0x0003003eu, 0x00000120u, 0x0000017au, - 0x000200f9u, 0x00000121u, 0x000200f8u, 0x00000123u, 0x0004003du, 0x00000006u, 0x0000017cu, 0x0000011du, - 0x0004003du, 0x00000006u, 0x0000017du, 0x0000011eu, 0x00050081u, 0x00000006u, 0x0000017eu, 0x0000017cu, - 0x0000017du, 0x0003003eu, 0x0000017bu, 0x0000017eu, 0x0004003du, 0x00000006u, 0x00000180u, 0x000000ddu, - 0x0004003du, 0x00000006u, 0x00000181u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000183u, 0x00000181u, - 0x00000182u, 0x0004003du, 0x00000006u, 0x00000184u, 0x000000ebu, 0x0008000cu, 0x00000006u, 0x00000185u, - 0x00000001u, 0x00000031u, 0x00000180u, 0x00000183u, 0x00000184u, 0x0003003eu, 0x0000017fu, 0x00000185u, - 0x0004003du, 0x00000023u, 0x00000187u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000188u, 0x00000070u, - 0x00050041u, 0x00000020u, 0x00000189u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000018au, - 0x00000189u, 0x0004007fu, 0x00000006u, 0x0000018bu, 0x0000018au, 0x00050041u, 0x00000020u, 0x0000018cu, - 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000018du, 0x0000018cu, 0x0004007fu, 0x00000006u, - 0x0000018eu, 0x0000018du, 0x00050050u, 0x0000000du, 0x0000018fu, 0x0000018bu, 0x0000018eu, 0x00050081u, - 0x0000000du, 0x00000190u, 0x00000188u, 0x0000018fu, 0x00050057u, 0x0000002fu, 0x00000191u, 0x00000187u, - 0x00000190u, 0x0008004fu, 0x00000007u, 0x00000193u, 0x00000191u, 0x00000191u, 0x00000000u, 0x00000001u, - 0x00000002u, 0x0003003eu, 0x00000192u, 0x00000193u, 0x00050039u, 0x00000006u, 0x00000194u, 0x0000000bu, - 0x00000192u, 0x0003003eu, 0x00000186u, 0x00000194u, 0x0004003du, 0x00000023u, 0x00000196u, 0x00000025u, - 0x0004003du, 0x0000000du, 0x00000197u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000198u, 0x00000062u, - 0x00000029u, 0x0004003du, 0x00000006u, 0x00000199u, 0x00000198u, 0x00050041u, 0x00000020u, 0x0000019au, - 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000019bu, 0x0000019au, 0x0004007fu, 0x00000006u, - 0x0000019cu, 0x0000019bu, 0x00050050u, 0x0000000du, 0x0000019du, 0x00000199u, 0x0000019cu, 0x00050081u, - 0x0000000du, 0x0000019eu, 0x00000197u, 0x0000019du, 0x00050057u, 0x0000002fu, 0x0000019fu, 0x00000196u, - 0x0000019eu, 0x0008004fu, 0x00000007u, 0x000001a1u, 0x0000019fu, 0x0000019fu, 0x00000000u, 0x00000001u, - 0x00000002u, 0x0003003eu, 0x000001a0u, 0x000001a1u, 0x00050039u, 0x00000006u, 0x000001a2u, 0x0000000bu, - 0x000001a0u, 0x0003003eu, 0x00000195u, 0x000001a2u, 0x0004003du, 0x00000023u, 0x000001a4u, 0x00000025u, - 0x0004003du, 0x0000000du, 0x000001a5u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001a6u, 0x00000062u, - 0x00000029u, 0x0004003du, 0x00000006u, 0x000001a7u, 0x000001a6u, 0x0004007fu, 0x00000006u, 0x000001a8u, - 0x000001a7u, 0x00050041u, 0x00000020u, 0x000001a9u, 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, - 0x000001aau, 0x000001a9u, 0x00050050u, 0x0000000du, 0x000001abu, 0x000001a8u, 0x000001aau, 0x00050081u, - 0x0000000du, 0x000001acu, 0x000001a5u, 0x000001abu, 0x00050057u, 0x0000002fu, 0x000001adu, 0x000001a4u, - 0x000001acu, 0x0008004fu, 0x00000007u, 0x000001afu, 0x000001adu, 0x000001adu, 0x00000000u, 0x00000001u, - 0x00000002u, 0x0003003eu, 0x000001aeu, 0x000001afu, 0x00050039u, 0x00000006u, 0x000001b0u, 0x0000000bu, - 0x000001aeu, 0x0003003eu, 0x000001a3u, 0x000001b0u, 0x0004003du, 0x00000023u, 0x000001b2u, 0x00000025u, - 0x0004003du, 0x0000000du, 0x000001b3u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001b4u, 0x00000062u, - 0x00000029u, 0x0004003du, 0x00000006u, 0x000001b5u, 0x000001b4u, 0x00050041u, 0x00000020u, 0x000001b6u, - 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000001b7u, 0x000001b6u, 0x00050050u, 0x0000000du, - 0x000001b8u, 0x000001b5u, 0x000001b7u, 0x00050081u, 0x0000000du, 0x000001b9u, 0x000001b3u, 0x000001b8u, - 0x00050057u, 0x0000002fu, 0x000001bau, 0x000001b2u, 0x000001b9u, 0x0008004fu, 0x00000007u, 0x000001bcu, - 0x000001bau, 0x000001bau, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000001bbu, 0x000001bcu, - 0x00050039u, 0x00000006u, 0x000001bdu, 0x0000000bu, 0x000001bbu, 0x0003003eu, 0x000001b1u, 0x000001bdu, - 0x0004003du, 0x00000006u, 0x000001bfu, 0x0000011du, 0x0004003du, 0x00000006u, 0x000001c0u, 0x0000011eu, - 0x00050083u, 0x00000006u, 0x000001c1u, 0x000001bfu, 0x000001c0u, 0x0006000cu, 0x00000006u, 0x000001c2u, - 0x00000001u, 0x00000004u, 0x000001c1u, 0x0004003du, 0x00000006u, 0x000001c3u, 0x0000017bu, 0x0007000cu, - 0x00000006u, 0x000001c4u, 0x00000001u, 0x00000028u, 0x000001c3u, 0x00000063u, 0x00050088u, 0x00000006u, - 0x000001c5u, 0x000001c2u, 0x000001c4u, 0x0008000cu, 0x00000006u, 0x000001c6u, 0x00000001u, 0x0000002bu, - 0x000001c5u, 0x0000002cu, 0x00000063u, 0x0003003eu, 0x000001beu, 0x000001c6u, 0x0004003du, 0x00000006u, - 0x000001c8u, 0x000001beu, 0x0004003du, 0x00000006u, 0x000001c9u, 0x0000017bu, 0x00050085u, 0x00000006u, - 0x000001cbu, 0x000001c9u, 0x000001cau, 0x00050081u, 0x00000006u, 0x000001ccu, 0x00000063u, 0x000001cbu, - 0x00050088u, 0x00000006u, 0x000001cdu, 0x000001c8u, 0x000001ccu, 0x0003003eu, 0x000001c7u, 0x000001cdu, - 0x0004003du, 0x000000f1u, 0x000001cfu, 0x000000fau, 0x000300f7u, 0x000001d2u, 0x00000000u, 0x000400fau, - 0x000001cfu, 0x000001d1u, 0x000001d7u, 0x000200f8u, 0x000001d1u, 0x0004003du, 0x00000006u, 0x000001d3u, - 0x00000186u, 0x0004003du, 0x00000006u, 0x000001d4u, 0x00000195u, 0x00050083u, 0x00000006u, 0x000001d5u, - 0x000001d3u, 0x000001d4u, 0x0006000cu, 0x00000006u, 0x000001d6u, 0x00000001u, 0x00000004u, 0x000001d5u, - 0x0003003eu, 0x000001d0u, 0x000001d6u, 0x000200f9u, 0x000001d2u, 0x000200f8u, 0x000001d7u, 0x0004003du, - 0x00000006u, 0x000001d8u, 0x00000186u, 0x0004003du, 0x00000006u, 0x000001d9u, 0x000001a3u, 0x00050083u, - 0x00000006u, 0x000001dau, 0x000001d8u, 0x000001d9u, 0x0006000cu, 0x00000006u, 0x000001dbu, 0x00000001u, - 0x00000004u, 0x000001dau, 0x0003003eu, 0x000001d0u, 0x000001dbu, 0x000200f9u, 0x000001d2u, 0x000200f8u, - 0x000001d2u, 0x0004003du, 0x00000006u, 0x000001dcu, 0x000001d0u, 0x0003003eu, 0x000001ceu, 0x000001dcu, - 0x0004003du, 0x000000f1u, 0x000001deu, 0x000000fau, 0x000300f7u, 0x000001e1u, 0x00000000u, 0x000400fau, - 0x000001deu, 0x000001e0u, 0x000001e6u, 0x000200f8u, 0x000001e0u, 0x0004003du, 0x00000006u, 0x000001e2u, - 0x000001a3u, 0x0004003du, 0x00000006u, 0x000001e3u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x000001e4u, - 0x000001e2u, 0x000001e3u, 0x0006000cu, 0x00000006u, 0x000001e5u, 0x00000001u, 0x00000004u, 0x000001e4u, - 0x0003003eu, 0x000001dfu, 0x000001e5u, 0x000200f9u, 0x000001e1u, 0x000200f8u, 0x000001e6u, 0x0004003du, - 0x00000006u, 0x000001e7u, 0x00000195u, 0x0004003du, 0x00000006u, 0x000001e8u, 0x000001b1u, 0x00050083u, - 0x00000006u, 0x000001e9u, 0x000001e7u, 0x000001e8u, 0x0006000cu, 0x00000006u, 0x000001eau, 0x00000001u, - 0x00000004u, 0x000001e9u, 0x0003003eu, 0x000001dfu, 0x000001eau, 0x000200f9u, 0x000001e1u, 0x000200f8u, - 0x000001e1u, 0x0004003du, 0x00000006u, 0x000001ebu, 0x000001dfu, 0x0003003eu, 0x000001ddu, 0x000001ebu, - 0x0004003du, 0x00000006u, 0x000001edu, 0x000001ceu, 0x0004003du, 0x00000006u, 0x000001eeu, 0x000001ddu, - 0x00050083u, 0x00000006u, 0x000001efu, 0x000001edu, 0x000001eeu, 0x0006000cu, 0x00000006u, 0x000001f0u, - 0x00000001u, 0x00000004u, 0x000001efu, 0x0003003eu, 0x000001ecu, 0x000001f0u, 0x0004003du, 0x00000006u, - 0x000001f2u, 0x000000ddu, 0x0004003du, 0x00000006u, 0x000001f3u, 0x000000ddu, 0x00050085u, 0x00000006u, - 0x000001f4u, 0x000001f3u, 0x00000182u, 0x0004003du, 0x00000006u, 0x000001f5u, 0x000001ecu, 0x0008000cu, - 0x00000006u, 0x000001f6u, 0x00000001u, 0x00000031u, 0x000001f2u, 0x000001f4u, 0x000001f5u, 0x0003003eu, - 0x000001f1u, 0x000001f6u, 0x0004003du, 0x00000006u, 0x000001f9u, 0x000001f1u, 0x00050085u, 0x00000006u, - 0x000001fau, 0x000001f8u, 0x000001f9u, 0x0004003du, 0x00000006u, 0x000001fbu, 0x0000017bu, 0x00050088u, - 0x00000006u, 0x000001fdu, 0x000001fbu, 0x000001fcu, 0x0008000cu, 0x00000006u, 0x000001feu, 0x00000001u, - 0x0000002bu, 0x000001fdu, 0x0000002cu, 0x00000063u, 0x00050085u, 0x00000006u, 0x000001ffu, 0x000001fau, - 0x000001feu, 0x0003003eu, 0x000001f7u, 0x000001ffu, 0x0004003du, 0x00000006u, 0x00000201u, 0x00000186u, - 0x0004003du, 0x00000006u, 0x00000202u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x00000203u, 0x00000201u, - 0x00000202u, 0x0006000cu, 0x00000006u, 0x00000204u, 0x00000001u, 0x00000004u, 0x00000203u, 0x0004003du, - 0x00000006u, 0x00000205u, 0x00000195u, 0x0004003du, 0x00000006u, 0x00000206u, 0x000001a3u, 0x00050083u, - 0x00000006u, 0x00000207u, 0x00000205u, 0x00000206u, 0x0006000cu, 0x00000006u, 0x00000208u, 0x00000001u, - 0x00000004u, 0x00000207u, 0x0007000cu, 0x00000006u, 0x00000209u, 0x00000001u, 0x00000028u, 0x00000204u, - 0x00000208u, 0x0003003eu, 0x00000200u, 0x00000209u, 0x0004003du, 0x00000006u, 0x0000020cu, 0x000000ddu, - 0x0004003du, 0x00000006u, 0x0000020du, 0x000000ddu, 0x00050085u, 0x00000006u, 0x0000020fu, 0x0000020du, - 0x0000020eu, 0x0004003du, 0x00000006u, 0x00000210u, 0x00000200u, 0x0008000cu, 0x00000006u, 0x00000211u, - 0x00000001u, 0x00000031u, 0x0000020cu, 0x0000020fu, 0x00000210u, 0x00050085u, 0x00000006u, 0x00000212u, - 0x0000020bu, 0x00000211u, 0x00050083u, 0x00000006u, 0x00000213u, 0x00000063u, 0x00000212u, 0x0003003eu, - 0x0000020au, 0x00000213u, 0x0004003du, 0x00000006u, 0x00000215u, 0x000001f7u, 0x0004003du, 0x00000006u, - 0x00000216u, 0x000001c7u, 0x00050085u, 0x00000006u, 0x00000217u, 0x00000215u, 0x00000216u, 0x0004003du, - 0x00000006u, 0x00000218u, 0x0000017fu, 0x00050085u, 0x00000006u, 0x00000219u, 0x00000217u, 0x00000218u, - 0x0004003du, 0x00000006u, 0x0000021au, 0x0000020au, 0x00050085u, 0x00000006u, 0x0000021bu, 0x00000219u, - 0x0000021au, 0x0003003eu, 0x00000214u, 0x0000021bu, 0x0004003du, 0x00000006u, 0x0000021du, 0x00000186u, - 0x0004003du, 0x00000006u, 0x0000021eu, 0x000001b1u, 0x00050083u, 0x00000006u, 0x0000021fu, 0x0000021du, - 0x0000021eu, 0x0006000cu, 0x00000006u, 0x00000220u, 0x00000001u, 0x00000004u, 0x0000021fu, 0x0004003du, - 0x00000006u, 0x00000221u, 0x00000195u, 0x0004003du, 0x00000006u, 0x00000222u, 0x000001a3u, 0x00050083u, - 0x00000006u, 0x00000223u, 0x00000221u, 0x00000222u, 0x0006000cu, 0x00000006u, 0x00000224u, 0x00000001u, - 0x00000004u, 0x00000223u, 0x00050083u, 0x00000006u, 0x00000225u, 0x00000220u, 0x00000224u, 0x0006000cu, - 0x00000006u, 0x00000226u, 0x00000001u, 0x00000004u, 0x00000225u, 0x0003003eu, 0x0000021cu, 0x00000226u, - 0x0004003du, 0x00000006u, 0x00000228u, 0x000000ddu, 0x0004003du, 0x00000006u, 0x00000229u, 0x000000ddu, - 0x00050085u, 0x00000006u, 0x0000022au, 0x00000229u, 0x00000182u, 0x0004003du, 0x00000006u, 0x0000022bu, - 0x0000021cu, 0x0008000cu, 0x00000006u, 0x0000022cu, 0x00000001u, 0x00000031u, 0x00000228u, 0x0000022au, - 0x0000022bu, 0x0003003eu, 0x00000227u, 0x0000022cu, 0x0004003du, 0x00000006u, 0x0000022fu, 0x00000227u, - 0x00050085u, 0x00000006u, 0x00000230u, 0x0000022eu, 0x0000022fu, 0x0004003du, 0x00000006u, 0x00000231u, - 0x0000017fu, 0x00050085u, 0x00000006u, 0x00000232u, 0x00000230u, 0x00000231u, 0x0004003du, 0x00000006u, - 0x00000233u, 0x0000020au, 0x00050085u, 0x00000006u, 0x00000234u, 0x00000232u, 0x00000233u, 0x0003003eu, - 0x0000022du, 0x00000234u, 0x0004003du, 0x00000006u, 0x00000236u, 0x00000214u, 0x000500bcu, 0x000000f1u, - 0x00000238u, 0x00000236u, 0x00000237u, 0x0004003du, 0x00000006u, 0x00000239u, 0x0000022du, 0x0004003du, - 0x00000006u, 0x0000023au, 0x00000214u, 0x000600a9u, 0x00000006u, 0x0000023bu, 0x00000238u, 0x00000239u, - 0x0000023au, 0x0008000cu, 0x00000006u, 0x0000023du, 0x00000001u, 0x0000002bu, 0x0000023bu, 0x0000002cu, - 0x0000023cu, 0x0003003eu, 0x00000235u, 0x0000023du, 0x0004003du, 0x00000023u, 0x0000023fu, 0x00000025u, - 0x0004003du, 0x0000000du, 0x00000240u, 0x00000070u, 0x0004003du, 0x0000000du, 0x00000241u, 0x0000010bu, - 0x0004003du, 0x0000000du, 0x00000242u, 0x00000062u, 0x00050085u, 0x0000000du, 0x00000243u, 0x00000241u, - 0x00000242u, 0x00050081u, 0x0000000du, 0x00000244u, 0x00000240u, 0x00000243u, 0x00050057u, 0x0000002fu, - 0x00000245u, 0x0000023fu, 0x00000244u, 0x0008004fu, 0x00000007u, 0x00000246u, 0x00000245u, 0x00000245u, - 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000023eu, 0x00000246u, 0x0004003du, 0x0000002fu, - 0x00000247u, 0x0000007cu, 0x0008004fu, 0x00000007u, 0x00000248u, 0x00000247u, 0x00000247u, 0x00000000u, - 0x00000001u, 0x00000002u, 0x0004003du, 0x00000007u, 0x00000249u, 0x0000023eu, 0x0004003du, 0x00000006u, - 0x0000024au, 0x00000235u, 0x00060050u, 0x00000007u, 0x0000024bu, 0x0000024au, 0x0000024au, 0x0000024au, - 0x0008000cu, 0x00000007u, 0x0000024cu, 0x00000001u, 0x0000002eu, 0x00000248u, 0x00000249u, 0x0000024bu, - 0x00050041u, 0x00000020u, 0x0000024eu, 0x0000007cu, 0x0000024du, 0x0004003du, 0x00000006u, 0x0000024fu, - 0x0000024eu, 0x00050051u, 0x00000006u, 0x00000250u, 0x0000024cu, 0x00000000u, 0x00050051u, 0x00000006u, - 0x00000251u, 0x0000024cu, 0x00000001u, 0x00050051u, 0x00000006u, 0x00000252u, 0x0000024cu, 0x00000002u, - 0x00070050u, 0x0000002fu, 0x00000253u, 0x00000250u, 0x00000251u, 0x00000252u, 0x0000024fu, 0x0003003eu, - 0x000000f6u, 0x00000253u, 0x000100fdu, 0x00010038u, 0x00050036u, 0x00000006u, 0x0000000bu, 0x00000000u, - 0x00000009u, 0x00030037u, 0x00000008u, 0x0000000au, 0x000200f8u, 0x0000000cu, 0x0004003du, 0x00000007u, - 0x00000018u, 0x0000000au, 0x00050094u, 0x00000006u, 0x0000001du, 0x00000018u, 0x0000001cu, 0x000200feu, - 0x0000001du, 0x00010038u, 0x00050036u, 0x00000006u, 0x00000012u, 0x00000000u, 0x0000000fu, 0x00030037u, - 0x0000000eu, 0x00000010u, 0x00030037u, 0x0000000eu, 0x00000011u, 0x000200f8u, 0x00000013u, 0x0004003bu, - 0x00000020u, 0x00000021u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000031u, 0x00000007u, 0x0004003bu, - 0x00000020u, 0x00000034u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000003cu, 0x00000007u, 0x0004003du, - 0x00000023u, 0x00000026u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000027u, 0x00000010u, 0x00050041u, - 0x00000020u, 0x0000002au, 0x00000011u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000002bu, 0x0000002au, - 0x00050050u, 0x0000000du, 0x0000002du, 0x0000002bu, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000002eu, - 0x00000027u, 0x0000002du, 0x00050057u, 0x0000002fu, 0x00000030u, 0x00000026u, 0x0000002eu, 0x0008004fu, - 0x00000007u, 0x00000032u, 0x00000030u, 0x00000030u, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, - 0x00000031u, 0x00000032u, 0x00050039u, 0x00000006u, 0x00000033u, 0x0000000bu, 0x00000031u, 0x0003003eu, - 0x00000021u, 0x00000033u, 0x0004003du, 0x00000023u, 0x00000035u, 0x00000025u, 0x0004003du, 0x0000000du, - 0x00000036u, 0x00000010u, 0x00050041u, 0x00000020u, 0x00000037u, 0x00000011u, 0x00000029u, 0x0004003du, - 0x00000006u, 0x00000038u, 0x00000037u, 0x00050050u, 0x0000000du, 0x00000039u, 0x00000038u, 0x0000002cu, - 0x00050081u, 0x0000000du, 0x0000003au, 0x00000036u, 0x00000039u, 0x00050057u, 0x0000002fu, 0x0000003bu, - 0x00000035u, 0x0000003au, 0x0008004fu, 0x00000007u, 0x0000003du, 0x0000003bu, 0x0000003bu, 0x00000000u, - 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000003cu, 0x0000003du, 0x00050039u, 0x00000006u, 0x0000003eu, - 0x0000000bu, 0x0000003cu, 0x0003003eu, 0x00000034u, 0x0000003eu, 0x0004003du, 0x00000006u, 0x0000003fu, - 0x00000021u, 0x0004003du, 0x00000006u, 0x00000040u, 0x00000034u, 0x00050083u, 0x00000006u, 0x00000041u, - 0x0000003fu, 0x00000040u, 0x0006000cu, 0x00000006u, 0x00000042u, 0x00000001u, 0x00000004u, 0x00000041u, - 0x000200feu, 0x00000042u, 0x00010038u, 0x00050036u, 0x00000006u, 0x00000016u, 0x00000000u, 0x0000000fu, - 0x00030037u, 0x0000000eu, 0x00000014u, 0x00030037u, 0x0000000eu, 0x00000015u, 0x000200f8u, 0x00000017u, - 0x0004003bu, 0x00000020u, 0x00000045u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000004eu, 0x00000007u, - 0x0004003bu, 0x00000020u, 0x00000051u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000059u, 0x00000007u, - 0x0004003du, 0x00000023u, 0x00000046u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000047u, 0x00000014u, - 0x00050041u, 0x00000020u, 0x00000049u, 0x00000015u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000004au, - 0x00000049u, 0x00050050u, 0x0000000du, 0x0000004bu, 0x0000002cu, 0x0000004au, 0x00050083u, 0x0000000du, - 0x0000004cu, 0x00000047u, 0x0000004bu, 0x00050057u, 0x0000002fu, 0x0000004du, 0x00000046u, 0x0000004cu, - 0x0008004fu, 0x00000007u, 0x0000004fu, 0x0000004du, 0x0000004du, 0x00000000u, 0x00000001u, 0x00000002u, - 0x0003003eu, 0x0000004eu, 0x0000004fu, 0x00050039u, 0x00000006u, 0x00000050u, 0x0000000bu, 0x0000004eu, - 0x0003003eu, 0x00000045u, 0x00000050u, 0x0004003du, 0x00000023u, 0x00000052u, 0x00000025u, 0x0004003du, - 0x0000000du, 0x00000053u, 0x00000014u, 0x00050041u, 0x00000020u, 0x00000054u, 0x00000015u, 0x00000048u, - 0x0004003du, 0x00000006u, 0x00000055u, 0x00000054u, 0x00050050u, 0x0000000du, 0x00000056u, 0x0000002cu, - 0x00000055u, 0x00050081u, 0x0000000du, 0x00000057u, 0x00000053u, 0x00000056u, 0x00050057u, 0x0000002fu, - 0x00000058u, 0x00000052u, 0x00000057u, 0x0008004fu, 0x00000007u, 0x0000005au, 0x00000058u, 0x00000058u, - 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x00000059u, 0x0000005au, 0x00050039u, 0x00000006u, - 0x0000005bu, 0x0000000bu, 0x00000059u, 0x0003003eu, 0x00000051u, 0x0000005bu, 0x0004003du, 0x00000006u, - 0x0000005cu, 0x00000045u, 0x0004003du, 0x00000006u, 0x0000005du, 0x00000051u, 0x00050083u, 0x00000006u, - 0x0000005eu, 0x0000005cu, 0x0000005du, 0x0006000cu, 0x00000006u, 0x0000005fu, 0x00000001u, 0x00000004u, - 0x0000005eu, 0x000200feu, 0x0000005fu, 0x00010038u, + 0x00060005u, 0x00000220u, 0x67616964u, 0x6c616e6fu, 0x74746150u, 0x006e7265u, 0x00070005u, 0x00000226u, + 0x67616964u, 0x6c616e6fu, 0x746e6f43u, 0x69756e69u, 0x00007974u, 0x00070005u, 0x00000229u, 0x67616964u, + 0x6c616e6fu, 0x6c6c6146u, 0x6b636162u, 0x00000000u, 0x00040005u, 0x00000235u, 0x67696577u, 0x00007468u, + 0x00040005u, 0x0000023bu, 0x6f726361u, 0x00007373u, 0x00040047u, 0x00000025u, 0x00000021u, 0x00000000u, + 0x00040047u, 0x00000025u, 0x00000022u, 0x00000000u, 0x00030047u, 0x00000064u, 0x00000002u, 0x00050048u, + 0x00000064u, 0x00000000u, 0x00000023u, 0x00000000u, 0x00050048u, 0x00000064u, 0x00000001u, 0x00000023u, + 0x00000010u, 0x00050048u, 0x00000064u, 0x00000002u, 0x00000023u, 0x00000018u, 0x00050048u, 0x00000064u, + 0x00000003u, 0x00000023u, 0x0000001cu, 0x00040047u, 0x00000072u, 0x0000001eu, 0x00000000u, 0x00040047u, + 0x000000f6u, 0x0000001eu, 0x00000000u, 0x00020013u, 0x00000002u, 0x00030021u, 0x00000003u, 0x00000002u, + 0x00030016u, 0x00000006u, 0x00000020u, 0x00040017u, 0x00000007u, 0x00000006u, 0x00000003u, 0x00040020u, + 0x00000008u, 0x00000007u, 0x00000007u, 0x00040021u, 0x00000009u, 0x00000006u, 0x00000008u, 0x00040017u, + 0x0000000du, 0x00000006u, 0x00000002u, 0x00040020u, 0x0000000eu, 0x00000007u, 0x0000000du, 0x00050021u, + 0x0000000fu, 0x00000006u, 0x0000000eu, 0x0000000eu, 0x0004002bu, 0x00000006u, 0x00000019u, 0x3e59b3d0u, + 0x0004002bu, 0x00000006u, 0x0000001au, 0x3f371759u, 0x0004002bu, 0x00000006u, 0x0000001bu, 0x3d93dd98u, + 0x0006002cu, 0x00000007u, 0x0000001cu, 0x00000019u, 0x0000001au, 0x0000001bu, 0x00040020u, 0x00000020u, + 0x00000007u, 0x00000006u, 0x00090019u, 0x00000022u, 0x00000006u, 0x00000001u, 0x00000000u, 0x00000000u, + 0x00000000u, 0x00000001u, 0x00000000u, 0x0003001bu, 0x00000023u, 0x00000022u, 0x00040020u, 0x00000024u, + 0x00000000u, 0x00000023u, 0x0004003bu, 0x00000024u, 0x00000025u, 0x00000000u, 0x00040015u, 0x00000028u, + 0x00000020u, 0x00000000u, 0x0004002bu, 0x00000028u, 0x00000029u, 0x00000000u, 0x0004002bu, 0x00000006u, + 0x0000002cu, 0x00000000u, 0x00040017u, 0x0000002fu, 0x00000006u, 0x00000004u, 0x0004002bu, 0x00000028u, + 0x00000048u, 0x00000001u, 0x0004002bu, 0x00000006u, 0x00000063u, 0x3f800000u, 0x0006001eu, 0x00000064u, + 0x0000002fu, 0x0000000du, 0x00000006u, 0x00000006u, 0x00040020u, 0x00000065u, 0x00000009u, 0x00000064u, + 0x0004003bu, 0x00000065u, 0x00000066u, 0x00000009u, 0x00040015u, 0x00000067u, 0x00000020u, 0x00000001u, + 0x0004002bu, 0x00000067u, 0x00000068u, 0x00000001u, 0x00040020u, 0x00000069u, 0x00000009u, 0x0000000du, + 0x0005002cu, 0x0000000du, 0x0000006cu, 0x00000063u, 0x00000063u, 0x00040020u, 0x00000071u, 0x00000001u, + 0x0000000du, 0x0004003bu, 0x00000071u, 0x00000072u, 0x00000001u, 0x0004002bu, 0x00000006u, 0x00000075u, + 0x3f000000u, 0x00040020u, 0x0000007bu, 0x00000007u, 0x0000002fu, 0x0004002bu, 0x00000006u, 0x000000deu, + 0x3d3851ecu, 0x0004002bu, 0x00000006u, 0x000000e0u, 0x3da3d70au, 0x00020014u, 0x000000f1u, 0x00040020u, + 0x000000f5u, 0x00000003u, 0x0000002fu, 0x0004003bu, 0x000000f5u, 0x000000f6u, 0x00000003u, 0x00040020u, + 0x000000f9u, 0x00000007u, 0x000000f1u, 0x0004002bu, 0x00000006u, 0x00000113u, 0xbf800000u, 0x00040020u, + 0x0000011fu, 0x00000007u, 0x00000067u, 0x0004002bu, 0x00000067u, 0x00000127u, 0x00000006u, 0x0004002bu, + 0x00000006u, 0x00000161u, 0x3f266666u, 0x0004002bu, 0x00000006u, 0x00000182u, 0x40200000u, 0x0004002bu, + 0x00000006u, 0x000001cau, 0x3d6147aeu, 0x0004002bu, 0x00000006u, 0x000001f8u, 0x3ec28f5cu, 0x0004002bu, + 0x00000006u, 0x000001fcu, 0x40800000u, 0x0004002bu, 0x00000006u, 0x0000020bu, 0x3eb33333u, 0x0004002bu, + 0x00000006u, 0x0000020eu, 0x40400000u, 0x0004002bu, 0x00000006u, 0x0000022au, 0x3e23d70au, 0x0004002bu, + 0x00000006u, 0x00000239u, 0x3ed70a3du, 0x0004002bu, 0x00000028u, 0x0000024au, 0x00000003u, 0x00050036u, + 0x00000002u, 0x00000004u, 0x00000000u, 0x00000003u, 0x000200f8u, 0x00000005u, 0x0004003bu, 0x0000000eu, + 0x00000062u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000070u, 0x00000007u, 0x0004003bu, 0x0000007bu, + 0x0000007cu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000080u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x00000081u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000085u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x0000008du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000090u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x00000098u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000009bu, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x000000a3u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000a6u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x000000aeu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000b1u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000000b6u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000bbu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000000c0u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000c5u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000000cfu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000d9u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000000ddu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000e3u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000000e7u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000000ebu, 0x00000007u, 0x0004003bu, 0x000000f9u, + 0x000000fau, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x000000feu, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x00000100u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000010bu, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x0000010du, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000011du, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x0000011eu, 0x00000007u, 0x0004003bu, 0x0000011fu, 0x00000120u, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x00000129u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000012eu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000130u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000136u, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x00000137u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000013eu, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x0000013fu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000143u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000145u, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x0000014bu, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x0000014cu, 0x00000007u, 0x0004003bu, 0x0000000eu, 0x00000153u, 0x00000007u, 0x0004003bu, 0x0000000eu, + 0x00000154u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000017bu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x0000017fu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000186u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x00000192u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000195u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x000001a0u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001a3u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x000001aeu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001b1u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x000001bbu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001beu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000001c7u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001ceu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000001d0u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001ddu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000001dfu, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001ecu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x000001f1u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x000001f7u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000200u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000020au, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000214u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x0000021cu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000220u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000226u, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000229u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000235u, 0x00000007u, 0x0004003bu, 0x00000008u, + 0x0000023bu, 0x00000007u, 0x00050041u, 0x00000069u, 0x0000006au, 0x00000066u, 0x00000068u, 0x0004003du, + 0x0000000du, 0x0000006bu, 0x0000006au, 0x0007000cu, 0x0000000du, 0x0000006du, 0x00000001u, 0x00000028u, + 0x0000006bu, 0x0000006cu, 0x00050050u, 0x0000000du, 0x0000006eu, 0x00000063u, 0x00000063u, 0x00050088u, + 0x0000000du, 0x0000006fu, 0x0000006eu, 0x0000006du, 0x0003003eu, 0x00000062u, 0x0000006fu, 0x0004003du, + 0x0000000du, 0x00000073u, 0x00000072u, 0x0004003du, 0x0000000du, 0x00000074u, 0x00000062u, 0x0005008eu, + 0x0000000du, 0x00000076u, 0x00000074u, 0x00000075u, 0x0004003du, 0x0000000du, 0x00000077u, 0x00000062u, + 0x0005008eu, 0x0000000du, 0x00000078u, 0x00000077u, 0x00000075u, 0x00050083u, 0x0000000du, 0x00000079u, + 0x0000006cu, 0x00000078u, 0x0008000cu, 0x0000000du, 0x0000007au, 0x00000001u, 0x0000002bu, 0x00000073u, + 0x00000076u, 0x00000079u, 0x0003003eu, 0x00000070u, 0x0000007au, 0x0004003du, 0x00000023u, 0x0000007du, + 0x00000025u, 0x0004003du, 0x0000000du, 0x0000007eu, 0x00000070u, 0x00050057u, 0x0000002fu, 0x0000007fu, + 0x0000007du, 0x0000007eu, 0x0003003eu, 0x0000007cu, 0x0000007fu, 0x0004003du, 0x0000002fu, 0x00000082u, + 0x0000007cu, 0x0008004fu, 0x00000007u, 0x00000083u, 0x00000082u, 0x00000082u, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x00000081u, 0x00000083u, 0x00050039u, 0x00000006u, 0x00000084u, 0x0000000bu, + 0x00000081u, 0x0003003eu, 0x00000080u, 0x00000084u, 0x0004003du, 0x00000023u, 0x00000086u, 0x00000025u, + 0x0004003du, 0x0000000du, 0x00000087u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000088u, 0x00000062u, + 0x00000029u, 0x0004003du, 0x00000006u, 0x00000089u, 0x00000088u, 0x00050050u, 0x0000000du, 0x0000008au, + 0x00000089u, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000008bu, 0x00000087u, 0x0000008au, 0x00050057u, + 0x0000002fu, 0x0000008cu, 0x00000086u, 0x0000008bu, 0x0008004fu, 0x00000007u, 0x0000008eu, 0x0000008cu, + 0x0000008cu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000008du, 0x0000008eu, 0x00050039u, + 0x00000006u, 0x0000008fu, 0x0000000bu, 0x0000008du, 0x0003003eu, 0x00000085u, 0x0000008fu, 0x0004003du, + 0x00000023u, 0x00000091u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000092u, 0x00000070u, 0x00050041u, + 0x00000020u, 0x00000093u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000094u, 0x00000093u, + 0x00050050u, 0x0000000du, 0x00000095u, 0x00000094u, 0x0000002cu, 0x00050081u, 0x0000000du, 0x00000096u, + 0x00000092u, 0x00000095u, 0x00050057u, 0x0000002fu, 0x00000097u, 0x00000091u, 0x00000096u, 0x0008004fu, + 0x00000007u, 0x00000099u, 0x00000097u, 0x00000097u, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, + 0x00000098u, 0x00000099u, 0x00050039u, 0x00000006u, 0x0000009au, 0x0000000bu, 0x00000098u, 0x0003003eu, + 0x00000090u, 0x0000009au, 0x0004003du, 0x00000023u, 0x0000009cu, 0x00000025u, 0x0004003du, 0x0000000du, + 0x0000009du, 0x00000070u, 0x00050041u, 0x00000020u, 0x0000009eu, 0x00000062u, 0x00000048u, 0x0004003du, + 0x00000006u, 0x0000009fu, 0x0000009eu, 0x00050050u, 0x0000000du, 0x000000a0u, 0x0000002cu, 0x0000009fu, + 0x00050083u, 0x0000000du, 0x000000a1u, 0x0000009du, 0x000000a0u, 0x00050057u, 0x0000002fu, 0x000000a2u, + 0x0000009cu, 0x000000a1u, 0x0008004fu, 0x00000007u, 0x000000a4u, 0x000000a2u, 0x000000a2u, 0x00000000u, + 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000a3u, 0x000000a4u, 0x00050039u, 0x00000006u, 0x000000a5u, + 0x0000000bu, 0x000000a3u, 0x0003003eu, 0x0000009bu, 0x000000a5u, 0x0004003du, 0x00000023u, 0x000000a7u, + 0x00000025u, 0x0004003du, 0x0000000du, 0x000000a8u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000000a9u, + 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000000aau, 0x000000a9u, 0x00050050u, 0x0000000du, + 0x000000abu, 0x0000002cu, 0x000000aau, 0x00050081u, 0x0000000du, 0x000000acu, 0x000000a8u, 0x000000abu, + 0x00050057u, 0x0000002fu, 0x000000adu, 0x000000a7u, 0x000000acu, 0x0008004fu, 0x00000007u, 0x000000afu, + 0x000000adu, 0x000000adu, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000000aeu, 0x000000afu, + 0x00050039u, 0x00000006u, 0x000000b0u, 0x0000000bu, 0x000000aeu, 0x0003003eu, 0x000000a6u, 0x000000b0u, + 0x0004003du, 0x00000006u, 0x000000b2u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b3u, 0x00000085u, + 0x00050083u, 0x00000006u, 0x000000b4u, 0x000000b2u, 0x000000b3u, 0x0006000cu, 0x00000006u, 0x000000b5u, + 0x00000001u, 0x00000004u, 0x000000b4u, 0x0003003eu, 0x000000b1u, 0x000000b5u, 0x0004003du, 0x00000006u, + 0x000000b7u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000b8u, 0x00000090u, 0x00050083u, 0x00000006u, + 0x000000b9u, 0x000000b7u, 0x000000b8u, 0x0006000cu, 0x00000006u, 0x000000bau, 0x00000001u, 0x00000004u, + 0x000000b9u, 0x0003003eu, 0x000000b6u, 0x000000bau, 0x0004003du, 0x00000006u, 0x000000bcu, 0x00000080u, + 0x0004003du, 0x00000006u, 0x000000bdu, 0x0000009bu, 0x00050083u, 0x00000006u, 0x000000beu, 0x000000bcu, + 0x000000bdu, 0x0006000cu, 0x00000006u, 0x000000bfu, 0x00000001u, 0x00000004u, 0x000000beu, 0x0003003eu, + 0x000000bbu, 0x000000bfu, 0x0004003du, 0x00000006u, 0x000000c1u, 0x00000080u, 0x0004003du, 0x00000006u, + 0x000000c2u, 0x000000a6u, 0x00050083u, 0x00000006u, 0x000000c3u, 0x000000c1u, 0x000000c2u, 0x0006000cu, + 0x00000006u, 0x000000c4u, 0x00000001u, 0x00000004u, 0x000000c3u, 0x0003003eu, 0x000000c0u, 0x000000c4u, + 0x0004003du, 0x00000006u, 0x000000c6u, 0x00000080u, 0x0004003du, 0x00000006u, 0x000000c7u, 0x00000085u, + 0x0004003du, 0x00000006u, 0x000000c8u, 0x00000090u, 0x0007000cu, 0x00000006u, 0x000000c9u, 0x00000001u, + 0x00000025u, 0x000000c7u, 0x000000c8u, 0x0004003du, 0x00000006u, 0x000000cau, 0x0000009bu, 0x0004003du, + 0x00000006u, 0x000000cbu, 0x000000a6u, 0x0007000cu, 0x00000006u, 0x000000ccu, 0x00000001u, 0x00000025u, + 0x000000cau, 0x000000cbu, 0x0007000cu, 0x00000006u, 0x000000cdu, 0x00000001u, 0x00000025u, 0x000000c9u, + 0x000000ccu, 0x0007000cu, 0x00000006u, 0x000000ceu, 0x00000001u, 0x00000025u, 0x000000c6u, 0x000000cdu, + 0x0003003eu, 0x000000c5u, 0x000000ceu, 0x0004003du, 0x00000006u, 0x000000d0u, 0x00000080u, 0x0004003du, + 0x00000006u, 0x000000d1u, 0x00000085u, 0x0004003du, 0x00000006u, 0x000000d2u, 0x00000090u, 0x0007000cu, + 0x00000006u, 0x000000d3u, 0x00000001u, 0x00000028u, 0x000000d1u, 0x000000d2u, 0x0004003du, 0x00000006u, + 0x000000d4u, 0x0000009bu, 0x0004003du, 0x00000006u, 0x000000d5u, 0x000000a6u, 0x0007000cu, 0x00000006u, + 0x000000d6u, 0x00000001u, 0x00000028u, 0x000000d4u, 0x000000d5u, 0x0007000cu, 0x00000006u, 0x000000d7u, + 0x00000001u, 0x00000028u, 0x000000d3u, 0x000000d6u, 0x0007000cu, 0x00000006u, 0x000000d8u, 0x00000001u, + 0x00000028u, 0x000000d0u, 0x000000d7u, 0x0003003eu, 0x000000cfu, 0x000000d8u, 0x0004003du, 0x00000006u, + 0x000000dau, 0x000000cfu, 0x0004003du, 0x00000006u, 0x000000dbu, 0x000000c5u, 0x00050083u, 0x00000006u, + 0x000000dcu, 0x000000dau, 0x000000dbu, 0x0003003eu, 0x000000d9u, 0x000000dcu, 0x0004003du, 0x00000006u, + 0x000000dfu, 0x000000d9u, 0x00050085u, 0x00000006u, 0x000000e1u, 0x000000dfu, 0x000000e0u, 0x0007000cu, + 0x00000006u, 0x000000e2u, 0x00000001u, 0x00000028u, 0x000000deu, 0x000000e1u, 0x0003003eu, 0x000000ddu, + 0x000000e2u, 0x0004003du, 0x00000006u, 0x000000e4u, 0x000000b1u, 0x0004003du, 0x00000006u, 0x000000e5u, + 0x000000b6u, 0x0007000cu, 0x00000006u, 0x000000e6u, 0x00000001u, 0x00000028u, 0x000000e4u, 0x000000e5u, + 0x0003003eu, 0x000000e3u, 0x000000e6u, 0x0004003du, 0x00000006u, 0x000000e8u, 0x000000bbu, 0x0004003du, + 0x00000006u, 0x000000e9u, 0x000000c0u, 0x0007000cu, 0x00000006u, 0x000000eau, 0x00000001u, 0x00000028u, + 0x000000e8u, 0x000000e9u, 0x0003003eu, 0x000000e7u, 0x000000eau, 0x0004003du, 0x00000006u, 0x000000ecu, + 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000edu, 0x000000e7u, 0x0007000cu, 0x00000006u, 0x000000eeu, + 0x00000001u, 0x00000028u, 0x000000ecu, 0x000000edu, 0x0003003eu, 0x000000ebu, 0x000000eeu, 0x0004003du, + 0x00000006u, 0x000000efu, 0x000000ebu, 0x0004003du, 0x00000006u, 0x000000f0u, 0x000000ddu, 0x000500bcu, + 0x000000f1u, 0x000000f2u, 0x000000efu, 0x000000f0u, 0x000300f7u, 0x000000f4u, 0x00000000u, 0x000400fau, + 0x000000f2u, 0x000000f3u, 0x000000f4u, 0x000200f8u, 0x000000f3u, 0x0004003du, 0x0000002fu, 0x000000f7u, + 0x0000007cu, 0x0003003eu, 0x000000f6u, 0x000000f7u, 0x000100fdu, 0x000200f8u, 0x000000f4u, 0x0004003du, + 0x00000006u, 0x000000fbu, 0x000000e3u, 0x0004003du, 0x00000006u, 0x000000fcu, 0x000000e7u, 0x000500beu, + 0x000000f1u, 0x000000fdu, 0x000000fbu, 0x000000fcu, 0x0003003eu, 0x000000fau, 0x000000fdu, 0x0004003du, + 0x000000f1u, 0x000000ffu, 0x000000fau, 0x000300f7u, 0x00000102u, 0x00000000u, 0x000400fau, 0x000000ffu, + 0x00000101u, 0x00000106u, 0x000200f8u, 0x00000101u, 0x00050041u, 0x00000020u, 0x00000103u, 0x00000062u, + 0x00000048u, 0x0004003du, 0x00000006u, 0x00000104u, 0x00000103u, 0x00050050u, 0x0000000du, 0x00000105u, + 0x0000002cu, 0x00000104u, 0x0003003eu, 0x00000100u, 0x00000105u, 0x000200f9u, 0x00000102u, 0x000200f8u, + 0x00000106u, 0x00050041u, 0x00000020u, 0x00000107u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, + 0x00000108u, 0x00000107u, 0x00050050u, 0x0000000du, 0x00000109u, 0x00000108u, 0x0000002cu, 0x0003003eu, + 0x00000100u, 0x00000109u, 0x000200f9u, 0x00000102u, 0x000200f8u, 0x00000102u, 0x0004003du, 0x0000000du, + 0x0000010au, 0x00000100u, 0x0003003eu, 0x000000feu, 0x0000010au, 0x0004003du, 0x000000f1u, 0x0000010cu, + 0x000000fau, 0x000300f7u, 0x0000010fu, 0x00000000u, 0x000400fau, 0x0000010cu, 0x0000010eu, 0x00000116u, + 0x000200f8u, 0x0000010eu, 0x0004003du, 0x00000006u, 0x00000110u, 0x000000b1u, 0x0004003du, 0x00000006u, + 0x00000111u, 0x000000b6u, 0x000500beu, 0x000000f1u, 0x00000112u, 0x00000110u, 0x00000111u, 0x000600a9u, + 0x00000006u, 0x00000114u, 0x00000112u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, 0x00000115u, + 0x00000114u, 0x0000002cu, 0x0003003eu, 0x0000010du, 0x00000115u, 0x000200f9u, 0x0000010fu, 0x000200f8u, + 0x00000116u, 0x0004003du, 0x00000006u, 0x00000117u, 0x000000bbu, 0x0004003du, 0x00000006u, 0x00000118u, + 0x000000c0u, 0x000500beu, 0x000000f1u, 0x00000119u, 0x00000117u, 0x00000118u, 0x000600a9u, 0x00000006u, + 0x0000011au, 0x00000119u, 0x00000113u, 0x00000063u, 0x00050050u, 0x0000000du, 0x0000011bu, 0x0000002cu, + 0x0000011au, 0x0003003eu, 0x0000010du, 0x0000011bu, 0x000200f9u, 0x0000010fu, 0x000200f8u, 0x0000010fu, + 0x0004003du, 0x0000000du, 0x0000011cu, 0x0000010du, 0x0003003eu, 0x0000010bu, 0x0000011cu, 0x0003003eu, + 0x0000011du, 0x0000002cu, 0x0003003eu, 0x0000011eu, 0x0000002cu, 0x0003003eu, 0x00000120u, 0x00000068u, + 0x000200f9u, 0x00000121u, 0x000200f8u, 0x00000121u, 0x000400f6u, 0x00000123u, 0x00000124u, 0x00000000u, + 0x000200f9u, 0x00000125u, 0x000200f8u, 0x00000125u, 0x0004003du, 0x00000067u, 0x00000126u, 0x00000120u, + 0x000500b3u, 0x000000f1u, 0x00000128u, 0x00000126u, 0x00000127u, 0x000400fau, 0x00000128u, 0x00000122u, + 0x00000123u, 0x000200f8u, 0x00000122u, 0x0004003du, 0x0000000du, 0x0000012au, 0x000000feu, 0x0004003du, + 0x00000067u, 0x0000012bu, 0x00000120u, 0x0004006fu, 0x00000006u, 0x0000012cu, 0x0000012bu, 0x0005008eu, + 0x0000000du, 0x0000012du, 0x0000012au, 0x0000012cu, 0x0003003eu, 0x00000129u, 0x0000012du, 0x0004003du, + 0x000000f1u, 0x0000012fu, 0x000000fau, 0x000300f7u, 0x00000132u, 0x00000000u, 0x000400fau, 0x0000012fu, + 0x00000131u, 0x0000013au, 0x000200f8u, 0x00000131u, 0x0004003du, 0x0000000du, 0x00000133u, 0x00000070u, + 0x0004003du, 0x0000000du, 0x00000134u, 0x00000129u, 0x00050083u, 0x0000000du, 0x00000135u, 0x00000133u, + 0x00000134u, 0x0003003eu, 0x00000136u, 0x00000135u, 0x0004003du, 0x0000000du, 0x00000138u, 0x00000062u, + 0x0003003eu, 0x00000137u, 0x00000138u, 0x00060039u, 0x00000006u, 0x00000139u, 0x00000012u, 0x00000136u, + 0x00000137u, 0x0003003eu, 0x00000130u, 0x00000139u, 0x000200f9u, 0x00000132u, 0x000200f8u, 0x0000013au, + 0x0004003du, 0x0000000du, 0x0000013bu, 0x00000070u, 0x0004003du, 0x0000000du, 0x0000013cu, 0x00000129u, + 0x00050083u, 0x0000000du, 0x0000013du, 0x0000013bu, 0x0000013cu, 0x0003003eu, 0x0000013eu, 0x0000013du, + 0x0004003du, 0x0000000du, 0x00000140u, 0x00000062u, 0x0003003eu, 0x0000013fu, 0x00000140u, 0x00060039u, + 0x00000006u, 0x00000141u, 0x00000016u, 0x0000013eu, 0x0000013fu, 0x0003003eu, 0x00000130u, 0x00000141u, + 0x000200f9u, 0x00000132u, 0x000200f8u, 0x00000132u, 0x0004003du, 0x00000006u, 0x00000142u, 0x00000130u, + 0x0003003eu, 0x0000012eu, 0x00000142u, 0x0004003du, 0x000000f1u, 0x00000144u, 0x000000fau, 0x000300f7u, + 0x00000147u, 0x00000000u, 0x000400fau, 0x00000144u, 0x00000146u, 0x0000014fu, 0x000200f8u, 0x00000146u, + 0x0004003du, 0x0000000du, 0x00000148u, 0x00000070u, 0x0004003du, 0x0000000du, 0x00000149u, 0x00000129u, + 0x00050081u, 0x0000000du, 0x0000014au, 0x00000148u, 0x00000149u, 0x0003003eu, 0x0000014bu, 0x0000014au, + 0x0004003du, 0x0000000du, 0x0000014du, 0x00000062u, 0x0003003eu, 0x0000014cu, 0x0000014du, 0x00060039u, + 0x00000006u, 0x0000014eu, 0x00000012u, 0x0000014bu, 0x0000014cu, 0x0003003eu, 0x00000145u, 0x0000014eu, + 0x000200f9u, 0x00000147u, 0x000200f8u, 0x0000014fu, 0x0004003du, 0x0000000du, 0x00000150u, 0x00000070u, + 0x0004003du, 0x0000000du, 0x00000151u, 0x00000129u, 0x00050081u, 0x0000000du, 0x00000152u, 0x00000150u, + 0x00000151u, 0x0003003eu, 0x00000153u, 0x00000152u, 0x0004003du, 0x0000000du, 0x00000155u, 0x00000062u, + 0x0003003eu, 0x00000154u, 0x00000155u, 0x00060039u, 0x00000006u, 0x00000156u, 0x00000016u, 0x00000153u, + 0x00000154u, 0x0003003eu, 0x00000145u, 0x00000156u, 0x000200f9u, 0x00000147u, 0x000200f8u, 0x00000147u, + 0x0004003du, 0x00000006u, 0x00000157u, 0x00000145u, 0x0003003eu, 0x00000143u, 0x00000157u, 0x0004003du, + 0x00000006u, 0x00000158u, 0x0000011du, 0x0004003du, 0x00000067u, 0x00000159u, 0x00000120u, 0x00050082u, + 0x00000067u, 0x0000015au, 0x00000159u, 0x00000068u, 0x0004006fu, 0x00000006u, 0x0000015bu, 0x0000015au, + 0x000500b4u, 0x000000f1u, 0x0000015cu, 0x00000158u, 0x0000015bu, 0x000300f7u, 0x0000015eu, 0x00000000u, + 0x000400fau, 0x0000015cu, 0x0000015du, 0x0000015eu, 0x000200f8u, 0x0000015du, 0x0004003du, 0x00000006u, + 0x0000015fu, 0x0000012eu, 0x0004003du, 0x00000006u, 0x00000160u, 0x000000ddu, 0x00050085u, 0x00000006u, + 0x00000162u, 0x00000160u, 0x00000161u, 0x000500bau, 0x000000f1u, 0x00000163u, 0x0000015fu, 0x00000162u, + 0x000200f9u, 0x0000015eu, 0x000200f8u, 0x0000015eu, 0x000700f5u, 0x000000f1u, 0x00000164u, 0x0000015cu, + 0x00000147u, 0x00000163u, 0x0000015du, 0x000300f7u, 0x00000166u, 0x00000000u, 0x000400fau, 0x00000164u, + 0x00000165u, 0x00000166u, 0x000200f8u, 0x00000165u, 0x0004003du, 0x00000067u, 0x00000167u, 0x00000120u, + 0x0004006fu, 0x00000006u, 0x00000168u, 0x00000167u, 0x0003003eu, 0x0000011du, 0x00000168u, 0x000200f9u, + 0x00000166u, 0x000200f8u, 0x00000166u, 0x0004003du, 0x00000006u, 0x00000169u, 0x0000011eu, 0x0004003du, + 0x00000067u, 0x0000016au, 0x00000120u, 0x00050082u, 0x00000067u, 0x0000016bu, 0x0000016au, 0x00000068u, + 0x0004006fu, 0x00000006u, 0x0000016cu, 0x0000016bu, 0x000500b4u, 0x000000f1u, 0x0000016du, 0x00000169u, + 0x0000016cu, 0x000300f7u, 0x0000016fu, 0x00000000u, 0x000400fau, 0x0000016du, 0x0000016eu, 0x0000016fu, + 0x000200f8u, 0x0000016eu, 0x0004003du, 0x00000006u, 0x00000170u, 0x00000143u, 0x0004003du, 0x00000006u, + 0x00000171u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000172u, 0x00000171u, 0x00000161u, 0x000500bau, + 0x000000f1u, 0x00000173u, 0x00000170u, 0x00000172u, 0x000200f9u, 0x0000016fu, 0x000200f8u, 0x0000016fu, + 0x000700f5u, 0x000000f1u, 0x00000174u, 0x0000016du, 0x00000166u, 0x00000173u, 0x0000016eu, 0x000300f7u, + 0x00000176u, 0x00000000u, 0x000400fau, 0x00000174u, 0x00000175u, 0x00000176u, 0x000200f8u, 0x00000175u, + 0x0004003du, 0x00000067u, 0x00000177u, 0x00000120u, 0x0004006fu, 0x00000006u, 0x00000178u, 0x00000177u, + 0x0003003eu, 0x0000011eu, 0x00000178u, 0x000200f9u, 0x00000176u, 0x000200f8u, 0x00000176u, 0x000200f9u, + 0x00000124u, 0x000200f8u, 0x00000124u, 0x0004003du, 0x00000067u, 0x00000179u, 0x00000120u, 0x00050080u, + 0x00000067u, 0x0000017au, 0x00000179u, 0x00000068u, 0x0003003eu, 0x00000120u, 0x0000017au, 0x000200f9u, + 0x00000121u, 0x000200f8u, 0x00000123u, 0x0004003du, 0x00000006u, 0x0000017cu, 0x0000011du, 0x0004003du, + 0x00000006u, 0x0000017du, 0x0000011eu, 0x00050081u, 0x00000006u, 0x0000017eu, 0x0000017cu, 0x0000017du, + 0x0003003eu, 0x0000017bu, 0x0000017eu, 0x0004003du, 0x00000006u, 0x00000180u, 0x000000ddu, 0x0004003du, + 0x00000006u, 0x00000181u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000183u, 0x00000181u, 0x00000182u, + 0x0004003du, 0x00000006u, 0x00000184u, 0x000000ebu, 0x0008000cu, 0x00000006u, 0x00000185u, 0x00000001u, + 0x00000031u, 0x00000180u, 0x00000183u, 0x00000184u, 0x0003003eu, 0x0000017fu, 0x00000185u, 0x0004003du, + 0x00000023u, 0x00000187u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000188u, 0x00000070u, 0x00050041u, + 0x00000020u, 0x00000189u, 0x00000062u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000018au, 0x00000189u, + 0x0004007fu, 0x00000006u, 0x0000018bu, 0x0000018au, 0x00050041u, 0x00000020u, 0x0000018cu, 0x00000062u, + 0x00000048u, 0x0004003du, 0x00000006u, 0x0000018du, 0x0000018cu, 0x0004007fu, 0x00000006u, 0x0000018eu, + 0x0000018du, 0x00050050u, 0x0000000du, 0x0000018fu, 0x0000018bu, 0x0000018eu, 0x00050081u, 0x0000000du, + 0x00000190u, 0x00000188u, 0x0000018fu, 0x00050057u, 0x0000002fu, 0x00000191u, 0x00000187u, 0x00000190u, + 0x0008004fu, 0x00000007u, 0x00000193u, 0x00000191u, 0x00000191u, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x00000192u, 0x00000193u, 0x00050039u, 0x00000006u, 0x00000194u, 0x0000000bu, 0x00000192u, + 0x0003003eu, 0x00000186u, 0x00000194u, 0x0004003du, 0x00000023u, 0x00000196u, 0x00000025u, 0x0004003du, + 0x0000000du, 0x00000197u, 0x00000070u, 0x00050041u, 0x00000020u, 0x00000198u, 0x00000062u, 0x00000029u, + 0x0004003du, 0x00000006u, 0x00000199u, 0x00000198u, 0x00050041u, 0x00000020u, 0x0000019au, 0x00000062u, + 0x00000048u, 0x0004003du, 0x00000006u, 0x0000019bu, 0x0000019au, 0x0004007fu, 0x00000006u, 0x0000019cu, + 0x0000019bu, 0x00050050u, 0x0000000du, 0x0000019du, 0x00000199u, 0x0000019cu, 0x00050081u, 0x0000000du, + 0x0000019eu, 0x00000197u, 0x0000019du, 0x00050057u, 0x0000002fu, 0x0000019fu, 0x00000196u, 0x0000019eu, + 0x0008004fu, 0x00000007u, 0x000001a1u, 0x0000019fu, 0x0000019fu, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x000001a0u, 0x000001a1u, 0x00050039u, 0x00000006u, 0x000001a2u, 0x0000000bu, 0x000001a0u, + 0x0003003eu, 0x00000195u, 0x000001a2u, 0x0004003du, 0x00000023u, 0x000001a4u, 0x00000025u, 0x0004003du, + 0x0000000du, 0x000001a5u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001a6u, 0x00000062u, 0x00000029u, + 0x0004003du, 0x00000006u, 0x000001a7u, 0x000001a6u, 0x0004007fu, 0x00000006u, 0x000001a8u, 0x000001a7u, + 0x00050041u, 0x00000020u, 0x000001a9u, 0x00000062u, 0x00000048u, 0x0004003du, 0x00000006u, 0x000001aau, + 0x000001a9u, 0x00050050u, 0x0000000du, 0x000001abu, 0x000001a8u, 0x000001aau, 0x00050081u, 0x0000000du, + 0x000001acu, 0x000001a5u, 0x000001abu, 0x00050057u, 0x0000002fu, 0x000001adu, 0x000001a4u, 0x000001acu, + 0x0008004fu, 0x00000007u, 0x000001afu, 0x000001adu, 0x000001adu, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x000001aeu, 0x000001afu, 0x00050039u, 0x00000006u, 0x000001b0u, 0x0000000bu, 0x000001aeu, + 0x0003003eu, 0x000001a3u, 0x000001b0u, 0x0004003du, 0x00000023u, 0x000001b2u, 0x00000025u, 0x0004003du, + 0x0000000du, 0x000001b3u, 0x00000070u, 0x00050041u, 0x00000020u, 0x000001b4u, 0x00000062u, 0x00000029u, + 0x0004003du, 0x00000006u, 0x000001b5u, 0x000001b4u, 0x00050041u, 0x00000020u, 0x000001b6u, 0x00000062u, + 0x00000048u, 0x0004003du, 0x00000006u, 0x000001b7u, 0x000001b6u, 0x00050050u, 0x0000000du, 0x000001b8u, + 0x000001b5u, 0x000001b7u, 0x00050081u, 0x0000000du, 0x000001b9u, 0x000001b3u, 0x000001b8u, 0x00050057u, + 0x0000002fu, 0x000001bau, 0x000001b2u, 0x000001b9u, 0x0008004fu, 0x00000007u, 0x000001bcu, 0x000001bau, + 0x000001bau, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x000001bbu, 0x000001bcu, 0x00050039u, + 0x00000006u, 0x000001bdu, 0x0000000bu, 0x000001bbu, 0x0003003eu, 0x000001b1u, 0x000001bdu, 0x0004003du, + 0x00000006u, 0x000001bfu, 0x0000011du, 0x0004003du, 0x00000006u, 0x000001c0u, 0x0000011eu, 0x00050083u, + 0x00000006u, 0x000001c1u, 0x000001bfu, 0x000001c0u, 0x0006000cu, 0x00000006u, 0x000001c2u, 0x00000001u, + 0x00000004u, 0x000001c1u, 0x0004003du, 0x00000006u, 0x000001c3u, 0x0000017bu, 0x0007000cu, 0x00000006u, + 0x000001c4u, 0x00000001u, 0x00000028u, 0x000001c3u, 0x00000063u, 0x00050088u, 0x00000006u, 0x000001c5u, + 0x000001c2u, 0x000001c4u, 0x0008000cu, 0x00000006u, 0x000001c6u, 0x00000001u, 0x0000002bu, 0x000001c5u, + 0x0000002cu, 0x00000063u, 0x0003003eu, 0x000001beu, 0x000001c6u, 0x0004003du, 0x00000006u, 0x000001c8u, + 0x000001beu, 0x0004003du, 0x00000006u, 0x000001c9u, 0x0000017bu, 0x00050085u, 0x00000006u, 0x000001cbu, + 0x000001c9u, 0x000001cau, 0x00050081u, 0x00000006u, 0x000001ccu, 0x00000063u, 0x000001cbu, 0x00050088u, + 0x00000006u, 0x000001cdu, 0x000001c8u, 0x000001ccu, 0x0003003eu, 0x000001c7u, 0x000001cdu, 0x0004003du, + 0x000000f1u, 0x000001cfu, 0x000000fau, 0x000300f7u, 0x000001d2u, 0x00000000u, 0x000400fau, 0x000001cfu, + 0x000001d1u, 0x000001d7u, 0x000200f8u, 0x000001d1u, 0x0004003du, 0x00000006u, 0x000001d3u, 0x00000186u, + 0x0004003du, 0x00000006u, 0x000001d4u, 0x00000195u, 0x00050083u, 0x00000006u, 0x000001d5u, 0x000001d3u, + 0x000001d4u, 0x0006000cu, 0x00000006u, 0x000001d6u, 0x00000001u, 0x00000004u, 0x000001d5u, 0x0003003eu, + 0x000001d0u, 0x000001d6u, 0x000200f9u, 0x000001d2u, 0x000200f8u, 0x000001d7u, 0x0004003du, 0x00000006u, + 0x000001d8u, 0x00000186u, 0x0004003du, 0x00000006u, 0x000001d9u, 0x000001a3u, 0x00050083u, 0x00000006u, + 0x000001dau, 0x000001d8u, 0x000001d9u, 0x0006000cu, 0x00000006u, 0x000001dbu, 0x00000001u, 0x00000004u, + 0x000001dau, 0x0003003eu, 0x000001d0u, 0x000001dbu, 0x000200f9u, 0x000001d2u, 0x000200f8u, 0x000001d2u, + 0x0004003du, 0x00000006u, 0x000001dcu, 0x000001d0u, 0x0003003eu, 0x000001ceu, 0x000001dcu, 0x0004003du, + 0x000000f1u, 0x000001deu, 0x000000fau, 0x000300f7u, 0x000001e1u, 0x00000000u, 0x000400fau, 0x000001deu, + 0x000001e0u, 0x000001e6u, 0x000200f8u, 0x000001e0u, 0x0004003du, 0x00000006u, 0x000001e2u, 0x000001a3u, + 0x0004003du, 0x00000006u, 0x000001e3u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x000001e4u, 0x000001e2u, + 0x000001e3u, 0x0006000cu, 0x00000006u, 0x000001e5u, 0x00000001u, 0x00000004u, 0x000001e4u, 0x0003003eu, + 0x000001dfu, 0x000001e5u, 0x000200f9u, 0x000001e1u, 0x000200f8u, 0x000001e6u, 0x0004003du, 0x00000006u, + 0x000001e7u, 0x00000195u, 0x0004003du, 0x00000006u, 0x000001e8u, 0x000001b1u, 0x00050083u, 0x00000006u, + 0x000001e9u, 0x000001e7u, 0x000001e8u, 0x0006000cu, 0x00000006u, 0x000001eau, 0x00000001u, 0x00000004u, + 0x000001e9u, 0x0003003eu, 0x000001dfu, 0x000001eau, 0x000200f9u, 0x000001e1u, 0x000200f8u, 0x000001e1u, + 0x0004003du, 0x00000006u, 0x000001ebu, 0x000001dfu, 0x0003003eu, 0x000001ddu, 0x000001ebu, 0x0004003du, + 0x00000006u, 0x000001edu, 0x000001ceu, 0x0004003du, 0x00000006u, 0x000001eeu, 0x000001ddu, 0x00050083u, + 0x00000006u, 0x000001efu, 0x000001edu, 0x000001eeu, 0x0006000cu, 0x00000006u, 0x000001f0u, 0x00000001u, + 0x00000004u, 0x000001efu, 0x0003003eu, 0x000001ecu, 0x000001f0u, 0x0004003du, 0x00000006u, 0x000001f2u, + 0x000000ddu, 0x0004003du, 0x00000006u, 0x000001f3u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x000001f4u, + 0x000001f3u, 0x00000182u, 0x0004003du, 0x00000006u, 0x000001f5u, 0x000001ecu, 0x0008000cu, 0x00000006u, + 0x000001f6u, 0x00000001u, 0x00000031u, 0x000001f2u, 0x000001f4u, 0x000001f5u, 0x0003003eu, 0x000001f1u, + 0x000001f6u, 0x0004003du, 0x00000006u, 0x000001f9u, 0x000001f1u, 0x00050085u, 0x00000006u, 0x000001fau, + 0x000001f8u, 0x000001f9u, 0x0004003du, 0x00000006u, 0x000001fbu, 0x0000017bu, 0x00050088u, 0x00000006u, + 0x000001fdu, 0x000001fbu, 0x000001fcu, 0x0008000cu, 0x00000006u, 0x000001feu, 0x00000001u, 0x0000002bu, + 0x000001fdu, 0x0000002cu, 0x00000063u, 0x00050085u, 0x00000006u, 0x000001ffu, 0x000001fau, 0x000001feu, + 0x0003003eu, 0x000001f7u, 0x000001ffu, 0x0004003du, 0x00000006u, 0x00000201u, 0x00000186u, 0x0004003du, + 0x00000006u, 0x00000202u, 0x000001b1u, 0x00050083u, 0x00000006u, 0x00000203u, 0x00000201u, 0x00000202u, + 0x0006000cu, 0x00000006u, 0x00000204u, 0x00000001u, 0x00000004u, 0x00000203u, 0x0004003du, 0x00000006u, + 0x00000205u, 0x00000195u, 0x0004003du, 0x00000006u, 0x00000206u, 0x000001a3u, 0x00050083u, 0x00000006u, + 0x00000207u, 0x00000205u, 0x00000206u, 0x0006000cu, 0x00000006u, 0x00000208u, 0x00000001u, 0x00000004u, + 0x00000207u, 0x0007000cu, 0x00000006u, 0x00000209u, 0x00000001u, 0x00000028u, 0x00000204u, 0x00000208u, + 0x0003003eu, 0x00000200u, 0x00000209u, 0x0004003du, 0x00000006u, 0x0000020cu, 0x000000ddu, 0x0004003du, + 0x00000006u, 0x0000020du, 0x000000ddu, 0x00050085u, 0x00000006u, 0x0000020fu, 0x0000020du, 0x0000020eu, + 0x0004003du, 0x00000006u, 0x00000210u, 0x00000200u, 0x0008000cu, 0x00000006u, 0x00000211u, 0x00000001u, + 0x00000031u, 0x0000020cu, 0x0000020fu, 0x00000210u, 0x00050085u, 0x00000006u, 0x00000212u, 0x0000020bu, + 0x00000211u, 0x00050083u, 0x00000006u, 0x00000213u, 0x00000063u, 0x00000212u, 0x0003003eu, 0x0000020au, + 0x00000213u, 0x0004003du, 0x00000006u, 0x00000215u, 0x000001f7u, 0x0004003du, 0x00000006u, 0x00000216u, + 0x000001c7u, 0x00050085u, 0x00000006u, 0x00000217u, 0x00000215u, 0x00000216u, 0x0004003du, 0x00000006u, + 0x00000218u, 0x0000017fu, 0x00050085u, 0x00000006u, 0x00000219u, 0x00000217u, 0x00000218u, 0x0004003du, + 0x00000006u, 0x0000021au, 0x0000020au, 0x00050085u, 0x00000006u, 0x0000021bu, 0x00000219u, 0x0000021au, + 0x0003003eu, 0x00000214u, 0x0000021bu, 0x0004003du, 0x00000006u, 0x0000021du, 0x000000e3u, 0x0004003du, + 0x00000006u, 0x0000021eu, 0x000000e7u, 0x0007000cu, 0x00000006u, 0x0000021fu, 0x00000001u, 0x00000025u, + 0x0000021du, 0x0000021eu, 0x0003003eu, 0x0000021cu, 0x0000021fu, 0x0004003du, 0x00000006u, 0x00000221u, + 0x000000ddu, 0x0004003du, 0x00000006u, 0x00000222u, 0x000000ddu, 0x00050085u, 0x00000006u, 0x00000223u, + 0x00000222u, 0x00000182u, 0x0004003du, 0x00000006u, 0x00000224u, 0x0000021cu, 0x0008000cu, 0x00000006u, + 0x00000225u, 0x00000001u, 0x00000031u, 0x00000221u, 0x00000223u, 0x00000224u, 0x0003003eu, 0x00000220u, + 0x00000225u, 0x0004003du, 0x00000006u, 0x00000227u, 0x0000017bu, 0x0008000cu, 0x00000006u, 0x00000228u, + 0x00000001u, 0x00000031u, 0x00000063u, 0x0000020eu, 0x00000227u, 0x0003003eu, 0x00000226u, 0x00000228u, + 0x0004003du, 0x00000006u, 0x0000022bu, 0x00000220u, 0x00050085u, 0x00000006u, 0x0000022cu, 0x0000022au, + 0x0000022bu, 0x0004003du, 0x00000006u, 0x0000022du, 0x0000017fu, 0x00050085u, 0x00000006u, 0x0000022eu, + 0x0000022cu, 0x0000022du, 0x0004003du, 0x00000006u, 0x0000022fu, 0x0000020au, 0x00050085u, 0x00000006u, + 0x00000230u, 0x0000022eu, 0x0000022fu, 0x0004003du, 0x00000006u, 0x00000231u, 0x00000226u, 0x00050085u, + 0x00000006u, 0x00000232u, 0x00000230u, 0x00000231u, 0x0004003du, 0x00000006u, 0x00000233u, 0x000001f1u, + 0x00050085u, 0x00000006u, 0x00000234u, 0x00000232u, 0x00000233u, 0x0003003eu, 0x00000229u, 0x00000234u, + 0x0004003du, 0x00000006u, 0x00000236u, 0x00000214u, 0x0004003du, 0x00000006u, 0x00000237u, 0x00000229u, + 0x0007000cu, 0x00000006u, 0x00000238u, 0x00000001u, 0x00000028u, 0x00000236u, 0x00000237u, 0x0008000cu, + 0x00000006u, 0x0000023au, 0x00000001u, 0x0000002bu, 0x00000238u, 0x0000002cu, 0x00000239u, 0x0003003eu, + 0x00000235u, 0x0000023au, 0x0004003du, 0x00000023u, 0x0000023cu, 0x00000025u, 0x0004003du, 0x0000000du, + 0x0000023du, 0x00000070u, 0x0004003du, 0x0000000du, 0x0000023eu, 0x0000010bu, 0x0004003du, 0x0000000du, + 0x0000023fu, 0x00000062u, 0x00050085u, 0x0000000du, 0x00000240u, 0x0000023eu, 0x0000023fu, 0x00050081u, + 0x0000000du, 0x00000241u, 0x0000023du, 0x00000240u, 0x00050057u, 0x0000002fu, 0x00000242u, 0x0000023cu, + 0x00000241u, 0x0008004fu, 0x00000007u, 0x00000243u, 0x00000242u, 0x00000242u, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x0000023bu, 0x00000243u, 0x0004003du, 0x0000002fu, 0x00000244u, 0x0000007cu, + 0x0008004fu, 0x00000007u, 0x00000245u, 0x00000244u, 0x00000244u, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0004003du, 0x00000007u, 0x00000246u, 0x0000023bu, 0x0004003du, 0x00000006u, 0x00000247u, 0x00000235u, + 0x00060050u, 0x00000007u, 0x00000248u, 0x00000247u, 0x00000247u, 0x00000247u, 0x0008000cu, 0x00000007u, + 0x00000249u, 0x00000001u, 0x0000002eu, 0x00000245u, 0x00000246u, 0x00000248u, 0x00050041u, 0x00000020u, + 0x0000024bu, 0x0000007cu, 0x0000024au, 0x0004003du, 0x00000006u, 0x0000024cu, 0x0000024bu, 0x00050051u, + 0x00000006u, 0x0000024du, 0x00000249u, 0x00000000u, 0x00050051u, 0x00000006u, 0x0000024eu, 0x00000249u, + 0x00000001u, 0x00050051u, 0x00000006u, 0x0000024fu, 0x00000249u, 0x00000002u, 0x00070050u, 0x0000002fu, + 0x00000250u, 0x0000024du, 0x0000024eu, 0x0000024fu, 0x0000024cu, 0x0003003eu, 0x000000f6u, 0x00000250u, + 0x000100fdu, 0x00010038u, 0x00050036u, 0x00000006u, 0x0000000bu, 0x00000000u, 0x00000009u, 0x00030037u, + 0x00000008u, 0x0000000au, 0x000200f8u, 0x0000000cu, 0x0004003du, 0x00000007u, 0x00000018u, 0x0000000au, + 0x00050094u, 0x00000006u, 0x0000001du, 0x00000018u, 0x0000001cu, 0x000200feu, 0x0000001du, 0x00010038u, + 0x00050036u, 0x00000006u, 0x00000012u, 0x00000000u, 0x0000000fu, 0x00030037u, 0x0000000eu, 0x00000010u, + 0x00030037u, 0x0000000eu, 0x00000011u, 0x000200f8u, 0x00000013u, 0x0004003bu, 0x00000020u, 0x00000021u, + 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000031u, 0x00000007u, 0x0004003bu, 0x00000020u, 0x00000034u, + 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000003cu, 0x00000007u, 0x0004003du, 0x00000023u, 0x00000026u, + 0x00000025u, 0x0004003du, 0x0000000du, 0x00000027u, 0x00000010u, 0x00050041u, 0x00000020u, 0x0000002au, + 0x00000011u, 0x00000029u, 0x0004003du, 0x00000006u, 0x0000002bu, 0x0000002au, 0x00050050u, 0x0000000du, + 0x0000002du, 0x0000002bu, 0x0000002cu, 0x00050083u, 0x0000000du, 0x0000002eu, 0x00000027u, 0x0000002du, + 0x00050057u, 0x0000002fu, 0x00000030u, 0x00000026u, 0x0000002eu, 0x0008004fu, 0x00000007u, 0x00000032u, + 0x00000030u, 0x00000030u, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x00000031u, 0x00000032u, + 0x00050039u, 0x00000006u, 0x00000033u, 0x0000000bu, 0x00000031u, 0x0003003eu, 0x00000021u, 0x00000033u, + 0x0004003du, 0x00000023u, 0x00000035u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000036u, 0x00000010u, + 0x00050041u, 0x00000020u, 0x00000037u, 0x00000011u, 0x00000029u, 0x0004003du, 0x00000006u, 0x00000038u, + 0x00000037u, 0x00050050u, 0x0000000du, 0x00000039u, 0x00000038u, 0x0000002cu, 0x00050081u, 0x0000000du, + 0x0000003au, 0x00000036u, 0x00000039u, 0x00050057u, 0x0000002fu, 0x0000003bu, 0x00000035u, 0x0000003au, + 0x0008004fu, 0x00000007u, 0x0000003du, 0x0000003bu, 0x0000003bu, 0x00000000u, 0x00000001u, 0x00000002u, + 0x0003003eu, 0x0000003cu, 0x0000003du, 0x00050039u, 0x00000006u, 0x0000003eu, 0x0000000bu, 0x0000003cu, + 0x0003003eu, 0x00000034u, 0x0000003eu, 0x0004003du, 0x00000006u, 0x0000003fu, 0x00000021u, 0x0004003du, + 0x00000006u, 0x00000040u, 0x00000034u, 0x00050083u, 0x00000006u, 0x00000041u, 0x0000003fu, 0x00000040u, + 0x0006000cu, 0x00000006u, 0x00000042u, 0x00000001u, 0x00000004u, 0x00000041u, 0x000200feu, 0x00000042u, + 0x00010038u, 0x00050036u, 0x00000006u, 0x00000016u, 0x00000000u, 0x0000000fu, 0x00030037u, 0x0000000eu, + 0x00000014u, 0x00030037u, 0x0000000eu, 0x00000015u, 0x000200f8u, 0x00000017u, 0x0004003bu, 0x00000020u, + 0x00000045u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x0000004eu, 0x00000007u, 0x0004003bu, 0x00000020u, + 0x00000051u, 0x00000007u, 0x0004003bu, 0x00000008u, 0x00000059u, 0x00000007u, 0x0004003du, 0x00000023u, + 0x00000046u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000047u, 0x00000014u, 0x00050041u, 0x00000020u, + 0x00000049u, 0x00000015u, 0x00000048u, 0x0004003du, 0x00000006u, 0x0000004au, 0x00000049u, 0x00050050u, + 0x0000000du, 0x0000004bu, 0x0000002cu, 0x0000004au, 0x00050083u, 0x0000000du, 0x0000004cu, 0x00000047u, + 0x0000004bu, 0x00050057u, 0x0000002fu, 0x0000004du, 0x00000046u, 0x0000004cu, 0x0008004fu, 0x00000007u, + 0x0000004fu, 0x0000004du, 0x0000004du, 0x00000000u, 0x00000001u, 0x00000002u, 0x0003003eu, 0x0000004eu, + 0x0000004fu, 0x00050039u, 0x00000006u, 0x00000050u, 0x0000000bu, 0x0000004eu, 0x0003003eu, 0x00000045u, + 0x00000050u, 0x0004003du, 0x00000023u, 0x00000052u, 0x00000025u, 0x0004003du, 0x0000000du, 0x00000053u, + 0x00000014u, 0x00050041u, 0x00000020u, 0x00000054u, 0x00000015u, 0x00000048u, 0x0004003du, 0x00000006u, + 0x00000055u, 0x00000054u, 0x00050050u, 0x0000000du, 0x00000056u, 0x0000002cu, 0x00000055u, 0x00050081u, + 0x0000000du, 0x00000057u, 0x00000053u, 0x00000056u, 0x00050057u, 0x0000002fu, 0x00000058u, 0x00000052u, + 0x00000057u, 0x0008004fu, 0x00000007u, 0x0000005au, 0x00000058u, 0x00000058u, 0x00000000u, 0x00000001u, + 0x00000002u, 0x0003003eu, 0x00000059u, 0x0000005au, 0x00050039u, 0x00000006u, 0x0000005bu, 0x0000000bu, + 0x00000059u, 0x0003003eu, 0x00000051u, 0x0000005bu, 0x0004003du, 0x00000006u, 0x0000005cu, 0x00000045u, + 0x0004003du, 0x00000006u, 0x0000005du, 0x00000051u, 0x00050083u, 0x00000006u, 0x0000005eu, 0x0000005cu, + 0x0000005du, 0x0006000cu, 0x00000006u, 0x0000005fu, 0x00000001u, 0x00000004u, 0x0000005eu, 0x000200feu, + 0x0000005fu, 0x00010038u, }; diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index b7588ad035..491608e9e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -306,6 +306,13 @@ object SessionPrefs { prefs(context).edit().putStringSet("libraryFavorites", keys.toSet()).apply() } + fun storesTabOrderCustomized(context: Context): Boolean = + prefs(context).getBoolean("storesTabOrderCustomized", false) + + fun setStoresTabOrderCustomized(context: Context, customized: Boolean) { + prefs(context).edit().putBoolean("storesTabOrderCustomized", customized).apply() + } + fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) fun setStoresTabOrder(context: Context, order: List) { @@ -1530,7 +1537,7 @@ object SessionPrefs { } val upscalerChoices = listOf( - 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", + 2 to "Nearest", 0 to "Linear", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", 8 to "Snapdragon GSR (quality)", 7 to "NVIDIA NIS", 6 to "Sharpen only", ) @@ -1545,12 +1552,12 @@ object SessionPrefs { fun canonicalUpscaler(mode: Int): Int = when (mode) { 1 -> 0 5 -> 4 - else -> mode.takeIf { m -> upscalerChoices.any { it.first == m } } ?: 0 + else -> mode.takeIf { m -> upscalerChoices.any { it.first == m } } ?: 2 } fun upscalerHasSharpness(mode: Int): Boolean = canonicalUpscaler(mode) in 3..8 - fun upscaler(context: Context): Int = canonicalUpscaler(prefs(context).getInt("upscaler", 0)) + fun upscaler(context: Context): Int = canonicalUpscaler(prefs(context).getInt("upscaler", 2)) fun setUpscaler(context: Context, mode: Int) { prefs(context).edit().putInt("upscaler", canonicalUpscaler(mode)).apply() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b48530fbea..67b439943d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -1,16 +1,16 @@ package com.droiddeck.launcher.stores enum class Store(val id: String, val label: String, val shortLabel: String) { - GOG("gog", "GOG", "GOG"), EPIC("epic", "Epic Games", "Epic"), - AMAZON("amazon", "Amazon Games", "Amazon"), - XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "Itch.io", "Itch.io"), - GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"), - BATTLENET("battlenet", "Battle.net", "Battle.net"), - UBISOFT("ubisoft", "Ubisoft Connect", "Ubisoft"), EA("ea", "EA", "EA"), - ROCKSTAR("rockstar", "Rockstar Games", "Rockstar"); + XBOX("xbox", "Xbox", "Xbox"), + GOG("gog", "GOG", "GOG"), + ROCKSTAR("rockstar", "Rockstar Games", "Rockstar"), + ITCH("itch", "Itch.io", "Itch.io"), + UBISOFT("ubisoft", "Ubisoft Connect", "Ubisoft"), + AMAZON("amazon", "Amazon Games", "Amazon"), + BATTLENET("battlenet", "Battle.net", "Battle.net"), + GAMEJOLT("gamejolt", "Game Jolt", "Game Jolt"); val folder: String get() = if (this == ITCH) "itch" else shortLabel diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index ea747290fb..3ba8a1fb6d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -155,22 +155,35 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val padH = if (narrow) 14.dp else 22.dp val tabs = remember { androidx.compose.runtime.mutableStateListOf().apply { + val savedOrder = SessionPrefs.storesTabOrder(ctx) + if (!SessionPrefs.storesTabOrderCustomized(ctx)) { + val legacyOrder = listOf( + "gog", "epic", "amazon", "xbox", "itch", + "gamejolt", "battlenet", "ubisoft", "ea", "rockstar" + ) + if (savedOrder.isNotEmpty() && savedOrder != legacyOrder) { + SessionPrefs.setStoresTabOrderCustomized(ctx, true) + } else { + SessionPrefs.setStoresTabOrder(ctx, Store.entries.map { it.id }) + } + } addAll(arrangeStoreTabs(SessionPrefs.storesTabOrder(ctx), SessionPrefs.storesTabHidden(ctx))) } } var chip by rememberSaveable { mutableStateOf(tabs.firstOrNull { it.shown }?.store?.id ?: Store.GOG.id) } var arranging by remember { mutableStateOf(false) } val shownStores = tabs.filter { it.shown }.map { it.store } - fun commitTabs() { + fun commitTabs(markCustomized: Boolean = false) { SessionPrefs.setStoresTabOrder(ctx, tabs.map { it.store.id }) SessionPrefs.setStoresTabHidden(ctx, tabs.filterNot { it.shown }.map { it.store.id }.toSet()) + if (markCustomized) SessionPrefs.setStoresTabOrderCustomized(ctx, true) } fun shiftTab(store: Store, delta: Int) { val from = tabs.indexOfFirst { it.store == store } val to = from + delta if (from < 0 || to !in tabs.indices) return tabs.add(to, tabs.removeAt(from)) - commitTabs() + commitTabs(markCustomized = true) } fun moveTab(store: Store, to: Int) { val from = tabs.indexOfFirst { it.store == store } @@ -178,7 +191,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val target = to.coerceIn(0, tabs.lastIndex) if (target == from) return tabs.add(target, tabs.removeAt(from)) - commitTabs() + commitTabs(markCustomized = true) } fun toggleTab(store: Store) { val i = tabs.indexOfFirst { it.store == store } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 7f3eec4092..1835b6b85d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -178,7 +178,7 @@ class SessionDisplayTest { @Test fun removedFilterAliasesRetainTheirEquivalentBehavior() { assertEquals(0, SessionPrefs.canonicalUpscaler(1)) assertEquals(4, SessionPrefs.canonicalUpscaler(5)) - assertEquals(0, SessionPrefs.canonicalUpscaler(99)) + assertEquals(2, SessionPrefs.canonicalUpscaler(99)) assertFalse(SessionPrefs.upscalerHasSharpness(0)) assertFalse(SessionPrefs.upscalerHasSharpness(1)) assertFalse(SessionPrefs.upscalerHasSharpness(2)) From 08eadf7af8e517f0d338928cd1c7b52aac95fd48 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:27:26 -0500 Subject: [PATCH 05/60] feat(agent): OpenCode takes keys for Ollama Cloud and other providers, or any OpenAI-compatible server (#2741) * feat(agent): OpenCode takes keys for Ollama Cloud and other providers, or any OpenAI-compatible server * fix(agent): write OpenCode config atomically, check auth first, Done hides the keyboard * fix(agent): serialize OpenCode key saves and removals * fix(agent): restore the OpenCode config atomically when the key write fails * fix(agent): report a failed OpenCode config rollback * fix(agent): delete the OpenCode config with deleteIfExists, lead with the rollback warning --- .../droiddeck/launcher/agent/AgentHarness.kt | 135 +++++++++++++++--- .../droiddeck/launcher/agent/AgentSetup.kt | 52 +++++-- .../com/droiddeck/launcher/ui/AgentPanels.kt | 32 +++-- .../droiddeck/launcher/ui/AgentSetupView.kt | 81 +++++++---- .../droiddeck/launcher/ui/FrontEndScreen.kt | 4 +- app/src/main/res/values/strings.xml | 9 +- .../droiddeck/launcher/agent/OpenCodeTest.kt | 108 ++++++++++++-- 7 files changed, 340 insertions(+), 81 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 669a1c5503..1db8009699 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -20,13 +20,18 @@ interface AgentHarness { /** A guest command that signs in through $BROWSER. */ val signIn: List /** - * Where the user makes an API key, for a CLI whose own sign-in is a terminal prompt: [signIn] - * then only opens this page, and the key is pasted into DroidDeck and saved by [saveKey]. + * APIs the CLI reaches with a key pasted into DroidDeck, for a CLI whose own sign-in is a terminal + * prompt; empty when it signs in through [signIn]. */ - val keyPage: String? get() = null - /** Whether a key from [keyPage] is saved under [rootfs]. */ - fun hasKey(rootfs: File): Boolean = false - fun saveKey(rootfs: File, key: String) {} + val providers: List get() = emptyList() + /** Ids of the [providers] with a key saved under [rootfs]. */ + fun keys(rootfs: File): Set = emptySet() + /** + * Saves [key] for [provider]. A [Provider.custom] one also takes the [endpoint] it is served from, and + * [get] fetches a URL from the userland, with the key as a bearer token when it is not null. + */ + fun saveKey(rootfs: File, provider: Provider, key: String, endpoint: String? = null, get: (String, String?) -> String = { url, _ -> error("Cannot reach $url") }) {} + fun removeKey(rootfs: File, provider: Provider) {} /** Whether the CLI has models that need no account; [useFree] then counts as signed in. */ val free: Boolean get() = false fun useFree(rootfs: File) {} @@ -57,6 +62,9 @@ interface AgentHarness { data class Model(val id: String, val label: String) + /** An API reached with a key; [keyPage] is where the key is made, and a [custom] one is any OpenAI-compatible server. */ + data class Provider(val id: String, val name: String, val keyPage: String? = null, val custom: Boolean = false) + data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null) companion object { @@ -412,31 +420,117 @@ object OpenCode : AgentHarness { override val instructions = "root/.config/opencode/AGENTS.md" override val install = "curl -fsSL https://opencode.ai/install | bash -s -- --no-modify-path" private const val AUTH = "root/.local/share/opencode/auth.json" + private const val CONFIG = "root/.config/opencode/opencode.json" private const val FREE = "root/.config/opencode/.droiddeck-free" private const val MODELS = "root/.cache/droiddeck/opencode-models" + /** The provider id DroidDeck gives a server the user names, in opencode's config and auth. */ + private const val CUSTOM = "droiddeck" // `opencode models` lists only what the saved keys reach, so the check that runs it keeps the model list current. override val signedIn = listOf("sh", "-c", "mkdir -p /${MODELS.substringBeforeLast('/')}; $binary models --verbose > /$MODELS.$$ 2>/dev/null && mv -f /$MODELS.$$ /$MODELS; rm -f /$MODELS.$$; " + - "grep -q '\"type\"' /$AUTH 2>/dev/null || [ -e /$FREE ]") - override val keyPage = "https://opencode.ai/auth" - override val signIn = listOf("/root/.local/bin/android-open", keyPage) + "grep -q '\"type\"' /$AUTH 2>/dev/null || [ -e /$FREE ] || grep -q '\"$CUSTOM\"' /$CONFIG 2>/dev/null") + // Ids are opencode's own (models.dev), so a saved key is what `opencode auth login` would save for that provider. + override val providers = listOf( + AgentHarness.Provider("opencode", "OpenCode Zen", "https://opencode.ai/auth"), + AgentHarness.Provider("ollama-cloud", "Ollama Cloud", "https://ollama.com/settings/keys"), + AgentHarness.Provider("openrouter", "OpenRouter", "https://openrouter.ai/settings/keys"), + AgentHarness.Provider("openai", "OpenAI", "https://platform.openai.com/api-keys"), + AgentHarness.Provider("anthropic", "Anthropic", "https://console.anthropic.com/settings/keys"), + AgentHarness.Provider("google", "Gemini", "https://aistudio.google.com/apikey"), + AgentHarness.Provider(CUSTOM, "Other server", custom = true), + ) + override val signIn = listOf("/root/.local/bin/android-open", providers.first().keyPage!!) override val free = true override val plans = true override val efforts = listOf("low", "medium", "high") - override fun hasKey(rootfs: File) = runCatching { JSONObject(File(rootfs, AUTH).readText()).has("opencode") }.getOrDefault(false) + override fun keys(rootfs: File): Set { + val auth = runCatching { JSONObject(File(rootfs, AUTH).readText()) }.getOrNull() + val custom = runCatching { JSONObject(File(rootfs, CONFIG).readText()).optJSONObject("provider")?.has(CUSTOM) }.getOrNull() == true + return providers.filter { auth?.has(it.id) == true || (it.custom && custom) }.map { it.id }.toSet() + } - /** The key opencode's own `auth login` would save for OpenCode Zen. */ - override fun saveKey(rootfs: File, key: String) { - val file = File(rootfs, AUTH) - // An auth.json that cannot be read holds other providers' sign-ins too, so it is never replaced. - val auth = if (file.exists()) JSONObject(file.readText()) else JSONObject() - auth.put("opencode", JSONObject().put("type", "api").put("key", key.trim())) + /** + * Saves the key as opencode's own `auth login` would. A custom server also gets a provider in + * opencode's config with the models its `/models` lists, since opencode does not list them itself. + */ + override fun saveKey(rootfs: File, provider: AgentHarness.Provider, key: String, endpoint: String?, get: (String, String?) -> String) { + val token = key.trim().takeIf { it.isNotEmpty() } + // Both files are read before either is written, so one that cannot be read changes nothing. + val authFile = File(rootfs, AUTH) + val auth = readJson(authFile) + if (token != null) auth.put(provider.id, JSONObject().put("type", "api").put("key", token)) else auth.remove(provider.id) + if (!provider.custom) return writeJson(authFile, auth, private = true) + val base = endpoint(endpoint ?: "") + val configFile = File(rootfs, CONFIG) + val before = configFile.takeIf { it.exists() }?.readText() + val config = readJson(configFile) + val models = modelIds(get("$base/models", token)) + check(models.isNotEmpty()) { "No models at $base" } + if (!config.has("\$schema")) config.put("\$schema", "https://opencode.ai/config.json") + val all = config.optJSONObject("provider") ?: JSONObject().also { config.put("provider", it) } + all.put(CUSTOM, JSONObject() + .put("npm", "@ai-sdk/openai-compatible") + .put("name", runCatching { java.net.URI(base).host }.getOrNull() ?: provider.name) + .put("options", JSONObject().put("baseURL", base)) + .put("models", JSONObject().apply { models.forEach { put(it, JSONObject().put("name", it)) } })) + writeJson(configFile, config) + try { + writeJson(authFile, auth, private = true) + } catch (e: Exception) { + val undone = runCatching { + if (before != null) writeFile(configFile, before) else java.nio.file.Files.deleteIfExists(configFile.toPath()) + } + // First, since the setup row shows two lines of the message. + undone.exceptionOrNull()?.let { throw IllegalStateException("The server config could not be put back (${it.message}): ${e.message}", e) } + throw e + } + } + + override fun removeKey(rootfs: File, provider: AgentHarness.Provider) { + if (File(rootfs, AUTH).exists()) editJson(File(rootfs, AUTH), private = true) { it.remove(provider.id) } + if (provider.custom && File(rootfs, CONFIG).exists()) editJson(File(rootfs, CONFIG)) { it.optJSONObject("provider")?.remove(CUSTOM) } + } + + /** A server address as typed, made into the OpenAI-compatible base URL opencode calls. */ + @VisibleForTesting + internal fun endpoint(typed: String): String { + val url = typed.trim().trimEnd('/').let { if ("://" in it) it else "http://$it" } + require(url.substringAfter("://").isNotEmpty()) { "No server address" } + return if (url.substringAfter("://").contains('/')) url else "$url/v1" + } + + @VisibleForTesting + internal fun modelIds(body: String): List { + // The userland can print its own warnings ahead of the response. + val json = body.substring(body.indexOf('{').coerceAtLeast(0), body.lastIndexOf('}') + 1) + val data = runCatching { JSONObject(json).optJSONArray("data") }.getOrNull() ?: return emptyList() + return (0 until data.length()).mapNotNull { data.optJSONObject(it)?.optString("id")?.takeIf { id -> id.isNotEmpty() } }.distinct() + } + + // A file that cannot be read holds the user's other providers too, so it is never replaced. + private fun readJson(file: File) = if (file.exists()) JSONObject(file.readText()) else JSONObject() + + private fun editJson(file: File, private: Boolean = false, edit: (JSONObject) -> Unit) = + writeJson(file, readJson(file).also(edit), private) + + /** Writes beside [file] and moves it into place, so a write that stops partway leaves the old file. */ + private fun writeJson(file: File, json: JSONObject, private: Boolean = false) = writeFile(file, json.toString(2) + "\n", private) + + private fun writeFile(file: File, text: String, private: Boolean = false) { file.parentFile?.mkdirs() - file.writeText(auth.toString(2) + "\n") - file.setReadable(false, false) - file.setReadable(true, true) + val temp = File(file.parentFile, ".${file.name}.tmp") + try { + temp.writeText(text) + if (private) { + temp.setReadable(false, false) + temp.setReadable(true, true) + } + java.nio.file.Files.move(temp.toPath(), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING, java.nio.file.StandardCopyOption.ATOMIC_MOVE) + } finally { + temp.delete() + } } override fun useFree(rootfs: File) { @@ -473,7 +567,8 @@ object OpenCode : AgentHarness { runCatching { JSONObject(json.toString()) }.getOrNull()?.takeIf { it.optString("status") != "deprecated" }?.let { o -> val provider = o.optString("providerID") val label = o.optString("name").ifEmpty { current } - models += AgentHarness.Model(current, if (provider.isEmpty() || provider == "opencode") label else "$label · $provider") + val source = if (provider == "opencode" || provider == CUSTOM) "" else providers.firstOrNull { it.id == provider }?.name ?: provider + models += AgentHarness.Model(current, if (source.isEmpty()) label else "$label · $source") o.optJSONObject("limit")?.optLong("context")?.takeIf { it > 0 }?.let { windows[current] = it } } id = null diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt index a4107fa287..e917e36605 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentSetup.kt @@ -27,25 +27,52 @@ object AgentSetup { val detail = mutableStateMapOf() var runtimeInstalled by mutableStateOf(true) private set - /** The harness has a key from its [AgentHarness.keyPage] saved; signed in without one means its free models. */ - var keySaved by mutableStateOf(false) + /** Ids of the harness's [AgentHarness.providers] with a key saved; signed in without one means its free models. */ + var keys by mutableStateOf(emptySet()) private set + /** The provider and custom server picked in the key field, kept while a save is checked. */ + var provider by mutableStateOf(null) + var server by mutableStateOf("") /** Saves a pasted key for a harness that signs in with one, then checks the sign-in again. */ - fun saveKey(context: Context, key: String) = signInLocally(context) { harness, root -> harness.saveKey(root, key) } + fun saveKey(context: Context, provider: AgentHarness.Provider, key: String, endpoint: String? = null) = signInLocally(context) { harness, root -> + harness.saveKey(root, provider, key, endpoint) { url, token -> fetch(context.applicationContext, url, token) } + } + + fun removeKey(context: Context, provider: AgentHarness.Provider) = signInLocally(context) { harness, root -> harness.removeKey(root, provider) } + + /** A GET from the userland, which reaches the LAN servers the app's own cleartext policy does not. */ + private fun fetch(app: Context, url: String, token: String?): String { + // The key goes in on stdin, so it is never in a command line. + val process = AgentHost.guest(app, listOf("curl", "-fsSL", "--max-time", "20", "-H", "@-", url), connectAdb = false).start() + process.outputStream.bufferedWriter().use { if (token != null) it.write("Authorization: Bearer $token\n") } + val output = process.inputStream.bufferedReader().readText() + check(process.waitFor(30, TimeUnit.SECONDS) && process.exitValue() == 0) { output.trim().lines().lastOrNull()?.takeIf { it.isNotEmpty() } ?: "Cannot reach $url" } + return output + } fun useFree(context: Context) = signInLocally(context) { harness, root -> harness.useFree(root) } + private val signInLock = Any() + private fun signInLocally(context: Context, write: (AgentHarness, File) -> Unit) { val app = context.applicationContext val harness = AgentHost.harness set(Step.SIGN_IN, Status.WORKING) Thread({ - val result = runCatching { write(harness, LinuxRuntime.rootDir(app)) } + // Each write reads the files the one before it left, including across a save's model request. + val result = synchronized(signInLock) { runCatching { write(harness, LinuxRuntime.rootDir(app)) } } main.post { - status[Step.SIGN_IN] = Status.UNKNOWN - result.exceptionOrNull()?.let { detail[Step.SIGN_IN] = it.message ?: "failed" } - check(app) + // A failure stays on the row with the key field open, since the next check would clear it. + val error = result.exceptionOrNull() + if (error != null) { + status[Step.SIGN_IN] = Status.FAILED + detail[Step.SIGN_IN] = error.message ?: "failed" + } else { + status[Step.SIGN_IN] = Status.UNKNOWN + detail.remove(Step.SIGN_IN) + check(app) + } } }, "agent-sign-in").start() } @@ -75,7 +102,7 @@ object AgentSetup { if (!runtimeInstalled) return AgentHost.refresh(app) val harness = AgentHost.harness - keySaved = harness.hasKey(LinuxRuntime.rootDir(app)) + keys = harness.keys(LinuxRuntime.rootDir(app)) val probes = mutableListOf>>() for (step in Step.entries) if (status[step] != Status.WORKING) { when (step) { @@ -102,10 +129,15 @@ object AgentSetup { fun runsAsRoot(step: Step) = step == Step.INSTALL /** Runs [step]'s action. [CONNECTION] is the app's own pairing flow, so the caller opens it. */ - fun run(context: Context, step: Step) { + fun run(context: Context, step: Step) = run(context, step, null) + + /** Opens the page where a provider's key is made, as the sign-in of a harness that takes pasted keys. */ + fun openKeyPage(context: Context, page: String) = run(context, Step.SIGN_IN, listOf("/root/.local/bin/android-open", page)) + + private fun run(context: Context, step: Step, override: List?) { val app = context.applicationContext val harness = AgentHost.harness - val command = when (step) { + val command = override ?: when (step) { Step.CONNECTION -> return Step.INSTALL -> { listOf("sh", "-c", "set -e; export DEBIAN_FRONTEND=noninteractive; " + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index 3fc46e09b1..1029db97ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -50,6 +50,11 @@ import androidx.compose.material3.Icon import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.runtime.rememberCoroutineScope import kotlinx.coroutines.launch import com.droiddeck.launcher.agent.AgentTools @@ -416,14 +421,23 @@ private fun ToolsRow(title: String, detail: String, action: @Composable () -> Un } @Composable +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) internal fun ToolsField(value: String, onValue: (String) -> Unit, hint: String, tag: String) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - Box(Modifier.fillMaxWidth().clip(Shape12).background(pal.surfaceVariant).padding(horizontal = 12.dp, vertical = 10.dp)) { - if (value.isEmpty()) Text(hint, fontSize = 14.sp, color = pal.onSurfaceVariant, maxLines = 1) - BasicTextField( - value, onValue, singleLine = true, textStyle = TextStyle(fontSize = 14.sp, fontFamily = FontFamily.Monospace, color = colors.onSurface), - cursorBrush = SolidColor(pal.primary), modifier = Modifier.fillMaxWidth().testTag(tag), - ) - } + // The launcher's pane focus group sends a Compose text field's focus back to the last tile it remembers, + // so these fields use the EditText the rest of the launcher types into. + val view = remember { androidx.compose.foundation.relocation.BringIntoViewRequester() } + var focused by remember { mutableStateOf(false) } + val window = androidx.compose.ui.platform.LocalView.current + // An EditText's focus does not scroll its Compose parent, so the field follows the keyboard as it opens. + val keyboard = WindowInsets.ime.getBottom(androidx.compose.ui.platform.LocalDensity.current) + LaunchedEffect(focused, keyboard) { if (focused) view.bringIntoView() } + AdbTextField( + value = value, onValueChange = onValue, label = hint, keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, + modifier = Modifier.bringIntoViewRequester(view).testTag(tag), placeholder = hint, compact = true, showLabel = false, + onFocusChange = { focused = it }, + onDone = { + (window.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(window.windowToken, 0) + }, + ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt index 653e8eedb6..00d7880937 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -4,6 +4,8 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -97,21 +99,21 @@ internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { steps.forEachIndexed { index, step -> val status = AgentSetup.status[step] ?: Status.UNKNOWN val harness = AgentHost.harness - // A harness that signs in with a pasted key: the sign-in opens its key page and this field takes the key. - val keyed = step == Step.SIGN_IN && harness.keyPage != null + // A harness that signs in with pasted keys: this row picks the provider and takes its key. + val keyed = step == Step.SIGN_IN && harness.providers.isNotEmpty() var keyOpen by rememberSaveable(harness.id) { mutableStateOf(false) } val (title, hint) = labels(step, harness.name, keyed) val lab = AgentHost.lab?.takeIf { it.prepare && it.running } val detail = when { step == Step.PREPARE && lab != null -> stringResource(R.string.agent_prepare_progress, lab.permille / 10, clock(lab.etaSeconds.toLong().coerceAtLeast(0))) - keyed && status == Status.DONE && !AgentSetup.keySaved -> stringResource(R.string.agent_step_free_models) + keyed && status == Status.DONE && AgentSetup.detail[step] == null -> + harness.providers.filter { it.id in AgentSetup.keys }.joinToString(" · ") { it.name }.ifEmpty { stringResource(R.string.agent_step_free_models) } else -> AgentSetup.detail[step] ?: hint } // Shown while the sign-in is pending, so it is still there after a trip to the browser for the key. val pending = (status == Status.TODO || status == Status.FAILED) && AgentSetup.status[Step.INSTALL] == Status.DONE val showKey = keyed && (keyOpen || pending) && status != Status.WORKING - var key by remember(harness.id) { mutableStateOf("") } CheckRow( when (status) { Status.DONE -> CheckState.OK @@ -122,33 +124,17 @@ internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { ) { val blocked = (step in setOf(Step.SIGN_IN, Step.GITHUB, Step.BUILD_TOOLS) && AgentSetup.status[Step.INSTALL] != Status.DONE) || (step == Step.PREPARE && AgentSetup.status[Step.BUILD_TOOLS] != Status.DONE) - val openKey = { - keyOpen = true - AgentSetup.run(context, step) - } - if ((status == Status.TODO || status == Status.FAILED) && !blocked) { + if (keyed) { + if (pending && harness.free) SecondaryButton(stringResource(R.string.agent_action_free), compact = true) { AgentSetup.useFree(context) } + else if (status == Status.DONE) SecondaryButton(stringResource(if (keyOpen) R.string.common_hide else R.string.agent_action_add_key), compact = true) { keyOpen = !keyOpen } + } else if ((status == Status.TODO || status == Status.FAILED) && !blocked) { val label = stringResource(if (status == Status.FAILED) R.string.agent_setup_retry else action(step)) - val run = { if (step == Step.CONNECTION) pair(context) else if (keyed) openKey() else AgentSetup.run(context, step) } - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - if (keyed && harness.free) SecondaryButton(stringResource(R.string.agent_action_free), compact = true) { AgentSetup.useFree(context) } - if (step.required) PrimaryButton(label, compact = true, onClick = run) else SecondaryButton(label, compact = true, onClick = run) - } - } else if (keyed && status == Status.DONE && !AgentSetup.keySaved && !keyOpen) { - SecondaryButton(stringResource(R.string.agent_action_add_key), compact = true, onClick = openKey) + val run = { if (step == Step.CONNECTION) pair(context) else AgentSetup.run(context, step) } + if (step.required) PrimaryButton(label, compact = true, onClick = run) else SecondaryButton(label, compact = true, onClick = run) } } if (showKey) { - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), - modifier = Modifier.fillMaxWidth().padding(start = 56.dp, end = 14.dp, bottom = 10.dp), - ) { - Box(Modifier.weight(1f)) { ToolsField(key, { key = it.trim() }, stringResource(R.string.agent_key_hint), "agent-key") } - PrimaryButton(stringResource(R.string.agent_key_save), enabled = key.isNotBlank(), compact = true) { - keyOpen = false - AgentSetup.saveKey(context, key) - key = "" - } - } + KeyPanel(harness) { keyOpen = false } if (index < steps.lastIndex) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) } } @@ -167,6 +153,47 @@ internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { } } +/** Picks one of [harness]'s providers and saves its key, or a custom server's address. */ +@OptIn(ExperimentalLayoutApi::class) +@Composable +private fun KeyPanel(harness: AgentHarness, onSaved: () -> Unit) { + val context = LocalContext.current + val provider = harness.providers.firstOrNull { it.id == AgentSetup.provider } ?: harness.providers.first() + var key by remember(harness.id, provider.id) { mutableStateOf("") } + val saved = provider.id in AgentSetup.keys + Column( + verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(start = 56.dp, end = 14.dp, bottom = 12.dp), + ) { + FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + for (option in harness.providers) { + val name = if (option.id in AgentSetup.keys) "${option.name} ✓" else option.name + if (option == provider) PrimaryButton(name, compact = true) {} else SecondaryButton(name, compact = true) { AgentSetup.provider = option.id } + } + } + if (provider.custom) ToolsField(AgentSetup.server, { AgentSetup.server = it.trim() }, stringResource(R.string.agent_key_server_hint), "agent-key-server") + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { + Box(Modifier.weight(1f)) { + ToolsField( + key, { key = it.trim() }, + if (provider.custom) stringResource(R.string.agent_key_optional_hint) else stringResource(R.string.agent_key_hint, provider.name), + "agent-key", + ) + } + provider.keyPage?.let { page -> SecondaryButton(stringResource(R.string.agent_key_get), compact = true) { AgentSetup.openKeyPage(context, page) } } + if (saved) SecondaryButton(stringResource(R.string.agent_storage_remove), compact = true) { AgentSetup.removeKey(context, provider) } + PrimaryButton( + stringResource(R.string.agent_key_save), compact = true, + enabled = if (provider.custom) AgentSetup.server.isNotBlank() else key.isNotBlank(), + ) { + AgentSetup.saveKey(context, provider, key, AgentSetup.server.takeIf { provider.custom }) + key = "" + onSaved() + } + } + } +} + @Composable private fun StorageCard() { val context = LocalContext.current diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 4d252eff36..ef414c4eb0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -754,11 +754,11 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onRailSelect(key) }, a) CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) { - val agentKeyboardOpen = railSelection == "agent" && WindowInsets.ime.getBottom(androidx.compose.ui.platform.LocalDensity.current) > 0 + val agentKeyboardOpen = openTab == "agent" && WindowInsets.ime.getBottom(androidx.compose.ui.platform.LocalDensity.current) > 0 LauncherLayout( bottomNavigation && !s.dualScreen, pal.line, Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() } - .then(if (railSelection == "agent") Modifier.imePadding() else Modifier) + .then(if (openTab == "agent") Modifier.imePadding() else Modifier) .then(if (s.dualScreen) Modifier.onKeyEvent { event -> val step = dualPageStep(event.nativeKeyEvent) ?: return@onKeyEvent false if (event.type == KeyEventType.KeyDown && !processSettingsPageVisible) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 23b321ba28..9ba04b9f41 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1372,10 +1372,13 @@ Sign in Free models Add key - Paste your API key from opencode.ai/auth + Paste your %1$s key + API key, if the server needs one + Server address, like 192.168.1.20:11434 + Get key Save - Free models, or a Zen key from opencode.ai/auth - Free models · add a Zen key for the rest + Free models, or a key from your provider + Free models · add a key for more PR #%1$d Not built for this copy of DroidDeck Updated %1$s diff --git a/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt index f34e2ad07c..d05f5f09f3 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt @@ -120,18 +120,25 @@ class OpenCodeTest { assertNull(OpenCode.usage(root, session)) } + private fun provider(id: String) = OpenCode.providers.first { it.id == id } + @Test fun aSavedKeyKeepsOtherProvidersAndFreeIsItsOwnMark() { val root = Files.createTempDirectory("rootfs").toFile() - assertFalse(OpenCode.hasKey(root)) + assertEquals(emptySet(), OpenCode.keys(root)) val auth = File(root, "root/.local/share/opencode/auth.json").apply { parentFile!!.mkdirs() } - auth.writeText("""{"openai":{"type":"oauth","refresh":"r"}}""") - assertFalse(OpenCode.hasKey(root)) - OpenCode.saveKey(root, " sk-zen \n") + auth.writeText("""{"openai-codex":{"type":"oauth","refresh":"r"}}""") + assertEquals(emptySet(), OpenCode.keys(root)) + OpenCode.saveKey(root, provider("opencode"), " sk-zen \n") + OpenCode.saveKey(root, provider("ollama-cloud"), "ol-key") val saved = JSONObject(auth.readText()) - assertEquals("r", saved.getJSONObject("openai").getString("refresh")) + assertEquals("r", saved.getJSONObject("openai-codex").getString("refresh")) assertEquals("sk-zen", saved.getJSONObject("opencode").getString("key")) - assertEquals("api", saved.getJSONObject("opencode").getString("type")) - assertTrue(OpenCode.hasKey(root)) + assertEquals("api", saved.getJSONObject("ollama-cloud").getString("type")) + assertEquals("ol-key", saved.getJSONObject("ollama-cloud").getString("key")) + assertEquals(setOf("opencode", "ollama-cloud"), OpenCode.keys(root)) + OpenCode.removeKey(root, provider("opencode")) + assertEquals(setOf("ollama-cloud"), OpenCode.keys(root)) + assertTrue(JSONObject(auth.readText()).has("openai-codex")) OpenCode.useFree(root) assertTrue(File(root, "root/.config/opencode/.droiddeck-free").exists()) } @@ -140,15 +147,96 @@ class OpenCodeTest { val root = Files.createTempDirectory("rootfs").toFile() val auth = File(root, "root/.local/share/opencode/auth.json").apply { parentFile!!.mkdirs() } auth.writeText("{not json") - assertTrue(runCatching { OpenCode.saveKey(root, "sk-zen") }.isFailure) + assertTrue(runCatching { OpenCode.saveKey(root, provider("opencode"), "sk-zen") }.isFailure) assertEquals("{not json", auth.readText()) - assertFalse(OpenCode.hasKey(root)) + assertEquals(emptySet(), OpenCode.keys(root)) + val config = File(root, "root/.config/opencode/opencode.json").apply { parentFile!!.mkdirs() } + config.writeText("""{"provider":{"droiddeck":{"options":{"baseURL":"http://a/v1"}}}}""") + assertTrue(runCatching { OpenCode.saveKey(root, provider("droiddeck"), "k", "b:1") { _, _ -> """{"data":[{"id":"m"}]}""" } }.isFailure) + assertEquals("""{"provider":{"droiddeck":{"options":{"baseURL":"http://a/v1"}}}}""", config.readText()) + assertEquals(setOf("droiddeck"), OpenCode.keys(root)) } - @Test fun signInIsTheKeyOrTheFreeMark() { + @Test fun aCustomServerBecomesAProviderWithTheModelsItLists() { + val root = Files.createTempDirectory("rootfs").toFile() + val config = File(root, "root/.config/opencode/opencode.json").apply { parentFile!!.mkdirs() } + config.writeText("""{"theme":"tokyonight","provider":{"mine":{"npm":"x"}}}""") + val asked = mutableListOf>() + OpenCode.saveKey(root, provider("droiddeck"), "", "192.168.1.20:11434/") { url, key -> + asked += url to key + """{"object":"list","data":[{"id":"qwen3:8b"},{"id":"gpt-oss:20b"},{"id":"qwen3:8b"}]}""" + } + assertEquals(listOf("http://192.168.1.20:11434/v1/models" to null), asked) + val saved = JSONObject(config.readText()) + assertEquals("tokyonight", saved.getString("theme")) + assertTrue(saved.getJSONObject("provider").has("mine")) + val custom = saved.getJSONObject("provider").getJSONObject("droiddeck") + assertEquals("@ai-sdk/openai-compatible", custom.getString("npm")) + assertEquals("192.168.1.20", custom.getString("name")) + assertEquals("http://192.168.1.20:11434/v1", custom.getJSONObject("options").getString("baseURL")) + assertEquals(setOf("qwen3:8b", "gpt-oss:20b"), custom.getJSONObject("models").keys().asSequence().toSet()) + assertEquals(setOf("droiddeck"), OpenCode.keys(root)) + assertFalse(JSONObject(File(root, "root/.local/share/opencode/auth.json").readText()).has("droiddeck")) + + OpenCode.saveKey(root, provider("droiddeck"), "sk-lan", "https://llm.example/api/v1") { url, key -> asked += url to key; """{"data":[{"id":"m"}]}""" } + assertEquals("https://llm.example/api/v1/models" to "sk-lan", asked.last()) + assertEquals("sk-lan", JSONObject(File(root, "root/.local/share/opencode/auth.json").readText()).getJSONObject("droiddeck").getString("key")) + + OpenCode.removeKey(root, provider("droiddeck")) + assertEquals(emptySet(), OpenCode.keys(root)) + assertTrue(JSONObject(config.readText()).getJSONObject("provider").has("mine")) + } + + @Test fun modelIdsSkipWhatTheUserlandPrintsFirst() { + assertEquals(listOf("m"), OpenCode.modelIds("proot warning: can't sanitize binding \"/proc/self/fd/1\"\n{\"data\":[{\"id\":\"m\"}]}\n")) + assertEquals(emptyList(), OpenCode.modelIds("curl: (7) Failed to connect")) + } + + @Test fun aFailedKeyWritePutsTheServerConfigBack() { + val root = Files.createTempDirectory("rootfs").toFile() + val config = File(root, "root/.config/opencode/opencode.json").apply { parentFile!!.mkdirs() } + val previous = """{"provider":{"droiddeck":{"options":{"baseURL":"http://a/v1"}}}}""" + config.writeText(previous) + // A folder where the key file's temporary copy goes makes that write fail after the config is written. + File(root, "root/.local/share/opencode/.auth.json.tmp").mkdirs() + assertTrue(runCatching { OpenCode.saveKey(root, provider("droiddeck"), "k", "b:1") { _, _ -> """{"data":[{"id":"m"}]}""" } }.isFailure) + assertEquals(previous, config.readText()) + assertFalse(File(root, "root/.config/opencode/.opencode.json.tmp").exists()) + + config.delete() + File(root, "root/.local/share/opencode/.auth.json.tmp").mkdirs() + assertTrue(runCatching { OpenCode.saveKey(root, provider("droiddeck"), "k", "b:1") { _, _ -> """{"data":[{"id":"m"}]}""" } }.isFailure) + assertFalse(config.exists()) + } + + @Test fun aServerWithoutModelsIsNotSaved() { + val root = Files.createTempDirectory("rootfs").toFile() + val error = runCatching { OpenCode.saveKey(root, provider("droiddeck"), "", "localhost:1234") { _, _ -> """{"data":[]}""" } }.exceptionOrNull() + assertEquals("No models at http://localhost:1234/v1", error?.message) + assertFalse(File(root, "root/.config/opencode/opencode.json").exists()) + } + + @Test fun providerModelsAreLabelledWithTheProvider() { + val (models, _) = OpenCode.listModels(""" + ollama-cloud/gpt-oss:120b + { + "providerID": "ollama-cloud", + "name": "gpt-oss:120b" + } + droiddeck/qwen3:8b + { + "providerID": "droiddeck", + "name": "qwen3:8b" + } + """.trimIndent()) + assertEquals(listOf(AgentHarness.Model("ollama-cloud/gpt-oss:120b", "gpt-oss:120b · Ollama Cloud"), AgentHarness.Model("droiddeck/qwen3:8b", "qwen3:8b")), models) + } + + @Test fun signInIsAKeyTheFreeMarkOrACustomServer() { val probe = OpenCode.signedIn.last() assertTrue(probe.contains("/root/.local/share/opencode/auth.json")) assertTrue(probe.contains("[ -e /root/.config/opencode/.droiddeck-free ]")) + assertTrue(probe.contains("grep -q '\"droiddeck\"' /root/.config/opencode/opencode.json")) assertTrue(probe.contains("models --verbose > /root/.cache/droiddeck/opencode-models.$$")) assertEquals(listOf("/root/.local/bin/android-open", "https://opencode.ai/auth"), OpenCode.signIn) } From 52c76ead742cc85c41d37acd153fcede1850ee2e Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:28:49 -0500 Subject: [PATCH 06/60] chore: refresh the verified preload snapshot (#2810) --- tools/components/preloads.lock.json | 221 +++++++++++++++++----------- 1 file changed, 134 insertions(+), 87 deletions(-) diff --git a/tools/components/preloads.lock.json b/tools/components/preloads.lock.json index fdb5640b21..37e2319dad 100644 --- a/tools/components/preloads.lock.json +++ b/tools/components/preloads.lock.json @@ -1,121 +1,168 @@ { - "archive_sha256": "cb6487a94f25a3068fd07958174eb5b5e14f709655ff4ef0a8cdbd99138513b2", - "arm64_recipe": "1c92a1b0669277de3e78e9f292634affb5b5a19d5ea49d3ad8610c1dc638c2fb", + "archive_sha256": "2d1f53c795615e7066a47ad26c791397d830bb8b028e9c89f9f809eaeebd3fae", + "arm64_recipe": "d89e4bbf9533840a44d77c52a392cdce242822b1e80293ea4de26d2f06a09698", "groups": { "arm64": { - "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "@runner": "37a91043149e9747985b419002d87ff4df41ec6def4169e0ef16711d7261dbf2", "app/src/main/cpp/adrenotools/src/hook/kgsl.h": "396c56761034a4ed783543ee3312c6ec64d63b2a1cf7eecf1939c23251f25adf", - "app/src/main/cpp/fakeinput_steam.cpp": "3d11e859ca58a42a9da92a3fc589d404df790e151f7e18ea6114645750e70ef5", - "app/src/main/cpp/venc/venc_proto.h": "2242ddbc8981d14a33bac70264bb3e7f701fd1c3ebb988e17bbb2b19b6b808f7", + "app/src/main/cpp/fakeinput_steam.cpp": "e1377f9d7cd8539a9a327e2851b04c8e05e931f8b5ee554fa4f36d4b17f96718", + "app/src/main/cpp/venc/venc_proto.h": "57636af2644b36ea101cd09de42c423e864a612160561239ceda77ce888d5370", "tools/linuxfs/clipboard/clipboard.c": "96291c2bbc040c83caabf059ab3e95a9ed90d6a768c759d7cb4c0b64706bddfa", - "tools/linuxfs/preload/binfmt.c": "0933cc49cb53f0aa1206e2eae516d38dc3337e74174be07e10619c42aa56792b", - "tools/linuxfs/preload/dircache.c": "8e7f19ea4a1198783d53a3f357326c6177da157b0cc7e0d22e1670963e1c26e7", - "tools/linuxfs/preload/drm.c": "e0eabab0d8ed9e841918e827bf87168efa7f2dfb8404169e9bed3ab5eda2836c", - "tools/linuxfs/preload/fsync.c": "795c114c2a05d3f250d07145d04c5658091699da3b96290da36348ccadfb0c09", - "tools/linuxfs/preload/inputudev.c": "2648248d3d235a582eb8459709e0a85de537c03ac10c5040fbfb50d9846c68eb", - "tools/linuxfs/preload/kgslid.c": "88a7875fd5289930204d155d92ac9d15492cd06db16ed87aa9c95af37f3e7089", - "tools/linuxfs/preload/kgslpoll.c": "f0d853d919a52487c04cbda5fb3fa22269da54b7f4ee2f7dd3b5bd9909418670", - "tools/linuxfs/preload/links.c": "b7bbcf9112393b152f358fe6f8dc9a1955f0c8532e1eddf016a971415cd13c64", - "tools/linuxfs/preload/lock.c": "f71b3fd40e6a2b74908d3cdc601e8748699ae9c7a89b542d2445b999015ffd66", - "tools/linuxfs/preload/net.c": "335853c8ea0e9a8ebbc5a5500dc4bded9c34c4310a6ab8aa46b07d5ce1c2b55e", - "tools/linuxfs/preload/netif.c": "cc26d50b8d4639d8dd4697811bbf85c9d9f31761f9504a4af42473de3cb22b3c", - "tools/linuxfs/preload/noexec.c": "1855aeaeda3d506329bd9af1107580c74d1f56787c411b2e01c0a8a9d4059c7b", - "tools/linuxfs/preload/ntsync.c": "0614c48af0c062bfcb4c30141efe1b792b340767a67d2fe92ee9877d2ba16e0d", - "tools/linuxfs/preload/opens.c": "92ae4aea16aa457a898dedf4a70eb332d80d3b1e77f3a60bace7715a4317399e", - "tools/linuxfs/preload/pathcache.c": "eb0d4b5238fe6c8891e805d90bd837e466754100c978fad2d0ff717116b9b8a3", - "tools/linuxfs/preload/perms.c": "f600619c4ca130f69001ed7ad7bd74a3dc215b14c61479c45bb770f916d244b9", - "tools/linuxfs/preload/pulseguard.c": "57674ea40283e53a27bc78362de1ba41ee972d172ea38b1f818b1d6eed0abe65", + "tools/linuxfs/preload/binfmt.c": "45e820cdd75f2bd42710d98a4d5fee7398b667c9793ee94d8b8b7c4f29f4380c", + "tools/linuxfs/preload/clockpause.c": "5c8cbe1303e3b5fce97b000a952ab15691c0b56dc874e4a963f0e7888ce3f2c7", + "tools/linuxfs/preload/descriptor.c": "673b1cd0a5cd287a572e67aa60c2c36d1bc90ccac4f73ad0a783d4d2e2e5df07", + "tools/linuxfs/preload/dircache.c": "09d3dee98e49ef85b8e8112acb6a2b3d8b980eac80f07b3c82785e567f0606a6", + "tools/linuxfs/preload/drm.c": "9c9b9deab902276ee23a08a98730b2c6adbf7ea6d61e1e73d2a2e7c7016b1335", + "tools/linuxfs/preload/fsync.c": "f2f5fd3197d536d9396dd3d69837f6a2b0b4ff9aaffdb6f55b200408aaf5793d", + "tools/linuxfs/preload/inputudev.c": "76d7f720cd9531d8d38c2977956bf764b0db6055cb56aa35493476a244d9a22e", + "tools/linuxfs/preload/kgslid.c": "1a9639606ece49c5aff74baa5b9ef0921ec5dbc321d19d3f59184e4456f324a4", + "tools/linuxfs/preload/kgslpoll.c": "d03c09e0c82f76716dcc1f3ca77e718c60929bedf221ea5dae8ab43f5ab3e3f3", + "tools/linuxfs/preload/links.c": "c5761d450e070de912fbc9c71562d3fbf54775b484ea0fa57ded2e0c0771f7cf", + "tools/linuxfs/preload/lock.c": "1fcfefe28ef49ccd73f13b69ceb576492101cd1ddb88f08e0c73646ddeb327f2", + "tools/linuxfs/preload/net.c": "0645013df15656573d484bf6f8e6d8657beb228c779ae1143c0874e12559bf3e", + "tools/linuxfs/preload/netif.c": "cf6568ce8ffea44f24a8443160d86e4efddcdb964c908532935cbc4c4570ca91", + "tools/linuxfs/preload/noexec.c": "12f5245a893f9044558270cb03cfb7020546bfe3e90a9264b33d3f818dd30433", + "tools/linuxfs/preload/ntsync.c": "acffede0324fc89ac91f8181c2df23e6f39459a4db678a44ce9e65e0f282418c", + "tools/linuxfs/preload/oomadj.c": "d84d552a24ec3467e7ba5cf92a384521dfbcf1fc9a97e899b7b18d20bf1b45d5", + "tools/linuxfs/preload/opens.c": "2ba8f056ae0f2ab87a3d58ca0926b09af67deb1e24048506117bc26601e249c6", + "tools/linuxfs/preload/owner.c": "746d0a1834d0e19f7d9adfad72a6080a1104610f98c1d61e14d2c3a91a9eb04d", + "tools/linuxfs/preload/pathcache.c": "7d8287736f8f1988738d233c002ff6e00127c98034fcd35c2bb63a84c04b85a3", + "tools/linuxfs/preload/perms.c": "5ffa0ce5ff8269fc567dc5581bec380dcf2c90b9fb178c8dbae747e61430608f", + "tools/linuxfs/preload/pulseguard.c": "a91a0d5c745ea32ad52d57010a8b3cf7171bc4a3d2f73b870c64a6a62b233b56", "tools/linuxfs/preload/quest_kgsl.c": "59d9b8416be6a1c680f1d1e4c2427d2cbb7b415344261adb357d9d211ec95cfe", - "tools/linuxfs/preload/robust.c": "9eb6c0ed50e0f48a8cfb86bd92587f471354bdf2531b9177f4b3ab83bdfed39a", - "tools/linuxfs/preload/rptouch.c": "0e3f8bf2f9a41324361f38fa4da8d2d47593c9555f0cabf8228767397846c7c3", - "tools/linuxfs/preload/space.c": "118389bcc89dfa2b4230b80915e21d2d4331c4cff1f5a58265f85e6ecb5c29d2", - "tools/linuxfs/preload/storage.c": "08a8b46c3588f3160bb8608489768010ec36d5ccdb2b25a431ec9d6fcd413a6e", - "tools/linuxfs/preload/sysv.c": "49774ee5e2e39b84dcfadf63abdc741b3df236cb11783744a1280adee36965e8", + "tools/linuxfs/preload/robust.c": "02cd25316912c79897e2c5a1ed44b059b815d36bc62ba8d4691f718eeae92947", + "tools/linuxfs/preload/rptouch.c": "fc6db7e4b9432a7361e805a9a2dd134f9f3ec4ffba7927ab4b2c7b6bd2a22644", + "tools/linuxfs/preload/space.c": "9258ec8a8f8d87f2629b753d1838a09000110d936103284a04134b8cbed024d3", + "tools/linuxfs/preload/storage.c": "5c0dc4e5901e8cc32cdf241e38e3d5dcd3dae8b8ca94579f633754c8eadd617b", + "tools/linuxfs/preload/subreaper.c": "6f3830c0368a768bd0d367fa94345e6e4725875acc9662cf3690f1c5f28bf71c", + "tools/linuxfs/preload/sysv.c": "893dfad1db964eb1f79af94978b4af8b87279b85c30a4d589b5844cded476ed3", "tools/linuxfs/preload/tracefs.c": "be3f8a2f032b56e6e08a931e77a9386aea4bb93421a482271e06386ec0c469b6", - "tools/linuxfs/preload/tracer.c": "f34e5377c891b0a8d00489245d66f96bc352df4cd90f47a951dcadae980af4c1", - "tools/linuxfs/preload/udevmon.c": "2045dfb883cfb6e2016c359a3dc3af17f3b8f383f6dd0d5dfee407ef0d344852", - "tools/linuxfs/preload/usr2.c": "6ae704380b45a9b3a74c4fe2b3ce4482470dae59ced26cf0aee64f4b4dcc11f9", - "tools/linuxfs/preload/venc.c": "24c3c46fe49d28adfc8c977e52c9cc407f534b26f56d94b3425b8bb01803dba8", + "tools/linuxfs/preload/tracer.c": "4b5481ea91a475bb6ac16a7ba63e371f0a850a17adac5399302a610c0a57ec0a", + "tools/linuxfs/preload/udevmon.c": "4d5f07f2521af702b3f2adda3c93a39873f87c0946de007bca8b1fe6699596fa", + "tools/linuxfs/preload/usr2.c": "4b4044da1ddf07d12bafeb893c257679e26a5ea2f58e6cc0d715f27b931e7b1e", + "tools/linuxfs/preload/vdec.c": "a7b2d0754067493cde1929846f7b2c9692c4dde96ee273a92c81ac65470fac50", + "tools/linuxfs/preload/venc.c": "7fda60f013736d98dab734a9344e0f1d527dc3d976a71f5ccd4a0bc17d9f346f", + "tools/linuxfs/preload/venus.c": "d4af5c3532d4c7d9891b75cd5a137252e791beafe319b9fd976be123f7b80403", "tools/linuxfs/preload/vmwrite.c": "1a3ea2ec4354e0716c17f7db537b19ab82bcd524f2aece2fa5dec89b076a2188", - "tools/linuxfs/preload/webhelper.c": "a8213a7a96b407459c83fb93365cfe58fd05964e7bb262b8061c1c0792a6aac8", - "tools/linuxfs/preload/writewatch.c": "61e395d1caa184d329dead0e36c4e92cb1069b1154ac36581f37406c1c242240", - "tools/linuxfs/preload/xmode.c": "9a09995bf52d40b07f16828bcc545b59b8fb1ba60d9cb09f14f7f31dba1e65a6", - "tools/linuxfs/preload/zram.c": "12bcf07459728d4a7ede6fa0fea8deb330f7c5d0f0dd61e610e81b9efecd4262", + "tools/linuxfs/preload/webhelper.c": "bec759f908fb7c52238a7b72d3888aac6187aaec2378c190749ab8a5f7f1d81a", + "tools/linuxfs/preload/writewatch.c": "285ed7e627dc9349dd3ae45e8c1ffeaf4c56970b9eac5046754e348b4587dd6b", + "tools/linuxfs/preload/xmode.c": "3b6e36b29795544fdc0299822049b1890a7612578051d2a8982485c263dcf259", + "tools/linuxfs/preload/zram.c": "60b8c9fbd96adcc2026e48c651948d592f06017ff679e4775b1752be26525a2e", "tools/linuxfs/ssbs/ssbs_adapter.c": "9e4e0fe637f7b8f91f12d8151f02e8d31bcb4294be2b2c62d3cd3ce76f200306", + "tools/nativeguest/LICENSE": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30", + "tools/nativeguest/app-seccomp-dump.c": "b5bfb92de5d64fa286b5a1cf3f4f71687817fc093cf698c65ffb2a5c575ce809", + "tools/nativeguest/build-gosys.sh": "34877be3fdbf7cf74f1dc19fbe708d428b135e65caf92a8ad0cbc7772ad699c7", + "tools/nativeguest/build.sh": "5aad4e82e293a2b47f461434dd6b024360d3b4356dadabc28b2fcc08220103be", + "tools/nativeguest/ddnatv-hook.c": "65451173bedbc332668f25b6589ca54d0a4c2d7edfaeb48f69ce00632b5d968b", + "tools/nativeguest/gosys/gosys.c": "a7808741af5fcaede7260f743b482612a7b2a818e207514bab667d06ca82f4d4", + "tools/nativeguest/gosys/gosys.ld": "dd4de106e3f9429a9373f8ed512537ed5b4927efc368ce3b8364776be435fb80", + "tools/nativeguest/gosys/gosys_abi.h": "8c246268e0645a7148bc2ad9f0c1d6147e0a3bc0c7625956be9afc018c58ada0", + "tools/nativeguest/hook/env.c": "ed84ca5c1f9704eba140263123f0b1876d1e2daee7b92d444f06edab3246f327", + "tools/nativeguest/hook/exec.c": "69111bf9a9ebaf56f59825c99fa16078f53ba708e8816e2c9bd02aff909149f5", + "tools/nativeguest/hook/exec_probe.c": "539ba604469d0a7fcc1677709bc56386ac92de4ba07fe80fda10f4cd85bf6d1a", + "tools/nativeguest/hook/fileops.c": "10bde17100bc2d7ed44f8921b16472309bb108b6f77371aaa3036d0737867706", + "tools/nativeguest/hook/files.c": "be6affd0bdf55e4759b5ba5edbbd280b47bae74013d790c0132474e8aca9abeb", + "tools/nativeguest/hook/go_programs.c": "418340c66a1d9fd5b492fff8b22d929ca3b4ef672ba73968c0d0ca5a4e9f3937", + "tools/nativeguest/hook/hardlinks.c": "eae44472aaefb9c24854610acfe16b221081a8bdc39bc63f8c957292ddced6ed", + "tools/nativeguest/hook/identity.c": "89f1632f00b141c568e8dbc0226039d3f6d9bd0752ff337e343cac2cb3a60705", + "tools/nativeguest/hook/net.c": "ec62f2bf9bb1eb15b7947d577a6cdde67dcce21bdaf217fd74c00ceb78e4f471", + "tools/nativeguest/hook/paths.c": "7d3098f944c6c13621eb4295df3ecb06350fc61381e4b92070764d66d8c85354", + "tools/nativeguest/hook/posix_shm.c": "0bb3782c538723051d51d147d35a9f5b37872b2a6ffa49d3059264539533d0f7", + "tools/nativeguest/hook/privileged.c": "d1acc6faca83f9b7a1a4d5a07fe19d73d139f8f9f3ec6215347c6ec7088f1819", + "tools/nativeguest/hook/setup.c": "2a3baa4ecc9fe39ff96e920a5e49e8b94fe432c63cc3fecd8badf40003a67ffc", + "tools/nativeguest/hook/signals.c": "b9e3646c3376150d64afff81a1e3f40a7ef5662de6b2b01d15f1bb8f2c5ecdf9", + "tools/nativeguest/hook/sockets.c": "6e221ca047351e67b2a0a4611d9782b60f7f309309b83a46406cf371becc2f40", + "tools/nativeguest/hook/static_programs.c": "f53db68d18240d1bbf92cf7ecabfb207861bbf563785516be3325bc9c511e629", + "tools/nativeguest/hook/syscalls.c": "1e6e7e44e2a49ac768aaf55661748a4ce703c06bab6dbe1ce25c5de80f416053", + "tools/nativeguest/hook/sysv_shm.c": "1ef54c48aa25d827494502c913423612f270767a6343435fbc5868ad927b5ed1", + "tools/nativeguest/seccomp-sim.c": "261d8ef8364f05a45acc43767eab22057357f056558b69835a0198d5bae3d9b8", "tools/proot/fastpath/audit.c": "bfe347a2ddaceef40a78d7d590e4e679724ee4c82f3f1f1e3c7017a18ad536d4", - "tools/proot/fastpath/fastpath.c": "4cd07b25ba14f6faa6bac5091ae323ded6b646dbb34b9e5a92ea6385e4d37cb5", - "tools/quest/kgsl_compat.c": "111afffda7a6df2469610f6c342ae086b1a97a559c586efc4a28015b86efd6bd", + "tools/proot/fastpath/fastpath.c": "8fe165886b0462b912507636592462599f4657b4c2c56723968b8f95981dd05e", + "tools/proot/fastpath/svc-cache.h": "bf0b4669ff3d5b72354cc0fdb62d1c2637b545db2096d782a1f713ae9cfbdc89", + "tools/proot/fastpath/svc-dispatch.h": "18dbd595a181ac9d7c0e2eb9ef4321cd9e3ea24e7506beac71cd9e9923d327e5", + "tools/proot/fastpath/svc-patch.h": "9c1d05485a4f79e71b4a49e73e6d2fa37473de20db93acdc7fbfe04c6156fb96", + "tools/proot/fastpath/svc-publish.h": "1c4491e8b22d15319619c1d61707f614fa2b152afd5d02ad197c3da9a2f26e62", + "tools/proot/fastpath/svc-stack.h": "2545db824775ea4673e0272cf7c16f64c87e92db4853f6874cf2c3451cba474b", + "tools/quest/kgsl_compat.c": "92cf5b3da0b3704c20d9e1307bb5abc0530717b9a2e2fd7c8db876a85dc333a1", "tools/quest/kgsl_compat.h": "2e9e0eb647530a35277954b7e61a22ee958067fe46056a608fb32f40f273f1bf" }, "x86": { - "@runner": "84f825635599f81ed33f62c5fc4c73f66044d1468b060d65f83855eb9c8bfe77", + "@runner": "37a91043149e9747985b419002d87ff4df41ec6def4169e0ef16711d7261dbf2", "app/src/main/cpp/adrenotools/src/hook/kgsl.h": "396c56761034a4ed783543ee3312c6ec64d63b2a1cf7eecf1939c23251f25adf", - "app/src/main/cpp/fakeinput_steam.cpp": "3d11e859ca58a42a9da92a3fc589d404df790e151f7e18ea6114645750e70ef5", - "app/src/main/cpp/venc/venc_proto.h": "2242ddbc8981d14a33bac70264bb3e7f701fd1c3ebb988e17bbb2b19b6b808f7", - "tools/linuxfs/build-x86-preloads.sh": "d0820252809881db89db5a17427e74b9aa4964aae70623cb7f4b474e90c7a23b", + "app/src/main/cpp/fakeinput_steam.cpp": "e1377f9d7cd8539a9a327e2851b04c8e05e931f8b5ee554fa4f36d4b17f96718", + "app/src/main/cpp/venc/venc_proto.h": "57636af2644b36ea101cd09de42c423e864a612160561239ceda77ce888d5370", + "tools/linuxfs/build-x86-preloads.sh": "cf283b41c9a39b61bb628035a405cc8d33bd8085056ea482f80253a3ddd6ab8b", "tools/linuxfs/debian-image.env": "1c79dea4314c784042a5c59208765c8401771098f293185d61a157d89edf6e52", "tools/linuxfs/fex/faultreport.c": "573bf780f32f7256dc2fbf40fe850d67e67c354509fdedcac3ff7f1a261daac3", - "tools/linuxfs/fex/vulkanpin.c": "f2693ac2be8d15f7881115e61b1c6b3fe4aeec8f603584c6fce5b0f046563d51", - "tools/linuxfs/fex/webkitinput.c": "693ffd6c8c8c97e87156444ad2255c84dbf22cd0053d135fb8d9be094b5534d1", - "tools/linuxfs/preload/binfmt.c": "0933cc49cb53f0aa1206e2eae516d38dc3337e74174be07e10619c42aa56792b", - "tools/linuxfs/preload/dircache.c": "8e7f19ea4a1198783d53a3f357326c6177da157b0cc7e0d22e1670963e1c26e7", - "tools/linuxfs/preload/drm.c": "e0eabab0d8ed9e841918e827bf87168efa7f2dfb8404169e9bed3ab5eda2836c", - "tools/linuxfs/preload/fsync.c": "795c114c2a05d3f250d07145d04c5658091699da3b96290da36348ccadfb0c09", - "tools/linuxfs/preload/inputudev.c": "2648248d3d235a582eb8459709e0a85de537c03ac10c5040fbfb50d9846c68eb", - "tools/linuxfs/preload/kgslid.c": "88a7875fd5289930204d155d92ac9d15492cd06db16ed87aa9c95af37f3e7089", - "tools/linuxfs/preload/kgslpoll.c": "f0d853d919a52487c04cbda5fb3fa22269da54b7f4ee2f7dd3b5bd9909418670", - "tools/linuxfs/preload/links.c": "b7bbcf9112393b152f358fe6f8dc9a1955f0c8532e1eddf016a971415cd13c64", - "tools/linuxfs/preload/lock.c": "f71b3fd40e6a2b74908d3cdc601e8748699ae9c7a89b542d2445b999015ffd66", - "tools/linuxfs/preload/net.c": "335853c8ea0e9a8ebbc5a5500dc4bded9c34c4310a6ab8aa46b07d5ce1c2b55e", - "tools/linuxfs/preload/netif.c": "cc26d50b8d4639d8dd4697811bbf85c9d9f31761f9504a4af42473de3cb22b3c", - "tools/linuxfs/preload/noexec.c": "1855aeaeda3d506329bd9af1107580c74d1f56787c411b2e01c0a8a9d4059c7b", - "tools/linuxfs/preload/ntsync.c": "0614c48af0c062bfcb4c30141efe1b792b340767a67d2fe92ee9877d2ba16e0d", - "tools/linuxfs/preload/opens.c": "92ae4aea16aa457a898dedf4a70eb332d80d3b1e77f3a60bace7715a4317399e", - "tools/linuxfs/preload/pathcache.c": "eb0d4b5238fe6c8891e805d90bd837e466754100c978fad2d0ff717116b9b8a3", - "tools/linuxfs/preload/perms.c": "f600619c4ca130f69001ed7ad7bd74a3dc215b14c61479c45bb770f916d244b9", - "tools/linuxfs/preload/pulseguard.c": "57674ea40283e53a27bc78362de1ba41ee972d172ea38b1f818b1d6eed0abe65", + "tools/linuxfs/fex/vulkanpin.c": "c530e265486fd106705fac906848871c9bce6acef2718a9c2d5dbb5bd7650227", + "tools/linuxfs/fex/webkitinput.c": "5356a003aa30686218f403ad4ea67f792ac84dc434f289032292f234908d5c48", + "tools/linuxfs/preload/binfmt.c": "45e820cdd75f2bd42710d98a4d5fee7398b667c9793ee94d8b8b7c4f29f4380c", + "tools/linuxfs/preload/clockpause.c": "5c8cbe1303e3b5fce97b000a952ab15691c0b56dc874e4a963f0e7888ce3f2c7", + "tools/linuxfs/preload/descriptor.c": "673b1cd0a5cd287a572e67aa60c2c36d1bc90ccac4f73ad0a783d4d2e2e5df07", + "tools/linuxfs/preload/dircache.c": "09d3dee98e49ef85b8e8112acb6a2b3d8b980eac80f07b3c82785e567f0606a6", + "tools/linuxfs/preload/drm.c": "9c9b9deab902276ee23a08a98730b2c6adbf7ea6d61e1e73d2a2e7c7016b1335", + "tools/linuxfs/preload/fsync.c": "f2f5fd3197d536d9396dd3d69837f6a2b0b4ff9aaffdb6f55b200408aaf5793d", + "tools/linuxfs/preload/inputudev.c": "76d7f720cd9531d8d38c2977956bf764b0db6055cb56aa35493476a244d9a22e", + "tools/linuxfs/preload/kgslid.c": "1a9639606ece49c5aff74baa5b9ef0921ec5dbc321d19d3f59184e4456f324a4", + "tools/linuxfs/preload/kgslpoll.c": "d03c09e0c82f76716dcc1f3ca77e718c60929bedf221ea5dae8ab43f5ab3e3f3", + "tools/linuxfs/preload/links.c": "c5761d450e070de912fbc9c71562d3fbf54775b484ea0fa57ded2e0c0771f7cf", + "tools/linuxfs/preload/lock.c": "1fcfefe28ef49ccd73f13b69ceb576492101cd1ddb88f08e0c73646ddeb327f2", + "tools/linuxfs/preload/net.c": "0645013df15656573d484bf6f8e6d8657beb228c779ae1143c0874e12559bf3e", + "tools/linuxfs/preload/netif.c": "cf6568ce8ffea44f24a8443160d86e4efddcdb964c908532935cbc4c4570ca91", + "tools/linuxfs/preload/noexec.c": "12f5245a893f9044558270cb03cfb7020546bfe3e90a9264b33d3f818dd30433", + "tools/linuxfs/preload/ntsync.c": "acffede0324fc89ac91f8181c2df23e6f39459a4db678a44ce9e65e0f282418c", + "tools/linuxfs/preload/oomadj.c": "d84d552a24ec3467e7ba5cf92a384521dfbcf1fc9a97e899b7b18d20bf1b45d5", + "tools/linuxfs/preload/opens.c": "2ba8f056ae0f2ab87a3d58ca0926b09af67deb1e24048506117bc26601e249c6", + "tools/linuxfs/preload/owner.c": "746d0a1834d0e19f7d9adfad72a6080a1104610f98c1d61e14d2c3a91a9eb04d", + "tools/linuxfs/preload/pathcache.c": "7d8287736f8f1988738d233c002ff6e00127c98034fcd35c2bb63a84c04b85a3", + "tools/linuxfs/preload/perms.c": "5ffa0ce5ff8269fc567dc5581bec380dcf2c90b9fb178c8dbae747e61430608f", + "tools/linuxfs/preload/pulseguard.c": "a91a0d5c745ea32ad52d57010a8b3cf7171bc4a3d2f73b870c64a6a62b233b56", "tools/linuxfs/preload/quest_kgsl.c": "59d9b8416be6a1c680f1d1e4c2427d2cbb7b415344261adb357d9d211ec95cfe", - "tools/linuxfs/preload/robust.c": "9eb6c0ed50e0f48a8cfb86bd92587f471354bdf2531b9177f4b3ab83bdfed39a", - "tools/linuxfs/preload/rptouch.c": "0e3f8bf2f9a41324361f38fa4da8d2d47593c9555f0cabf8228767397846c7c3", - "tools/linuxfs/preload/space.c": "118389bcc89dfa2b4230b80915e21d2d4331c4cff1f5a58265f85e6ecb5c29d2", - "tools/linuxfs/preload/storage.c": "08a8b46c3588f3160bb8608489768010ec36d5ccdb2b25a431ec9d6fcd413a6e", - "tools/linuxfs/preload/sysv.c": "49774ee5e2e39b84dcfadf63abdc741b3df236cb11783744a1280adee36965e8", + "tools/linuxfs/preload/robust.c": "02cd25316912c79897e2c5a1ed44b059b815d36bc62ba8d4691f718eeae92947", + "tools/linuxfs/preload/rptouch.c": "fc6db7e4b9432a7361e805a9a2dd134f9f3ec4ffba7927ab4b2c7b6bd2a22644", + "tools/linuxfs/preload/space.c": "9258ec8a8f8d87f2629b753d1838a09000110d936103284a04134b8cbed024d3", + "tools/linuxfs/preload/storage.c": "5c0dc4e5901e8cc32cdf241e38e3d5dcd3dae8b8ca94579f633754c8eadd617b", + "tools/linuxfs/preload/subreaper.c": "6f3830c0368a768bd0d367fa94345e6e4725875acc9662cf3690f1c5f28bf71c", + "tools/linuxfs/preload/sysv.c": "893dfad1db964eb1f79af94978b4af8b87279b85c30a4d589b5844cded476ed3", "tools/linuxfs/preload/tracefs.c": "be3f8a2f032b56e6e08a931e77a9386aea4bb93421a482271e06386ec0c469b6", - "tools/linuxfs/preload/tracer.c": "f34e5377c891b0a8d00489245d66f96bc352df4cd90f47a951dcadae980af4c1", - "tools/linuxfs/preload/udevmon.c": "2045dfb883cfb6e2016c359a3dc3af17f3b8f383f6dd0d5dfee407ef0d344852", - "tools/linuxfs/preload/usr2.c": "6ae704380b45a9b3a74c4fe2b3ce4482470dae59ced26cf0aee64f4b4dcc11f9", - "tools/linuxfs/preload/venc.c": "24c3c46fe49d28adfc8c977e52c9cc407f534b26f56d94b3425b8bb01803dba8", + "tools/linuxfs/preload/tracer.c": "4b5481ea91a475bb6ac16a7ba63e371f0a850a17adac5399302a610c0a57ec0a", + "tools/linuxfs/preload/udevmon.c": "4d5f07f2521af702b3f2adda3c93a39873f87c0946de007bca8b1fe6699596fa", + "tools/linuxfs/preload/usr2.c": "4b4044da1ddf07d12bafeb893c257679e26a5ea2f58e6cc0d715f27b931e7b1e", + "tools/linuxfs/preload/vdec.c": "a7b2d0754067493cde1929846f7b2c9692c4dde96ee273a92c81ac65470fac50", + "tools/linuxfs/preload/venc.c": "7fda60f013736d98dab734a9344e0f1d527dc3d976a71f5ccd4a0bc17d9f346f", + "tools/linuxfs/preload/venus.c": "d4af5c3532d4c7d9891b75cd5a137252e791beafe319b9fd976be123f7b80403", "tools/linuxfs/preload/vmwrite.c": "1a3ea2ec4354e0716c17f7db537b19ab82bcd524f2aece2fa5dec89b076a2188", - "tools/linuxfs/preload/webhelper.c": "a8213a7a96b407459c83fb93365cfe58fd05964e7bb262b8061c1c0792a6aac8", - "tools/linuxfs/preload/writewatch.c": "61e395d1caa184d329dead0e36c4e92cb1069b1154ac36581f37406c1c242240", - "tools/linuxfs/preload/xmode.c": "9a09995bf52d40b07f16828bcc545b59b8fb1ba60d9cb09f14f7f31dba1e65a6", - "tools/linuxfs/preload/zram.c": "12bcf07459728d4a7ede6fa0fea8deb330f7c5d0f0dd61e610e81b9efecd4262", - "tools/quest/kgsl_compat.c": "111afffda7a6df2469610f6c342ae086b1a97a559c586efc4a28015b86efd6bd", + "tools/linuxfs/preload/webhelper.c": "bec759f908fb7c52238a7b72d3888aac6187aaec2378c190749ab8a5f7f1d81a", + "tools/linuxfs/preload/writewatch.c": "285ed7e627dc9349dd3ae45e8c1ffeaf4c56970b9eac5046754e348b4587dd6b", + "tools/linuxfs/preload/xmode.c": "3b6e36b29795544fdc0299822049b1890a7612578051d2a8982485c263dcf259", + "tools/linuxfs/preload/zram.c": "60b8c9fbd96adcc2026e48c651948d592f06017ff679e4775b1752be26525a2e", + "tools/quest/kgsl_compat.c": "92cf5b3da0b3704c20d9e1307bb5abc0530717b9a2e2fd7c8db876a85dc333a1", "tools/quest/kgsl_compat.h": "2e9e0eb647530a35277954b7e61a22ee958067fe46056a608fb32f40f273f1bf" } }, "origin": { - "artifact": 12520502054, - "artifact_sha256": "b7e800a1884a516ec52b050b7f904f9881427bca4579f660b909fd18f15e49ff", - "commit": "b76f13f7acc0af0cc00369dde61fb88e40529e6d", - "run": 39992155294, - "url": "https://github.com/Droid-Deck/DroidDeck/actions/runs/39992155294" + "artifact": 14400591108, + "artifact_sha256": "974023be39cb1b7a168efb38369d1adfe2a51f0e1d7b9b535b50c8692a24f870", + "commit": "c8b291b9dbdeae137236a56ad66f08b1f3370a8a", + "run": 44240744255, + "url": "https://github.com/Droid-Deck/DroidDeck/actions/runs/44240744255" }, "outputs": { - "i386/libddsession.so": "5343cdb704217ddc81ee593e67d5987363dc7b5ac78bd4bd36000219e5063268", - "i386/libfakeinput.so": "188d88dfb13b6e2f2df948e7b8b4d9ec604770f55d1ea5b6b9e21ad56a74ce5e", + "i386/libddsession.so": "da5562f924faf98144b569ee3ed113be7dcee59deef24abc84be56fd4ba9ccd3", + "i386/libfakeinput.so": "99f6328a3a380672680969a54cd2e9996edf25c287fa5a00e2db54264da8d898", "i386/libfaultreport.so": "95f9ef60f04a13ee60cfbd4d2d2efb60a7063b722e646c78c9dc27162292877b", "libddaudit.so": "6c6abe89baf5d7309babee0c3372a4b00c2b689e2a63de38c5e9a660626509b5", - "libddfastpath.so": "0e1f151b5c1c5ea9dd380ad58d09f8fe7ba3ae037d0991cb3eef6899e9d5ec83", - "libddsession.so": "29d4b5ea46dba941107e02c0ee544244b137a339cada43bff65c350f2ef2755a", - "libfakeinput.so": "5f6dc3aea05de2dc1fbe0bbfac2ce4d11e3d47f761c6b06c8badb15fe1904392", + "libddfastpath.so": "9cdf153a8f9d4e150123dd5bac8ff678a0b84c1318e036c1d928b542821103b6", + "libddnatv-hook.so": "8ed3de674273734ae239408a315ab7813e1e5bb606ed126b9e45eec0e84fe399", + "libddsession.so": "da6c3a919bd6f48f5abfdab383c45be71fb20b684c6defec4fbbbb450b8e2d59", + "libfakeinput.so": "46b671065c0a811fc10d46dcf8dc4b58fce110079c8d919d2e1072c3b02eca02", "libssbs.so": "c288ed0da26c2481aff270d1cdafe1205061c4a300c2c46ae1b53c6e0c94f44b", "usr/local/bin/droiddeck-clipboard": "ec50e8f67fdf76372927189b0fdb670f9b70fd3484f2fe3e833bc8f9fdc44205", - "x86_64/libddsession.so": "61d19f06aebab6a789f8c99f687af9903376bfc853e46b70c48a2ce5e497accc", - "x86_64/libfakeinput.so": "8663dd2086bf8ae53069a480dd9ae4619109d32f0947a29e2ce38f07a21ae2e6", + "x86_64/libddsession.so": "1438bc246fb0fec985ef71fccbe4acdc067b1ae4b97befdc8f01fdd79c99b151", + "x86_64/libfakeinput.so": "74ef688919a0f757d2c022b7a18d64e7c4819301e79e0aa8572d8e0ef8318e49", "x86_64/libfaultreport.so": "bb0dc9165d0d764473e552508650edd586df16d620fc5b16b8b1c5740a28ce22", "x86_64/libvulkan-thunk.so": "74f01b652d7e8179561a096a552328b68da640cc4bad3981edd38e6afbf90243", - "x86_64/libwebkitinput.so": "9b07380a7b017397b9c56bb7bb1161e046b0c6a647fc413888904606b0def6d0" + "x86_64/libwebkitinput.so": "d0ba6886642595132d1ec9abb8d9f4cc7e1bc4c750b4a5d53d2f089334a6b4e3" }, "toolchain": { "arm64": "Ubuntu 24.04 GCC cross compiler; exact build commands pinned by arm64_recipe", From 5e704296ed308f677fc8f6bb8c3be4e554cd9725 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:35:45 -0500 Subject: [PATCH 07/60] Review follow-ups for tab defaults, accounts and hero flight (#2809) * fix: address review notes on tab defaults, accounts and hero flight * fix: zero hero drift for cover-only pages, hide search pills from accessibility * fix(settings): drop pill semantics while search is open --- .../main/java/com/droiddeck/launcher/App.kt | 2 +- .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/ui/FrontEndGames.kt | 2 +- .../com/droiddeck/launcher/ui/GameGlass.kt | 24 +++++++++++++++---- .../com/droiddeck/launcher/ui/LibraryPage.kt | 11 +++++---- .../com/droiddeck/launcher/ui/PageFlood.kt | 16 ++++++++++--- .../droiddeck/launcher/ui/SettingsSearch.kt | 9 ++++++- .../com/droiddeck/launcher/ui/StoresMotion.kt | 2 ++ 8 files changed, 53 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 88a3bde9c1..cb66f1a925 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -45,8 +45,8 @@ class App : Application() { CrashHandler.install(this) com.droiddeck.launcher.input.ShortcutsRelay.Holder.install(this) com.droiddeck.launcher.agent.AgentHost.refresh(this) - com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.NavTabs.load(this) + com.droiddeck.launcher.ui.DeveloperTools.load(this) com.droiddeck.launcher.ui.AgentPet.install(this) if (com.droiddeck.launcher.agent.AgentTab.visible) com.droiddeck.launcher.lab.LabNotice.openOnInstall = "agent" com.droiddeck.launcher.lab.LabNotice.started(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 729c2aa396..0a08067990 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "pen", "penButton", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "integerScaling", "railLabels", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 6ef307426f..a276eb91e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -47,7 +47,7 @@ internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions, labeled var open by remember { androidx.compose.runtime.mutableStateOf(false) } Box { if (labeled) SecondaryButton(stringResource(R.string.game_frontend_files), compact = true) { open = !open } - else HeaderIconButton(stringResource(R.string.game_frontend_files), androidx.compose.material.icons.Icons.Outlined.Sync, "frontend-files") { open = !open } + else HeaderIconButton(stringResource(R.string.game_frontend_files), androidx.compose.material.icons.Icons.Outlined.Sync, "frontend-files", Modifier.downToFirstTile()) { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = s.gameSyncFolder ?: stringResource(R.string.game_frontend_files)) { first -> MenuItem(stringResource(R.string.game_file_sync), checked = false, focusRequester = first) { open = false; a.onSyncGameFiles() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt index a17b4783ae..39c6b07768 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameGlass.kt @@ -171,6 +171,10 @@ internal fun GameBackdrop( }, ) { DisposableEffect(art == null) { onDispose { if (art == null) onArtPlaced(null) } } + if (art == null) androidx.compose.runtime.SideEffect { + StoresMotion.heroFadeTop = fadeTop + StoresMotion.heroDrift = { 0f } + } Box( Modifier.matchParentSize() .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen } @@ -217,6 +221,10 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx ), label = "heroDriftT", ) + androidx.compose.runtime.SideEffect { + StoresMotion.heroFadeTop = fadeTop + StoresMotion.heroDrift = { drift?.value ?: 0f } + } AsyncImage( model = model, contentDescription = null, contentScale = ContentScale.Crop, alignment = BiasAlignment(0.45f, -0.35f), @@ -224,12 +232,12 @@ private fun ArtLayer(model: Any?, sample: Any?, fadeTop: Boolean, blur: androidx modifier = Modifier.matchParentSize() .graphicsLayer { val t = drift?.value ?: 0f - val zoom = 1f + 0.16f * t + val zoom = HeroDrift.zoom(t) scaleX = zoom scaleY = zoom - translationX = -size.width * 0.05f * t - translationY = size.height * 0.03f * t - transformOrigin = androidx.compose.ui.graphics.TransformOrigin(0.72f, 0.33f) + translationX = size.width * HeroDrift.DX * t + translationY = size.height * HeroDrift.DY * t + transformOrigin = androidx.compose.ui.graphics.TransformOrigin(HeroDrift.PX, HeroDrift.PY) } .then(if (blur > 0.dp) Modifier.blur(blur) else Modifier), ) @@ -294,3 +302,11 @@ internal class HeroLook(brightness: Float, val light: Boolean, val background: C ) } } + +internal object HeroDrift { + const val PX = 0.72f + const val PY = 0.33f + const val DX = -0.04f + const val DY = 0.03f + fun zoom(t: Float) = 1f + 0.16f * t +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 3da1ac7831..64e949b2cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -474,7 +474,10 @@ private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifie Rise(0) { PageHeader(stringResource(R.string.rail_games)) { if (s.steamGamesX64) ClientTag() - if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + if (!s.shortcutPicker) { + AddGameButton { GamesDialogState.adding = true } + StoreAccountsButton() + } } } Rise(1) { Note(stringResource(if (s.shortcutPicker && s.shortcutLibraryScanning) R.string.game_shortcut_scanning else R.string.games_empty)) } @@ -662,7 +665,7 @@ private fun LibraryHeader( } }, ) { - if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onCollections) + if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) DisplayButton() if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) @@ -924,14 +927,14 @@ private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, ch } @Composable -internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { +internal fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, modifier: Modifier = Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) Box( contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + modifier = modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) .glideBorder(hot, CircleShape, pal.signal) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) .controllerConfirm(onClick = onClick) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt b/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt index e800110517..12834b1edf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PageFlood.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.ui.graphics.drawscope.withTransform import android.os.SystemClock import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.spring @@ -203,7 +204,7 @@ private fun DrawScope.drawTile( else lerp(from.corner * (1f - mean), minOf(w, h) * 0.42f, sin(PI * mean).toFloat().coerceAtLeast(0f)) val pic = art?.intrinsicSize?.takeIf { it.isSpecified && it.width > 0f && it.height > 0f } if (to != null && art != null && pic != null && w > 0f && h > 0f) { - drawHeroTile(art, toArt ?: art, left, top, w, h, corner, mean, alpha, fill, look) + drawHeroTile(art, toArt ?: art, left, top, w, h, corner, mean, alpha, fill, look, StoresMotion.heroDrift() * mean, StoresMotion.heroFadeTop) return } drawRoundRect(fill, Offset(left, top), Size(w, h), CornerRadius(corner), alpha = alpha) @@ -223,14 +224,19 @@ private fun DrawScope.drawTile( // dimmed, faded in from the left and out at the bottom, so the hand-off to the real hero has nothing to jump. private fun DrawScope.drawHeroTile( card: Painter, hero: Painter, left: Float, top: Float, w: Float, h: Float, corner: Float, t: Float, alpha: Float, fill: Color, look: HeroLook?, + drift: Float, fadeTop: Boolean, ) { val shape = Path().apply { addRoundRect(RoundRect(left, top, left + w, top + h, CornerRadius(corner))) } drawContext.canvas.saveLayer(Rect(left, top, left + w, top + h), androidx.compose.ui.graphics.Paint()) clipPath(shape) { drawRect(fill, Offset(left, top), Size(w, h), alpha = alpha * (1f - t)) - val swap = ((t - 0.15f) / 0.6f).coerceIn(0f, 1f) + val swap = if (hero === card) 1f else if (!hero.ready()) 0f else ((t - 0.15f) / 0.6f).coerceIn(0f, 1f) if (hero !== card) drawCropped(card, left, top, w, h, 0f, 0f, alpha * (1f - swap)) - drawCropped(hero, left, top, w, h, lerp(0f, 0.45f, t), lerp(0f, -0.35f, t), alpha * if (hero !== card) swap else 1f) + withTransform({ + translate(w * HeroDrift.DX * drift, h * HeroDrift.DY * drift) + scale(HeroDrift.zoom(drift), HeroDrift.zoom(drift), Offset(left + w * HeroDrift.PX, top + h * HeroDrift.PY)) + clipRect(left, top, left + w, top + h) + }) { drawCropped(hero, left, top, w, h, lerp(0f, 0.45f, t), lerp(0f, -0.35f, t), alpha * swap) } if (look != null) { if (look.dim < 1f) drawRect(Color.Black, Offset(left, top), Size(w, h), alpha = alpha * (1f - look.dim) * t) translate(left, top) { with(look) { shade(Size(w, h), t * alpha) } } @@ -245,6 +251,10 @@ private fun DrawScope.drawHeroTile( androidx.compose.ui.graphics.Brush.verticalGradient(0.55f to keep, 1f to gone, startY = top, endY = top + h), Offset(left, top), Size(w, h), blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, ) + if (fadeTop && h > 0f) drawRect( + androidx.compose.ui.graphics.Brush.verticalGradient(0f to gone, (24.dp.toPx() / h).coerceAtMost(1f) to keep, startY = top, endY = top + h), + Offset(left, top), Size(w, h), blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, + ) } drawContext.canvas.restore() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt index cfe1dda82a..f2adebd9bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsSearch.kt @@ -33,6 +33,9 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.droiddeck.launcher.R +import androidx.compose.ui.input.pointer.PointerEventPass +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.semantics.clearAndSetSemantics // Grows out of the search button over the section pills, with the same spring as the other page searches. @OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) @@ -58,7 +61,11 @@ internal fun SettingsPillSearch( Modifier.fillMaxWidth().padding(end = 52.dp) .graphicsLayer { alpha = 1f - open; translationX = -24.dp.toPx() * open } .focusProperties { enter = { if (searching) FocusRequester.Cancel else FocusRequester.Default } } - .focusGroup(), + .focusGroup() + .then(if (searching) Modifier.clearAndSetSemantics {} else Modifier) + .then(if (searching) Modifier.pointerInput(Unit) { + awaitPointerEventScope { while (true) awaitPointerEvent(PointerEventPass.Initial).changes.forEach { it.consume() } } + } else Modifier), ) { pills() } if (searching || open > 0.01f) { val w = lerp(44.dp, (full - 40.dp).coerceIn(44.dp, 640.dp), open) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt index 4d124646b9..66fcc94965 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresMotion.kt @@ -129,6 +129,8 @@ internal object StoresMotion { val dots = HashMap() var heroAt by mutableStateOf(null) + var heroFadeTop = false + var heroDrift: () -> Float = { 0f } var heroLands by mutableStateOf(false) From 384eb7821582cd2c399eab4b8b4b465b11122987 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:47:12 -0500 Subject: [PATCH 08/60] fix: set aside an unreadable game environment file (#2808) fix: set aside an unreadable game environment file instead of failing every session --- .../launcher/session/GameEnvironmentStore.kt | 13 ++++++++++++- .../launcher/session/GameEnvironmentStoreTest.kt | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index e00b1912fa..d4bdce833e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.util.AtomicFile +import android.util.Log import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.runtime.LinuxRuntime @@ -9,6 +10,7 @@ import org.json.JSONObject import java.io.File object GameEnvironmentStore { + private const val TAG = "GameEnvironmentStore" private const val SETTINGS = "game-environment.json" private const val GUEST_FILE = "root/.config/droiddeck/game-environment.json" const val DXVK_CONFIG = "dxvkConfig" @@ -19,7 +21,16 @@ object GameEnvironmentStore { fun read(context: Context): GameEnvironment.Config { val file = AtomicFile(File(context.filesDir, SETTINGS)) val bytes = try { file.readFully() } catch (_: java.io.FileNotFoundException) { return GameEnvironment.Config() } - return decode(JSONObject(bytes.toString(Charsets.UTF_8))) + return try { + decode(JSONObject(bytes.toString(Charsets.UTF_8))) + } catch (error: Exception) { + if (error !is org.json.JSONException && error !is IllegalArgumentException) throw error + val aside = File(context.filesDir, "$SETTINGS.unreadable") + Log.w(TAG, "game environment settings are unreadable, set aside as ${aside.name}", error) + aside.delete() + file.baseFile.renameTo(aside) + GameEnvironment.Config() + } } fun decode(json: JSONObject): GameEnvironment.Config { diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt index 3cae943151..273d91d1d9 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/GameEnvironmentStoreTest.kt @@ -323,4 +323,19 @@ class GameEnvironmentStoreTest { assertEquals(mapOf("DD_SYNC" to "1", "DXVK_HUD" to "fps"), config.shared) assertEquals(mapOf("DD_FSYNC_FIRST" to "1", "DD_SYNC_FALLBACK" to "1"), config.games["440"]) } + + @Test fun unreadableSettingsAreSetAsideAndSessionsStillStart() { + val settings = File(context.filesDir, "game-environment.json") + val aside = File(context.filesDir, "game-environment.json.unreadable") + aside.delete() + for (broken in listOf("", """{"version":1,"shared":{"bad name":"1"}}""")) { + settings.writeText(broken) + assertEquals(GameEnvironment.Config(), GameEnvironmentStore.read(context)) + assertFalse(settings.exists()) + assertEquals(broken, aside.readText()) + } + GameEnvironmentStore.publish(context) + assertEquals(1, JSONObject(guest.readText()).getInt("version")) + aside.delete() + } } From c1cf0f3a9c1caab0e11114f0249739ffa305e0be Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:47:42 -0500 Subject: [PATCH 09/60] feat(agent): hold to talk, slide up to lock, let go to send, with guided voice setup (#2796) --- app/src/main/AndroidManifest.xml | 3 + .../droiddeck/launcher/core/WirelessAdbFix.kt | 11 ++ .../com/droiddeck/launcher/ui/AgentPage.kt | 180 ++++++++++++++---- .../com/droiddeck/launcher/ui/AgentVoice.kt | 154 +++++++++++++-- .../droiddeck/launcher/ui/AgentVoiceSetup.kt | 160 ++++++++++++++++ app/src/main/res/values/strings.xml | 9 + 6 files changed, 471 insertions(+), 46 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AgentVoiceSetup.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0b4ea04725..aff5658bbe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,9 @@ + + + diff --git a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt index 784b39d748..5c8b32f7ba 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/WirelessAdbFix.kt @@ -235,6 +235,17 @@ object WirelessAdbFix { fun hasSavedPairing(context: Context): Boolean = savedConnection(context.applicationContext) != null + fun savedPairingIsLocal(context: Context): Boolean = savedConnection(context.applicationContext)?.host + ?.let { host -> + // Unlike isLocalAddress, an address that cannot be matched to this device's own counts as remote. + runCatching { + val address = InetAddress.getByName(host) + address.isLoopbackAddress || NetworkInterface.getNetworkInterfaces().toList().any { network -> + network.inetAddresses.toList().any { it.address.contentEquals(address.address) } + } + }.getOrDefault(false) + } == true + fun clearCachedApps(context: Context) { shell(context, "am kill-all") } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index cf9080417e..32c48765bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -19,9 +19,11 @@ import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.awaitEachGesture import androidx.compose.foundation.gestures.awaitFirstDown +import androidx.compose.foundation.gestures.waitForUpOrCancellation import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.WindowInsets @@ -55,6 +57,7 @@ import androidx.compose.material.icons.outlined.Build import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.ExpandMore import androidx.compose.material.icons.outlined.History +import androidx.compose.material.icons.outlined.Lock import androidx.compose.material.icons.outlined.Memory import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.Pets @@ -95,6 +98,7 @@ import androidx.compose.ui.input.key.onPreviewKeyEvent import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollSource import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.input.pointer.PointerEventPass import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.onGloballyPositioned @@ -305,7 +309,7 @@ private fun AgentPageContent( } } androidx.compose.animation.AnimatedVisibility(!hidden, enter = expandVertically() + fadeIn(), exit = shrinkVertically() + fadeOut()) { - AgentComposer(composer, draft, visible, inlineControls, onPanel = { panel = it }, onSent = toLatest) + AgentComposer(composer, draft, visible && started, inlineControls, onPanel = { panel = it }, onSent = toLatest) } } } @@ -704,9 +708,23 @@ private fun AgentEditor(composer: ComposerState, draftState: MutableState voice.finish(send) + voice.finishing -> Unit + else -> send() + } + } val working = AgentHost.state == AgentHost.State.WORKING if (draft.startsWith("/") && !draft.contains(' ')) { val matches = (LOCAL_COMMANDS + CLI_COMMANDS).filter { it.startsWith(draft) && it != draft } @@ -726,23 +744,35 @@ private fun AgentEditor(composer: ComposerState, draftState: MutableState Unit = { modifier -> Box(modifier.padding(start = 8.dp, top = 10.dp, bottom = 10.dp)) { if (draft.isEmpty()) Text( - stringResource(if (working) R.string.agent_hint_working else R.string.agent_hint), fontSize = 16.sp, + stringResource( + when { + voice.listening && !voice.locked -> R.string.agent_voice_hold + voice.listening -> R.string.agent_voice_listening + working -> R.string.agent_hint_working + else -> R.string.agent_hint + }, + ), + fontSize = 16.sp, color = pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, ) BasicTextField( - draft, { draft = it }, + draft, { + draft = it + if (voice.listening) voice.stop() + }, Modifier.fillMaxWidth().focusRequester(field).onFocusChanged { focused = it.isFocused composer.focused = it.isFocused @@ -751,50 +781,132 @@ private fun AgentEditor(composer: ComposerState, draftState: MutableState Unit = { if (working) RoundButton(Icons.Outlined.Stop, stringResource(R.string.agent_stop), pal.error.copy(alpha = 0.22f), colors.error, "agent-stop") { AgentHost.stop(context) } val canSend = draft.isNotBlank() || AgentAttachments.pending.isNotEmpty() // An empty message has nothing to send, so the button there dictates one instead. - if ((!canSend || voice.listening) && voiceAvailable) VoiceButton(voice) { voice.start(draft) } - else RoundButton( + if ((!canSend || voice.listening) && !voice.finishing) VoiceButton(voice, onStart = { voice.start(draft) }, onSend = send, onSetup = { voiceSetup = true }) + if (voice.finishing || (voice.listening && voice.locked) || (canSend && !voice.listening)) RoundButton( Icons.AutoMirrored.Outlined.Send, stringResource(if (working) R.string.agent_queue else R.string.agent_send), - if (canSend) pal.primary else pal.surfaceVariant, if (canSend) pal.onPrimary else pal.onSurfaceVariant, "agent-send", enabled = canSend, - ) { - voice.stop() - send() + pal.primary, pal.onPrimary, "agent-send", enabled = !voice.finishing, + ) { sendNow() } + } + if (stacked) Column { + text(Modifier.fillMaxWidth()) + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + if (attach) AttachButton() + if (AgentAttachments.gameFrame != null) GameFrameButton() + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(1f).height(42.dp)) { if (controls != null && !focused) controls() } + actions() } + } else Row(verticalAlignment = Alignment.Bottom) { + if (attach) AttachButton() + if (AgentAttachments.gameFrame != null) GameFrameButton() + text(Modifier.weight(1f)) + if (controls != null && !focused) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.height(42.dp)) { controls() } + actions() } } } +/** + * Held, it listens until let go and then sends; slid up, it keeps listening hands-free; slid left, it puts the text back. + * A tap or a controller press also listens hands-free. + */ @Composable -private fun VoiceButton(voice: AgentVoice, onStart: () -> Unit) { +private fun VoiceButton(voice: AgentVoice, onStart: () -> Unit, onSend: () -> Unit, onSetup: () -> Unit) { val context = LocalContext.current val pal = LocalPalette.current - val ask = if (LocalActivityResultRegistryOwner.current != null) rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> - if (granted) onStart() else android.widget.Toast.makeText(context, R.string.agent_voice_denied, android.widget.Toast.LENGTH_SHORT).show() - } else null - RoundButton( - if (voice.listening) Icons.Outlined.MicOff else Icons.Outlined.Mic, stringResource(if (voice.listening) R.string.agent_voice_stop else R.string.agent_voice), - if (voice.listening) pal.primary else pal.surfaceVariant, if (voice.listening) pal.onPrimary else pal.onBackground, "agent-voice", - ) { + val start by rememberUpdatedState(onStart) + val send by rememberUpdatedState(onSend) + val setup by rememberUpdatedState(onSetup) + val handsFree = { + start() + if (voice.listening) voice.locked = true + } + val toggle = { when { voice.listening -> voice.finish() - context.checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == android.content.pm.PackageManager.PERMISSION_GRANTED -> onStart() - ask != null -> ask.launch(android.Manifest.permission.RECORD_AUDIO) - else -> android.widget.Toast.makeText(context, R.string.agent_voice_denied, android.widget.Toast.LENGTH_SHORT).show() + !voiceReady(context) -> setup() + else -> handsFree() } } + val density = LocalDensity.current + val lockPx = with(density) { 56.dp.toPx() } + val cancelPx = with(density) { 72.dp.toPx() } + var drag by remember { mutableStateOf(Offset.Zero) } + val holding = voice.listening && !voice.locked + val icon = when { + voice.locked -> Icons.Outlined.MicOff + holding && -drag.x > cancelPx / 2 && -drag.x > -drag.y -> Icons.Outlined.Close + holding && -drag.y > lockPx / 2 -> Icons.Outlined.Lock + else -> Icons.Outlined.Mic + } + val scale = if (holding) 1.12f + 0.12f * voice.level else 1f + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = 6.dp).size(42.dp).graphicsLayer { + scaleX = scale + scaleY = scale + }.clip(CircleShape).background(if (voice.listening) pal.primary else pal.surfaceVariant) + .pointerInput(voice) { + awaitEachGesture { + val down = awaitFirstDown(pass = PointerEventPass.Initial) + down.consume() + if (voice.listening || !voiceReady(context)) { + waitForUpOrCancellation(PointerEventPass.Initial)?.let { + it.consume() + toggle() + } + return@awaitEachGesture + } + start() + var resolved = !voice.listening + try { + while (!resolved) { + val change = awaitPointerEvent(PointerEventPass.Initial).changes.firstOrNull { it.id == down.id } ?: break + // Compose ends a cancelled touch stream with a lift that arrives already consumed; that is not a release. + if (!change.pressed && change.isConsumed) break + change.consume() + drag = change.position - down.position + when { + !voice.listening -> resolved = true + drag.y < -lockPx -> { + voice.locked = true + resolved = true + } + drag.x < -cancelPx -> { + voice.cancel() + resolved = true + } + !change.pressed -> { + val tap = change.uptimeMillis - down.uptimeMillis < viewConfiguration.longPressTimeoutMillis / 2 && + drag.getDistance() < viewConfiguration.touchSlop + if (tap) voice.locked = true else voice.finish(send) + resolved = true + } + } + } + } finally { + drag = Offset.Zero + if (!resolved && voice.listening && !voice.locked) voice.finish() + } + } + } + .clickable(onClick = toggle).testTag("agent-voice"), + ) { + Icon( + icon, stringResource(if (voice.listening) R.string.agent_voice_stop else R.string.agent_voice), + tint = if (voice.listening) pal.onPrimary else pal.onBackground, modifier = Modifier.size(21.dp), + ) + } } /** Attaches what the running game shows, taken from its own surface so nothing drawn over it is in the picture. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt index a6d78e599e..95ce56e58e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoice.kt @@ -1,44 +1,93 @@ package com.droiddeck.launcher.ui +import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.ServiceConnection +import android.os.Build +import android.os.IBinder import android.os.Bundle +import android.os.Handler +import android.os.Looper import android.speech.RecognitionListener +import android.speech.RecognitionService import android.speech.RecognizerIntent import android.speech.SpeechRecognizer import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -/** Dictation into the Agent editor: what is heard so far follows the text already typed, until the user edits the draft. */ +/** + * Dictation into the Agent editor: what is heard so far follows the text already typed, until the user edits the draft. + * Listening carries on across pauses until [finish], which can send once the last words are written. + */ internal class AgentVoice(private val context: Context, private val draft: () -> String, private val onText: (String) -> Unit) { var listening by mutableStateOf(false) private set + /** Whether listening goes on without the button held. */ + var locked by mutableStateOf(false) + /** How loud the speech is, from 0 to 1. */ + var level by mutableFloatStateOf(0f) + private set + /** Set when the speech service could not open the microphone, which a fresh install of Speech Services by Google cannot until allowed. */ + var serviceMicBlocked by mutableStateOf(false) private var recognizer: SpeechRecognizer? = null + private var typed = "" private var base = "" private var written = "" + /** Set between [finish] and the final result, while a send may still be waiting on the last words. */ + var finishing by mutableStateOf(false) + private set + private var then: (() -> Unit)? = null + private val main = Handler(Looper.getMainLooper()) fun start(typed: String) { stop() - val speech = runCatching { SpeechRecognizer.createSpeechRecognizer(context) }.getOrNull() ?: return + val service = component(context) + val speech = runCatching { SpeechRecognizer.createSpeechRecognizer(context, service) }.getOrNull() ?: return recognizer = speech - base = typed.trimEnd().let { if (it.isEmpty()) it else "$it " } + if (service != null && !isDefault(context)) lend(service) + this.typed = typed + base = continued(typed) written = typed + finishing = false + listening = true speech.setRecognitionListener(object : RecognitionListener { - override fun onReadyForSpeech(params: Bundle?) { listening = true } + override fun onReadyForSpeech(params: Bundle?) {} override fun onBeginningOfSpeech() {} - override fun onRmsChanged(rmsdB: Float) {} + override fun onRmsChanged(rmsdB: Float) { if (recognizer === speech) level = ((rmsdB + 2f) / 12f).coerceIn(0f, 1f) } override fun onBufferReceived(buffer: ByteArray?) {} - override fun onEndOfSpeech() {} - override fun onError(error: Int) { if (recognizer === speech) stop() } + override fun onEndOfSpeech() { level = 0f } + override fun onError(error: Int) { + if (recognizer !== speech) return + // The recognizer gives up on a pause; the user is still talking until they let go or stop. + if (!finishing && (error == SpeechRecognizer.ERROR_NO_MATCH || error == SpeechRecognizer.ERROR_SPEECH_TIMEOUT)) { + base = continued(written) + relisten(speech) + } else { + done() + if (error == SpeechRecognizer.ERROR_AUDIO || error == SpeechRecognizer.ERROR_INSUFFICIENT_PERMISSIONS) serviceMicBlocked = true + } + } override fun onResults(results: Bundle?) { if (recognizer !== speech) return heard(results) - stop() + if (recognizer !== speech) return + if (finishing) done() else { + base = continued(written) + relisten(speech) + } } override fun onPartialResults(partialResults: Bundle?) { if (recognizer === speech) heard(partialResults) } override fun onEvent(eventType: Int, params: Bundle?) {} }) + listen(speech) + } + + private fun continued(text: String) = text.trimEnd().let { if (it.isEmpty()) it else "$it " } + + private fun listen(speech: SpeechRecognizer) { val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) .putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM) .putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true) @@ -46,22 +95,71 @@ internal class AgentVoice(private val context: Context, private val draft: () -> runCatching { speech.startListening(intent) }.onFailure { stop() } } + private fun relisten(speech: SpeechRecognizer) { + main.post { if (recognizer === speech && !finishing) listen(speech) } + } + private fun heard(results: Bundle?) { val spoken = results?.getStringArrayList(SpeechRecognizer.RESULTS_RECOGNITION)?.firstOrNull()?.takeIf { it.isNotBlank() } ?: return - if (draft() != written) return stop() + if (draft() != written) return if (finishing) done() else stop() written = base + spoken onText(written) } - /** Ends listening but keeps the recognizer until its final result arrives. */ - fun finish() { + /** Ends listening but keeps the recognizer until its final result arrives, then runs [then]. */ + fun finish(then: (() -> Unit)? = null) { val speech = recognizer ?: return + finishing = true + this.then = then listening = false - runCatching { speech.stopListening() }.onFailure { stop() } + locked = false + level = 0f + runCatching { speech.stopListening() }.onFailure { done() } + // Some recognizers never answer a stop with nothing heard. + main.postDelayed({ if (recognizer === speech) done() }, FINAL_RESULT_TIMEOUT_MS) + } + + private fun done() { + val next = then + stop() + next?.invoke() + } + + /** Stops listening, but a send already waiting on the last words goes ahead with what was heard. */ + fun settle() { + if (finishing) done() else stop() + } + + /** Stops and puts back the text typed before listening began. */ + fun cancel() { + val restore = draft() == written + stop() + if (restore) onText(typed) + } + + private var lent: ServiceConnection? = null + + // Android passes the microphone only to the default speech service on its own; any other one records silence unless + // the app in front binds it with its own capabilities for as long as it listens. + private fun lend(service: ComponentName) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return + val connection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName?, binder: IBinder?) {} + override fun onServiceDisconnected(name: ComponentName?) {} + } + val intent = Intent(RecognitionService.SERVICE_INTERFACE).setComponent(service) + if (runCatching { context.bindService(intent, connection, Context.BIND_AUTO_CREATE or Context.BIND_INCLUDE_CAPABILITIES) }.getOrDefault(false)) lent = connection + else runCatching { context.unbindService(connection) } } fun stop() { + lent?.let { runCatching { context.unbindService(it) } } + lent = null + then = null + finishing = false listening = false + locked = false + level = 0f val speech = recognizer ?: return recognizer = null runCatching { speech.cancel() } @@ -69,6 +167,38 @@ internal class AgentVoice(private val context: Context, private val draft: () -> } companion object { + private const val FINAL_RESULT_TIMEOUT_MS = 3000L + fun available(context: Context) = SpeechRecognizer.isRecognitionAvailable(context) + + /** The package that turns speech into text, if one is installed. */ + fun service(context: Context): String? = component(context)?.packageName + + const val DEFAULT_SETTING = "voice_recognition_service" + + private fun chosen(context: Context) = android.provider.Settings.Secure.getString(context.contentResolver, DEFAULT_SETTING) + ?.takeIf { it.isNotBlank() }?.let(ComponentName::unflattenFromString) + + private fun installed(context: Context) = context.packageManager.queryIntentServices(Intent(RecognitionService.SERVICE_INTERFACE), 0) + .map { ComponentName(it.serviceInfo.packageName, it.serviceInfo.name) } + + // Installing a speech service does not always make it the system's choice, and without one Android refuses to listen. + fun component(context: Context): ComponentName? { + val chosen = chosen(context) + val installed = installed(context) + return installed.firstOrNull { it == chosen } ?: installed.firstOrNull() + } + + /** + * Whether the installed service is the system's chosen one. Android only passes DroidDeck's right to the microphone on to that one; + * any other service hears silence once DroidDeck is in front. + */ + fun isDefault(context: Context): Boolean { + val chosen = chosen(context) ?: return false + return chosen in installed(context) + } + + fun serviceHears(context: Context, service: String) = + context.packageManager.checkPermission(android.Manifest.permission.RECORD_AUDIO, service) == android.content.pm.PackageManager.PERMISSION_GRANTED } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentVoiceSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoiceSetup.kt new file mode 100644 index 0000000000..66be2e4ccf --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentVoiceSetup.kt @@ -0,0 +1,160 @@ +package com.droiddeck.launcher.ui + +import android.Manifest +import android.app.Activity +import android.content.Context +import android.content.ContextWrapper +import android.content.Intent +import android.content.pm.PackageManager +import android.net.Uri +import android.provider.Settings +import androidx.activity.compose.LocalActivityResultRegistryOwner +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.WirelessAdbFix + +private const val SPEECH_SERVICES = "com.google.android.tts" + +/** Whether the mic can turn speech into text: a speech service is installed, and it and DroidDeck may both use the microphone. */ +internal fun voiceReady(context: Context): Boolean { + val service = AgentVoice.service(context) ?: return false + return appHears(context) && AgentVoice.serviceHears(context, service) +} + +/** Runs [command] over the saved Wireless debugging pairing off the main thread, then [done] on it with whether it worked. */ +private fun adb(context: Context, command: String, done: (Boolean) -> Unit) { + val app = context.applicationContext + Thread({ + // The pairing can be with another device, where the grant would land instead of here. + val ok = runCatching { WirelessAdbFix.savedPairingIsLocal(app) }.getOrDefault(false) && runCatching { WirelessAdbFix.shell(app, command) }.isSuccess + android.os.Handler(android.os.Looper.getMainLooper()).post { done(ok) } + }, "agent-voice-setup").start() +} + +private fun appHears(context: Context) = context.checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED + +/** Opens [intent] over DroidDeck when it can, so Back comes straight back to the setup. */ +private fun open(context: Context, intent: Intent): Boolean { + var base = context + while (base !is Activity && base is ContextWrapper) base = base.baseContext + return runCatching { + if (base is Activity) base.startActivity(intent) else context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + }.isSuccess +} + +private fun openAppInfo(context: Context, pkg: String) { + open(context, Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", pkg, null))) +} + +private fun openStore(context: Context) { + if (!open(context, Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$SPEECH_SERVICES")))) { + open(context, Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=$SPEECH_SERVICES"))) + } +} + +/** What talking to the agent still needs, each step one button away, checked again whenever DroidDeck comes back. */ +@Composable +internal fun AgentVoiceSetup(onReady: () -> Unit, onClose: () -> Unit) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var checks by remember { mutableIntStateOf(0) } + val owner = LocalLifecycleOwner.current + DisposableEffect(owner) { + val observer = LifecycleEventObserver { _, event -> if (event == Lifecycle.Event.ON_RESUME) checks++ } + owner.lifecycle.addObserver(observer) + onDispose { owner.lifecycle.removeObserver(observer) } + } + val service = remember(checks) { AgentVoice.service(context) } + val appMic = remember(checks) { appHears(context) } + val serviceMic = remember(checks, service) { service != null && AgentVoice.serviceHears(context, service) } + val paired = remember(checks) { WirelessAdbFix.hasSavedPairing(context) } + var working by remember { mutableStateOf(false) } + val shown = remember { booleanArrayOf(true) } + DisposableEffect(Unit) { onDispose { shown[0] = false } } + // A saved pairing does not mean Wireless debugging is on now, so a refusal falls back to doing it by hand. + val viaAdb: (String, () -> Unit) -> Unit = { command, byHand -> + working = true + adb(context, command) { ok -> + working = false + checks++ + if (!ok && shown[0]) byHand() + } + } + LaunchedEffect(service, appMic, serviceMic) { if (service != null && appMic && serviceMic) onReady() } + val ask = if (LocalActivityResultRegistryOwner.current != null) rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted -> + // Android stops asking after the user refuses twice; the switch is then only in App info. + if (granted) checks++ else openAppInfo(context, context.packageName) + } else null + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14).testTag("agent-voice-setup"), + ) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(start = 14.dp, end = 6.dp, top = 6.dp)) { + Text( + stringResource(R.string.agent_voice_setup), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.weight(1f), + ) + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(36.dp).clip(CircleShape).clickable(onClick = onClose)) { + Icon(Icons.Outlined.Close, stringResource(R.string.agent_voice_setup_close), tint = pal.onSurfaceVariant, modifier = Modifier.size(18.dp)) + } + } + CheckRow( + if (service != null) CheckState.OK else CheckState.WARN, stringResource(R.string.agent_voice_setup_service), + if (service == null) stringResource(R.string.agent_voice_setup_service_detail) else null, + action = if (service == null) ({ SecondaryButton(stringResource(R.string.setup_install), compact = true) { openStore(context) } }) else null, + ) + CheckRow( + if (appMic) CheckState.OK else CheckState.WARN, stringResource(R.string.agent_voice_setup_app_mic), null, + action = if (!appMic) ({ + SecondaryButton(stringResource(R.string.libraries_access_allow), compact = true) { + if (ask != null) ask.launch(Manifest.permission.RECORD_AUDIO) else openAppInfo(context, context.packageName) + } + }) else null, + ) + CheckRow( + if (serviceMic) CheckState.OK else CheckState.WARN, stringResource(R.string.agent_voice_setup_service_mic), + if (service != null && !serviceMic && !paired) stringResource(R.string.agent_voice_setup_service_mic_detail) else null, divider = false, + action = if (service != null && !serviceMic) ({ + SecondaryButton(stringResource(R.string.libraries_access_allow), enabled = !working, compact = true) { + if (paired) viaAdb("pm grant $service ${Manifest.permission.RECORD_AUDIO}") { openAppInfo(context, service) } else openAppInfo(context, service) + } + }) else null, + ) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ba04b9f41..ed9fdd3820 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1238,6 +1238,15 @@ Add Dictate Stop dictating + Slide up to lock · left to cancel + Listening… + Set up talking to the agent + Close + Speech service + Speech Services by Google turns your voice into text + Microphone for DroidDeck + Microphone for the speech service + Permissions › Microphone › Allow DroidDeck needs the microphone to dictate Attach what the game shows Could not capture the game From c336f994e14da02ef7d45820af1ec9d69a834d4b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:47:44 -0500 Subject: [PATCH 10/60] Library store pills follow the new default store order (#2811) * fix(library): move an unarranged store order to the new default at startup * fix(stores): forget an unarranged store order instead of saving the default --- .../main/java/com/droiddeck/launcher/App.kt | 1 + .../launcher/session/SessionPrefs.kt | 14 ++++++ .../com/droiddeck/launcher/ui/StoresPage.kt | 13 +----- .../launcher/session/StoresTabOrderTest.kt | 45 +++++++++++++++++++ 4 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index cb66f1a925..1a45ab8512 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -53,6 +53,7 @@ class App : Application() { com.droiddeck.launcher.session.QuestExperimental.initialize(this) com.droiddeck.launcher.session.SessionPrefs.applyNtsyncDefault(this) com.droiddeck.launcher.session.SessionPrefs.settleGpuDriverMode(this) + com.droiddeck.launcher.session.SessionPrefs.settleStoresTabOrder(this, com.droiddeck.launcher.stores.Store.entries.map { it.id }) com.droiddeck.launcher.update.AppUpdates.init(this) com.droiddeck.launcher.update.UpdateWatch.sync(this, com.droiddeck.launcher.update.AppUpdates.follow(this, null)) com.droiddeck.launcher.core.DownloadSource.init(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 491608e9e1..a56bdb9b70 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -315,6 +315,20 @@ object SessionPrefs { fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) + private val LEGACY_STORES_TAB_ORDER = listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar") + + /** + * Forgets an order the user never arranged, so the Stores tabs and Library pills follow whatever the default is now. + * Earlier versions saved the default of their day, which is why a saved order alone does not mean the user chose it. + */ + fun settleStoresTabOrder(context: Context, defaults: List) { + if (storesTabOrderCustomized(context)) return + val saved = storesTabOrder(context) + if (saved.isEmpty()) return + if (saved == LEGACY_STORES_TAB_ORDER || saved == defaults) prefs(context).edit().remove("storesTabOrder").apply() + else setStoresTabOrderCustomized(context, true) + } + fun setStoresTabOrder(context: Context, order: List) { prefs(context).edit().putString("storesTabOrder", order.joinToString(",")).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 3ba8a1fb6d..e1602f8663 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -155,18 +155,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val padH = if (narrow) 14.dp else 22.dp val tabs = remember { androidx.compose.runtime.mutableStateListOf().apply { - val savedOrder = SessionPrefs.storesTabOrder(ctx) - if (!SessionPrefs.storesTabOrderCustomized(ctx)) { - val legacyOrder = listOf( - "gog", "epic", "amazon", "xbox", "itch", - "gamejolt", "battlenet", "ubisoft", "ea", "rockstar" - ) - if (savedOrder.isNotEmpty() && savedOrder != legacyOrder) { - SessionPrefs.setStoresTabOrderCustomized(ctx, true) - } else { - SessionPrefs.setStoresTabOrder(ctx, Store.entries.map { it.id }) - } - } + SessionPrefs.settleStoresTabOrder(ctx, Store.entries.map { it.id }) addAll(arrangeStoreTabs(SessionPrefs.storesTabOrder(ctx), SessionPrefs.storesTabHidden(ctx))) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt new file mode 100644 index 0000000000..23e340d3b4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.session + +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.arrangeStoreTabs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class StoresTabOrderTest { + private val app get() = RuntimeEnvironment.getApplication() + private val defaults = Store.entries.map { it.id } + private fun shown() = arrangeStoreTabs(SessionPrefs.storesTabOrder(app), emptySet()).map { it.store.id } + + @Test + fun anOldDefaultOrderMovesToTheCurrentOne() { + SessionPrefs.setStoresTabOrder(app, listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar")) + SessionPrefs.settleStoresTabOrder(app, defaults) + assertEquals(defaults, shown()) + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + } + + @Test + fun aSavedCurrentDefaultIsNotMistakenForTheUsersOwn() { + SessionPrefs.setStoresTabOrder(app, defaults) + repeat(2) { SessionPrefs.settleStoresTabOrder(app, defaults) } + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + } + + @Test + fun anArrangedOrderIsKept() { + val mine = defaults.reversed() + SessionPrefs.setStoresTabOrder(app, mine) + SessionPrefs.settleStoresTabOrder(app, defaults) + assertTrue(SessionPrefs.storesTabOrderCustomized(app)) + assertEquals(mine, shown()) + } +} From bdc18bdd03fafe43c2f30498f2d6deea590c09df Mon Sep 17 00:00:00 2001 From: Dantalian Date: Wed, 18 Nov 2026 13:53:45 +0800 Subject: [PATCH 11/60] fix(ui): pin the file manager toolbar ends so the exit stays reachable (#2564) fix(ui): pin the file manager toolbar ends so exit stays reachable Below 600dp the whole toolbar scrolls, so on a phone the star and the exit button sit past the right edge and need a swipe to reach. Scroll only the middle section instead, keeping the back arrow, the drive chip and exit in place, and move the grid list toggle into the sort menu to give that section room. The disabled back arrow also stops being painted primary, which made it look active at the drive root. Co-authored-by: Dantalian --- .../launcher/files/FileManagerScreen.kt | 226 +++++++++--------- 1 file changed, 117 insertions(+), 109 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 4da772b1e8..9945083226 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -40,12 +40,10 @@ import androidx.compose.material.icons.filled.ContentPaste import androidx.compose.material.icons.filled.CreateNewFolder import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Folder -import androidx.compose.material.icons.filled.GridView import androidx.compose.material.icons.filled.SdStorage import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Sort import androidx.compose.material.icons.filled.Star -import androidx.compose.material.icons.filled.ViewList import androidx.compose.material.icons.filled.StarBorder import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Smartphone @@ -727,11 +725,15 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.surfaceContainer) - .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) + val upEnabled = canGoUp && !cancellingNavigation + IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = upEnabled, modifier = Modifier.focusGlide(CircleShape)) { + Icon( + Icons.Filled.ArrowBack, + stringResource(R.string.fm_back), + tint = if (upEnabled) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f), + ) } val currentDriveLabel = stringResource(describeLocation(currentDir).driveLabel) @@ -794,113 +796,119 @@ fun FileManagerScreen( Spacer(Modifier.width(4.dp)) - if (showFavorites) { - Text( - text = stringResource(R.string.fm_favorites), - color = MaterialTheme.colorScheme.primary, - fontSize = 13.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), - ) - } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { - if (!compactToolbar) Spacer(Modifier.weight(1f)) - } else { - Text( - text = currentDir.name.ifBlank { currentDir.absolutePath }, - color = MaterialTheme.colorScheme.onSurface, - fontSize = 14.sp, - fontWeight = FontWeight.SemiBold, - maxLines = 1, - overflow = TextOverflow.Ellipsis, - modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), - ) - } - - if (launchDir != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) - } - if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) - } - - if (!showFavorites) { - if (!pickMode) { - OutlinedButton( - onClick = { showNewFolderDialog = true }, - border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), - contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), - modifier = Modifier.height(32.dp).focusGlide(CircleShape), - ) { - Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) - Spacer(Modifier.width(5.dp)) - Text(stringResource(R.string.fm_new_folder), color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) - } - } - IconButton(onClick = { - gridView = !gridView - browsePrefs.edit().putBoolean("fmGridView", gridView).apply() - }, modifier = Modifier.focusGlide(CircleShape)) { - Icon( - if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView, - if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view), - tint = MaterialTheme.colorScheme.onSurfaceVariant, + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .weight(1f) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier), + ) { + if (showFavorites) { + Text( + text = stringResource(R.string.fm_favorites), + color = MaterialTheme.colorScheme.primary, + fontSize = 13.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), + ) + } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { + if (!compactToolbar) Spacer(Modifier.weight(1f)) + } else { + Text( + text = currentDir.name.ifBlank { currentDir.absolutePath }, + color = MaterialTheme.colorScheme.onSurface, + fontSize = 14.sp, + fontWeight = FontWeight.SemiBold, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } - IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) - } - Box { - IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { - Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) - } - DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { - listOf("name" to stringResource(R.string.fm_sort_name), "date" to stringResource(R.string.fm_sort_date), "size" to stringResource(R.string.fm_prop_size)) - .forEach { (key, label) -> - DropdownMenuItem( - text = { - Text(if (sortBy == key) "$label ${if (sortDesc) "↓" else "↑"}" else label) - }, - onClick = { - if (sortBy == key) sortDesc = !sortDesc else { sortBy = key; sortDesc = false } - browsePrefs.edit().putString("fmSortBy", sortBy) - .putBoolean("fmSortDesc", sortDesc).apply() - showSortMenu = false - loadDirectory(currentDir, resetScroll = false) - }, - modifier = Modifier.focusGlide(), - ) - } - HorizontalDivider(color = MaterialTheme.colorScheme.outline) - DropdownMenuItem( - text = { Text(if (compactRows) stringResource(R.string.fm_rows_comfortable) else stringResource(R.string.fm_rows_compact)) }, - onClick = { - compactRows = !compactRows - browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() - showSortMenu = false - }, - modifier = Modifier.focusGlide(), - ) - DropdownMenuItem( - text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, - onClick = { - showHidden = !showHidden - browsePrefs.edit().putBoolean("fmShowHidden", showHidden).apply() - showSortMenu = false - loadDirectory(currentDir, resetScroll = false) - }, - modifier = Modifier.focusGlide(), - ) - } - } - } - IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { - if (showFavorites) { - Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) - } else { - Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) + if (launchDir != null) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) + } + if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) + } + + if (!showFavorites) { + if (!pickMode) { + OutlinedButton( + onClick = { showNewFolderDialog = true }, + border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), + contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), + modifier = Modifier.height(32.dp).focusGlide(CircleShape), + ) { + Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) + Spacer(Modifier.width(5.dp)) + Text(stringResource(R.string.fm_new_folder), color = MaterialTheme.colorScheme.onBackground, fontSize = 12.sp) + } + } + IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } + Box { + IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { + Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } + DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { + listOf("name" to stringResource(R.string.fm_sort_name), "date" to stringResource(R.string.fm_sort_date), "size" to stringResource(R.string.fm_prop_size)) + .forEach { (key, label) -> + DropdownMenuItem( + text = { + Text(if (sortBy == key) "$label ${if (sortDesc) "↓" else "↑"}" else label) + }, + onClick = { + if (sortBy == key) sortDesc = !sortDesc else { sortBy = key; sortDesc = false } + browsePrefs.edit().putString("fmSortBy", sortBy) + .putBoolean("fmSortDesc", sortDesc).apply() + showSortMenu = false + loadDirectory(currentDir, resetScroll = false) + }, + modifier = Modifier.focusGlide(), + ) + } + HorizontalDivider(color = MaterialTheme.colorScheme.outline) + DropdownMenuItem( + text = { Text(if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view)) }, + onClick = { + gridView = !gridView + browsePrefs.edit().putBoolean("fmGridView", gridView).apply() + showSortMenu = false + }, + modifier = Modifier.focusGlide(), + ) + DropdownMenuItem( + text = { Text(if (compactRows) stringResource(R.string.fm_rows_comfortable) else stringResource(R.string.fm_rows_compact)) }, + onClick = { + compactRows = !compactRows + browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() + showSortMenu = false + }, + modifier = Modifier.focusGlide(), + ) + DropdownMenuItem( + text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, + onClick = { + showHidden = !showHidden + browsePrefs.edit().putBoolean("fmShowHidden", showHidden).apply() + showSortMenu = false + loadDirectory(currentDir, resetScroll = false) + }, + modifier = Modifier.focusGlide(), + ) + } + } + } + + IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { + if (showFavorites) { + Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) + } else { + Icon(Icons.Filled.StarBorder, stringResource(R.string.fm_show_favorites), tint = MaterialTheme.colorScheme.onSurfaceVariant) + } } } if (!pickMode && onExit != null) { From 2f07e11ba0040aec05ba137bcf5c2a4d90104cc0 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:54:33 -0500 Subject: [PATCH 12/60] fix(build): make tools/build_local.sh work on x86_64 Linux (#2807) Building the full APK locally on an x86_64 Linux host (rootful Docker, no Docker Desktop) failed in the Xbox backend step and could not be rerun: - The xodus-cli tests re-execute their own arm64 test binary, which needs an aarch64 binfmt handler on the host. Without one the child runs through /bin/sh ("Syntax error: & unexpected"). build-local.sh now checks for the handler up front and prints the one-line fix. - msixvc's streaming tests give each request 40 ms. Under qemu with the whole suite in parallel they time out (28/30 pass in parallel, 30/30 serially), so they run with one test thread when emulated. Native arm64 is unchanged. - The backend container runs as root, so with rootful Docker its outputs in the repo and the cache were root-owned and the next build_local.sh could not remove them. The container now hands them back to the calling user on exit. - README lists the missing requirements: Go, a host C compiler, both MinGW-w64 compilers (i686 with DWARF-2 exceptions; Homebrew's SJLJ build cannot link Rust's i686-pc-windows-gnu) and the arm64 binfmt handler. Verified with a full tools/build_local.sh run on SteamOS (x86_64): all three backend test suites pass and the APK is release-signed. --- README.md | 2 +- tools/xbox/build-local.sh | 9 ++++++++- tools/xbox/build.sh | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 444107fa32..7154309b06 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Help, Preview builds and device reports are on [Discord](https://discord.gg/JRGA ## Build -Needs Docker, Java 17, the Android SDK and NDK, Rust via rustup, GitHub CLI, Python 3 and `zstd`. +Needs Docker, Java 17, the Android SDK and NDK, Rust via rustup, Go, a host C compiler, the x86_64 and i686 MinGW-w64 compilers (i686 with DWARF-2 exceptions, as Debian and Ubuntu ship it; SJLJ builds such as Homebrew's cannot link Rust's `i686-pc-windows-gnu`), GitHub CLI, Python 3 and `zstd`. On x86_64 Linux, Docker also needs an arm64 binfmt handler (`docker run --privileged --rm tonistiigi/binfmt --install arm64`). ```bash tools/build_local.sh diff --git a/tools/xbox/build-local.sh b/tools/xbox/build-local.sh index 979c95b12b..c833a403d0 100755 --- a/tools/xbox/build-local.sh +++ b/tools/xbox/build-local.sh @@ -10,6 +10,12 @@ build=' bash tools/xbox/build.sh ' if [[ $(uname -m) = x86_64 ]]; then + binfmt_magics=$(cat /proc/sys/fs/binfmt_misc/* 2>/dev/null || true) + if [[ $(uname -s) = Linux && $binfmt_magics != *'magic 7f454c460201010000000000000000000200b700'* ]]; then + echo "The Xbox backend tests re-execute their arm64 binaries, which needs an aarch64 binfmt handler on the host." >&2 + echo "Register one with: docker run --privileged --rm tonistiigi/binfmt --install arm64" >&2 + exit 1 + fi cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-cross"} platform=linux/amd64 image=droiddeck-xbox-cross:$(shasum -a 256 "$repo/tools/xbox/cross.Dockerfile" | cut -c1-12) @@ -28,4 +34,5 @@ fi mkdir -p "$cache" docker run --rm --platform "$platform" -v "$repo:/src" -v "$cache:/work" -w /src \ -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build "$image" \ - bash -lc "set -euo pipefail$build" + bash -lc "set -euo pipefail + trap 'chown -R $(id -u):$(id -g) /work /src/app/src/main/assets/linuxfs 2>/dev/null || true' EXIT$build" diff --git a/tools/xbox/build.sh b/tools/xbox/build.sh index 99bee8c76b..85cdbd3c62 100755 --- a/tools/xbox/build.sh +++ b/tools/xbox/build.sh @@ -16,7 +16,9 @@ cargo build --locked --release --no-default-features --target aarch64-unknown-li if [[ $(uname -m) = aarch64 || -n ${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER:-} ]]; then cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus-cli cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus credential_ - cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p msixvc streaming_ + msixvc_env=() + [[ $(uname -m) = aarch64 ]] || msixvc_env=(RUST_TEST_THREADS=1) + env "${msixvc_env[@]}" cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p msixvc streaming_ fi for binary in xodus-cli xodus-service; do install -m755 "$CARGO_TARGET_DIR/aarch64-unknown-linux-gnu/release/$binary" "$out/$binary" From bf0260de6107bb29a3c52897b7ffb6348b0fbbd1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:56:02 -0500 Subject: [PATCH 13/60] fix(effects): keep upscaling and sharpening at panel size with frame generation on (#2728) * fix(effects): keep upscaling and sharpening at panel size with frame generation on * fix(effects): stub sharpening query in the terminal callers probe --- .../main/cpp/waylandcomp/src/effects_chain.c | 4 +++ .../main/cpp/waylandcomp/src/effects_chain.h | 1 + app/src/main/cpp/waylandcomp/src/vk_present.c | 2 +- tools/tests/test_effects_source_resolution.py | 30 +++++++++++++++++-- tools/tests/vk_terminal_callers_test.c | 1 + 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/waylandcomp/src/effects_chain.c b/app/src/main/cpp/waylandcomp/src/effects_chain.c index 141a536229..385a46b322 100644 --- a/app/src/main/cpp/waylandcomp/src/effects_chain.c +++ b/app/src/main/cpp/waylandcomp/src/effects_chain.c @@ -155,6 +155,10 @@ int vkp_effects_upscaling(void) { return spatial_mode(g_cur.scaling) && g_cur.scaling != 6; } +int vkp_effects_sharpening(void) { + return vkp_effects_upscaling() || cas_active(&g_cur); +} + int vkp_effects_postprocessing(void) { vkp_effects_sync(); return effect_count(&g_cur) > 0; diff --git a/app/src/main/cpp/waylandcomp/src/effects_chain.h b/app/src/main/cpp/waylandcomp/src/effects_chain.h index 25f00225fc..bb1ca5ae1f 100644 --- a/app/src/main/cpp/waylandcomp/src/effects_chain.h +++ b/app/src/main/cpp/waylandcomp/src/effects_chain.h @@ -11,6 +11,7 @@ int vkp_effects_sync(void); int vkp_effects_active(void); int vkp_effects_upscaling(void); +int vkp_effects_sharpening(void); int vkp_effects_postprocessing(void); VkFilter vkp_effects_blit_filter(void); diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index 8c595d1711..53ddadaeb0 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -2179,7 +2179,7 @@ static int render_impl(int scene_w, int scene_h, const struct vkp_draw *draws, i VkImageLayout result_layout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; if (fx) { int mapped_w = (int)(scene_w * g_map.kx + 0.5f), mapped_h = (int)(scene_h * g_map.ky + 0.5f); - if (fg) { mapped_w = scene_w; mapped_h = scene_h; } + if (fg && !vkp_effects_sharpening()) { mapped_w = scene_w; mapped_h = scene_h; } vkp_effects_set_formats(scene_fmt, scene_fmt); result = vkp_effects_run(cmd, scene_img, input_w, input_h, mapped_w, mapped_h, &rw, &rh); effects_overlay_draws(cmd, result, rw, rh, scene_w, scene_h, diff --git a/tools/tests/test_effects_source_resolution.py b/tools/tests/test_effects_source_resolution.py index 043f392129..aae6052cec 100644 --- a/tools/tests/test_effects_source_resolution.py +++ b/tools/tests/test_effects_source_resolution.py @@ -33,7 +33,9 @@ class EffectsSourceResolutionTest(unittest.TestCase): 'static void effects_overlay_draws(', 'static int render_impl(', 'static int pass_begin_impl(')) functions = (re.search(r'static int spatial_mode\([^\n]+', effects).group() + '\n' + + re.search(r'static int cas_active\([^\n]+', effects).group() + '\n' + function(effects, 'int vkp_effects_upscaling(') + + function(effects, 'int vkp_effects_sharpening(') + function(effects, 'int vkp_effects_postprocessing(') + functions) image = source[source.index('struct vkp_image {'):source.index('\n};', source.index('struct vkp_image {')) + 3] draw = header[header.index('struct vkp_draw {'):header.index('\n};', header.index('struct vkp_draw {')) + 3] @@ -101,6 +103,9 @@ class EffectsSourceResolutionTest(unittest.TestCase): def test_postprocessing_keeps_foreground_inside_the_effect_chain(self): self.check_case('postprocessing') + def test_frame_generation_keeps_upscaling_and_sharpening_at_panel_size(self): + self.check_case('framegen-sharpening') + TYPES = r''' #include @@ -192,7 +197,8 @@ static struct vkp_img_slot g_hdrscene, g_fgscene; static struct { int active, rw, rh; VkImage result; } g_pass; static struct { int64_t present_ns, present_max_ns; unsigned presents; } g_perf; static int effects_active = 1, framegen, cardboard; -static struct { int scaling; } g_cur = {4}; +struct fx_settings { int scaling, cas_on, cas_pct; }; +static struct fx_settings g_cur = {4}; static int copy_count, effects_count, screen_count, hdr_count, fail_scene, fail_effects, postprocessing; static int copied_w, copied_h, target_w, target_h; static int effects_w, effects_h, output_w, output_h, logical_w, logical_h; @@ -276,7 +282,7 @@ static struct vkp_draw fullscreen(void) { } static void reset(void) { copy_count = effects_count = screen_count = hdr_count = barrier_count = 0; - effects_active = 1; g_cur.scaling = 4; + effects_active = 1; g_cur = (struct fx_settings){4}; framegen = cardboard = fail_scene = fail_effects = postprocessing = g_plain_frame = 0; g_pass.active = 0; g_extent = (VkExtent2D){1920, 1080}; image.w = 1280; image.h = 720; @@ -552,6 +558,25 @@ static void check_allocation(void) { assert(recorded_blits[1].dstOffsets[1].x == 1920 && recorded_blits[1].dstOffsets[1].y == 1080); assert(target_w == 1920 && target_h == 1080); } +static void check_framegen_output(int scaling, int cas, int grading, int panel) { + reset(); framegen = 1; postprocessing = grading; + g_cur = (struct fx_settings){scaling, cas, cas ? 60 : 0}; + g_extent = (VkExtent2D){2880, 1620}; + struct vkp_draw draw = fullscreen(); + run_path(0, &draw, 1, NULL); + assert(effects_count == 1); + assert(output_w == (panel ? 2880 : 1920) && output_h == (panel ? 1620 : 1080)); +} +static void check_framegen_sharpening(void) { + check_framegen_output(4, 0, 0, 1); + check_framegen_output(3, 0, 0, 1); + check_framegen_output(8, 0, 0, 1); + check_framegen_output(0, 1, 1, 1); + check_framegen_output(1, 1, 1, 1); + check_framegen_output(0, 0, 1, 0); + check_framegen_output(6, 0, 0, 0); + check_framegen_output(2, 0, 1, 0); +} int main(int argc, char **argv) { assert(argc == 2); reset(); if (!strcmp(argv[1], "helper")) check_helper(); @@ -567,6 +592,7 @@ int main(int argc, char **argv) { else if (!strcmp(argv[1], "effect-failure")) check_effect_failure(); else if (!strcmp(argv[1], "overlay-barriers")) check_overlay_barriers(); else if (!strcmp(argv[1], "postprocessing")) check_postprocessing(); + else if (!strcmp(argv[1], "framegen-sharpening")) check_framegen_sharpening(); else assert(0); puts("PASS"); } diff --git a/tools/tests/vk_terminal_callers_test.c b/tools/tests/vk_terminal_callers_test.c index c5857a7710..2398608bd2 100644 --- a/tools/tests/vk_terminal_callers_test.c +++ b/tools/tests/vk_terminal_callers_test.c @@ -72,6 +72,7 @@ PFN_vkGetInstanceProcAddr vk_loader_gipa(void) { return NULL; } void vkp_effects_bind_device(VkDevice d, VkPhysicalDevice p, const VkPhysicalDeviceMemoryProperties *m) {} int vkp_effects_active(void) { return 0; } int vkp_effects_upscaling(void) { return 0; } +int vkp_effects_sharpening(void) { return 0; } int vkp_effects_postprocessing(void) { return 0; } VkFilter vkp_effects_blit_filter(void) { return VK_FILTER_NEAREST; } void vkp_effects_set_formats(VkFormat a, VkFormat b) {} From ecd74fce793c80baaf271118267203bb6ebfd3a1 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 01:33:11 -0500 Subject: [PATCH 14/60] Save the store order only once the user arranges it (#2812) * fix(stores): save the store order only once the user arranges it * test(stores): exercise the tab save the hide toggle uses --- .../com/droiddeck/launcher/session/SessionPrefs.kt | 7 +++++++ .../main/java/com/droiddeck/launcher/ui/StoresPage.kt | 4 +--- .../droiddeck/launcher/session/StoresTabOrderTest.kt | 11 +++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index a56bdb9b70..1464ac37be 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -315,6 +315,13 @@ object SessionPrefs { fun storesTabOrder(context: Context): List = idList(prefs(context).getString("storesTabOrder", null)) + /** An order nobody arranged stays unsaved, so it keeps following the default. */ + fun saveStoresTabs(context: Context, order: List, hidden: Set, arranged: Boolean) { + if (arranged) setStoresTabOrderCustomized(context, true) + if (storesTabOrderCustomized(context)) setStoresTabOrder(context, order) + setStoresTabHidden(context, hidden) + } + private val LEGACY_STORES_TAB_ORDER = listOf("gog", "epic", "amazon", "xbox", "itch", "gamejolt", "battlenet", "ubisoft", "ea", "rockstar") /** diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index e1602f8663..440541dda4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -163,9 +163,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier var arranging by remember { mutableStateOf(false) } val shownStores = tabs.filter { it.shown }.map { it.store } fun commitTabs(markCustomized: Boolean = false) { - SessionPrefs.setStoresTabOrder(ctx, tabs.map { it.store.id }) - SessionPrefs.setStoresTabHidden(ctx, tabs.filterNot { it.shown }.map { it.store.id }.toSet()) - if (markCustomized) SessionPrefs.setStoresTabOrderCustomized(ctx, true) + SessionPrefs.saveStoresTabs(ctx, tabs.map { it.store.id }, tabs.filterNot { it.shown }.map { it.store.id }.toSet(), markCustomized) } fun shiftTab(store: Store, delta: Int) { val from = tabs.indexOfFirst { it.store == store } diff --git a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt index 23e340d3b4..fb1fb71a5d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/StoresTabOrderTest.kt @@ -42,4 +42,15 @@ class StoresTabOrderTest { assertTrue(SessionPrefs.storesTabOrderCustomized(app)) assertEquals(mine, shown()) } + + @Test + fun hidingAStoreLeavesTheOrderFollowingTheDefault() { + SessionPrefs.saveStoresTabs(app, defaults, setOf("itch"), arranged = false) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + val later = defaults.reversed() + SessionPrefs.settleStoresTabOrder(app, later) + assertFalse(SessionPrefs.storesTabOrderCustomized(app)) + assertTrue(SessionPrefs.storesTabOrder(app).isEmpty()) + assertEquals(setOf("itch"), SessionPrefs.storesTabHidden(app)) + } } From d89c2c1c2ddb76f04f296ce18b437678e3b37e00 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 01:59:01 -0500 Subject: [PATCH 15/60] Skip the inline page-out timing control when the machine is too fast for it (#2814) --- tools/tests/test_zram_preload.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index f518c3b367..8e4af1aa26 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -368,6 +368,8 @@ class ZramPreloadTest(unittest.TestCase): @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") def test_inline_pageout_exceeds_async_timing_tolerance(self): out = self.run_program(None, 256, 0, "timed-inline") + if out["inline"][0] <= 250: + self.skipTest("inline page-out finished under the 250 ms timing threshold on this machine") self.assertGreater(out["inline"][0], 250) @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") From f1be93576173024b8bd8e9da1258c35863b63e27 Mon Sep 17 00:00:00 2001 From: FX1922 <120828496+FX192@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:38:34 +0300 Subject: [PATCH 16/60] feat(library): add a Hidden tab synced with Steam's hidden games (#2803) * feat(library): add a Hidden tab synced with Steam's hidden games * fix(library): mark the hidden collection as modified so Steam uploads it * fix(library): make the Steam hidden write atomic and refresh the hidden set on resume * feat(library): show an error when hiding a game can't sync with Steam * fix(library): keep the pending Steam upload list safe when it can't be read * fix(library): report a failed Steam sync when the upload marker can't be saved * fix(library): refresh the Steam hidden set from disk after a failed sync * fix(library): keep the cached hidden set when Steam's file can't be read * fix(library): handle a malformed hidden entry and a changed Steam root * fix(library): refuse to overwrite a malformed hidden entry * fix(library): validate the hidden collection, keep Steam saves separate from upload status and cover cloud and uninstalled games * fix(library): accept numeric-string ids, keep uninstalled games in the Hidden tab and hide games from the Steam home list * fix(library): keep hidden Steam games out of the home capsule wall * fix(library): refresh home art when the hidden set changes and track the Steam account * fix(library): clear the cached hidden set when the Steam account changes * fix(library): ignore a previous account's art while the home scan runs * fix(library): conceal home art for hidden added games that carry a Steam app id --- .../droiddeck/launcher/frontend/Library.kt | 11 +- .../launcher/frontend/SteamHidden.kt | 78 ++++++++++++++ .../launcher/session/SessionPrefs.kt | 12 +++ .../com/droiddeck/launcher/ui/GameDetail.kt | 25 ++++- .../droiddeck/launcher/ui/LibraryFavorites.kt | 12 ++- .../droiddeck/launcher/ui/LibraryHidden.kt | 78 ++++++++++++++ .../com/droiddeck/launcher/ui/LibraryPage.kt | 49 ++++++--- .../com/droiddeck/launcher/ui/SteamHome.kt | 17 ++- app/src/main/res/values-ar/strings.xml | 2 + app/src/main/res/values-b+es+419/strings.xml | 2 + app/src/main/res/values-bg/strings.xml | 2 + app/src/main/res/values-cs/strings.xml | 2 + app/src/main/res/values-da/strings.xml | 2 + app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-el/strings.xml | 2 + app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-hi/strings.xml | 2 + app/src/main/res/values-hu/strings.xml | 2 + app/src/main/res/values-in/strings.xml | 2 + app/src/main/res/values-it/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ms/strings.xml | 2 + app/src/main/res/values-nb/strings.xml | 2 + app/src/main/res/values-nl/strings.xml | 2 + app/src/main/res/values-pl/strings.xml | 2 + app/src/main/res/values-pt-rPT/strings.xml | 2 + app/src/main/res/values-pt/strings.xml | 2 + app/src/main/res/values-ro/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-sv/strings.xml | 2 + app/src/main/res/values-th/strings.xml | 2 + app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + .../launcher/frontend/SteamHiddenTest.kt | 101 ++++++++++++++++++ .../launcher/ui/LibraryHiddenTest.kt | 42 ++++++++ 43 files changed, 459 insertions(+), 32 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 8acbbe18b0..7cc8051774 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -222,16 +222,7 @@ object Library { internal fun concealedSteamApps(root: File): Set { val config = AddedGames.accountConfig(root) ?: return emptySet() - val hidden = runCatching { - val entries = org.json.JSONArray(File(config, "cloudstorage/cloud-storage-namespace-1.json").readText()) - val entry = (0 until entries.length()).map { entries.getJSONArray(it) } - .firstOrNull { it.optString(0) == "user-collections.hidden" }?.optJSONObject(1) - if (entry == null || entry.optBoolean("is_deleted")) emptySet() else { - val collection = org.json.JSONObject(entry.optString("value")) - fun ids(key: String) = collection.optJSONArray(key)?.let { a -> (0 until a.length()).map { a.optLong(it) } }.orEmpty() - ids("added").toSet() - ids("removed").toSet() - } - }.getOrDefault(emptySet()) + val hidden = SteamHidden.read(root) val private = runCatching { PRIVATE_APPS.find(File(config, "localconfig.vdf").readText())?.groupValues?.get(1) ?.split(',')?.mapNotNull { it.trim().toLongOrNull() }?.toSet() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt new file mode 100644 index 0000000000..71ab7de95c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.frontend + +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +internal object SteamHidden { + private const val KEY = "user-collections.hidden" + + private fun file(root: File): File? = AddedGames.accountConfig(root)?.let { File(it, "cloudstorage/cloud-storage-namespace-1.json") } + + class Saved(val hidden: Set, val queued: Boolean) + + private fun id(member: Any?): Long? = when (member) { + is Int -> member.toLong() + is Long -> member + is String -> member.toLongOrNull() + else -> null + } + + private fun ids(collection: JSONObject, key: String, strict: Boolean): List { + if (!collection.has(key)) return emptyList() + val array = collection.optJSONArray(key) ?: throw IllegalStateException(key) + return (0 until array.length()).mapNotNull { index -> + id(array.get(index)) ?: if (strict) throw IllegalStateException(key) else null + } + } + + fun read(root: File): Set = readOrNull(root).orEmpty() + + fun readOrNull(root: File): Set? = runCatching { + val entries = JSONArray(file(root)?.readText() ?: return null) + val slot = (0 until entries.length()).map { entries.getJSONArray(it) }.firstOrNull { it.optString(0) == KEY } + val entry = slot?.optJSONObject(1) + if (slot != null && entry == null) return null + if (entry == null || entry.optBoolean("is_deleted")) emptySet() else { + val collection = JSONObject(entry.optString("value")) + ids(collection, "added", false).toSet() - ids(collection, "removed", false).toSet() + } + }.getOrNull() + + fun write(root: File, appId: Long, hidden: Boolean, now: Long = System.currentTimeMillis() / 1000): Saved? = runCatching { + val target = file(root) ?: return null + val entries = JSONArray(target.readText()) + val slot = (0 until entries.length()).firstOrNull { entries.getJSONArray(it).optString(0) == KEY } + val entry = if (slot == null) JSONObject().put("key", KEY) else entries.getJSONArray(slot).optJSONObject(1) ?: return null + val live = !entry.optBoolean("is_deleted") + val collection = if (live && entry.has("value")) JSONObject(entry.optString("value")) else JSONObject().put("id", "hidden") + val added = ids(collection, "added", true).filter { it != appId } + val removed = ids(collection, "removed", true).filter { it != appId } + collection.put("added", JSONArray(if (hidden) added + appId else added)) + collection.put("removed", JSONArray(if (hidden) removed else removed + appId)) + entry.put("value", collection.toString()) + entry.put("timestamp", now) + entry.put("is_deleted", false) + entry.opt("version")?.toString()?.toLongOrNull()?.let { entry.put("version", (it + 1).toString()) } + if (slot == null) entries.put(JSONArray().put(KEY).put(entry)) + val temp = File(target.parentFile, target.name + ".tmp") + temp.writeText(entries.toString()) + if (!temp.renameTo(target)) { + temp.delete() + return null + } + Saved(ids(collection, "added", true).toSet() - ids(collection, "removed", true).toSet(), markModified(File(target.parentFile, "cloud-storage-namespace-1.modified.json"))) + }.getOrNull() + + private fun markModified(file: File): Boolean { + val pending = if (file.exists()) runCatching { JSONArray(file.readText()) }.getOrNull() ?: return false else JSONArray() + if ((0 until pending.length()).any { pending.optString(it) == KEY }) return true + val temp = File(file.parentFile, file.name + ".tmp") + val saved = runCatching { + temp.writeText(pending.put(KEY).toString()) + temp.renameTo(file) + }.getOrDefault(false) + if (!saved) temp.delete() + return saved + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 1464ac37be..7a234c561c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -255,6 +255,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("libraryShowSize", show).apply() } + fun libraryShowHidden(context: Context): Boolean = prefs(context).getBoolean("libraryShowHidden", false) + + fun setLibraryShowHidden(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowHidden", show).apply() + } + + fun libraryHidden(context: Context): Set = prefs(context).getStringSet("libraryHidden", null)?.toSet().orEmpty() + + fun setLibraryHidden(context: Context, keys: Set) { + prefs(context).edit().putStringSet("libraryHidden", keys.toSet()).apply() + } + fun railLabels(context: Context): Boolean = prefs(context).getBoolean("railLabels", false) fun setRailLabels(context: Context, show: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index f6c6227ea5..e50176e09c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import android.widget.Toast import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.LocalIndication import androidx.compose.ui.semantics.Role @@ -466,7 +467,10 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } - if (game != null && !compactMenu) EditArtButton(game) + if (game != null && !compactMenu) { + HideButton(hideKey(game), game) + EditArtButton(game) + } } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -526,6 +530,8 @@ internal fun GameActions( } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } + val entryKey = game?.let(::hideKey) ?: storeKey + if (!s.shortcutPicker && entryKey != null && (game == null || cloud)) HideButton(entryKey, game) if (cloud && (download != null || failed != null)) { XboxStreamButton(game.storeId.orEmpty(), game.name) XboxLibraryButton(game.storeId.orEmpty(), item) @@ -618,6 +624,17 @@ internal fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { } } +internal fun hideKey(g: Library.SteamGame): String = g.storeId?.let { "${g.source}:$it" } ?: GameRef.key(g) + +@Composable +internal fun HideButton(key: String, g: Library.SteamGame?) { + val ctx = LocalContext.current + rememberHiddenSync() + val hidden = LibraryHidden.isHidden(key, g) + val failed = stringResource(R.string.game_hide_failed) + SecondaryButton(stringResource(if (hidden) R.string.game_unhide else R.string.common_hide), compact = true) { if (!LibraryHidden.set(ctx, key, g, !hidden)) Toast.makeText(ctx, failed, Toast.LENGTH_LONG).show() } +} + @Composable internal fun EditArtButton(g: Library.SteamGame) { val open = rememberEditArt(g) ?: return @@ -628,6 +645,10 @@ internal fun EditArtButton(g: Library.SteamGame) { private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { var open by remember(g.gameId) { mutableStateOf(false) } val edit = rememberEditArt(g) + val ctx = LocalContext.current + rememberHiddenSync() + val hidden = LibraryHidden.isHidden(hideKey(g), g) + val failed = stringResource(R.string.game_hide_failed) Box { SecondaryButton(stringResource(R.string.game_more)) { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_more), compact = true) { first -> @@ -638,6 +659,8 @@ private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = take()) { open = false; a.onGameShortcut(g) } MenuItem(stringResource(R.string.game_file_export), checked = false) { open = false; a.onExportGameFile(g) } MenuItem(stringResource(R.string.game_link_copy), checked = false) { open = false; a.onCopyGameLink(g) } + val hideKey = hideKey(g) + MenuItem(stringResource(if (hidden) R.string.game_unhide else R.string.common_hide), checked = false) { open = false; if (!LibraryHidden.set(ctx, hideKey, g, !hidden)) Toast.makeText(ctx, failed, Toast.LENGTH_LONG).show() } edit?.let { run -> MenuItem(stringResource(R.string.game_edit_art), checked = false) { open = false; run() } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt index 2aab3b4b9f..2756bc2812 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt @@ -28,8 +28,12 @@ internal object LibraryFavorites { internal fun toggled(keys: Set, key: String): Set = if (key in keys) keys - key else keys + key -internal fun inLibrarySource(source: String, entry: LibraryEntry, favorites: Set): Boolean = when (source) { - LIBRARY_ALL -> true - LIBRARY_FAVORITES -> entry.favoriteKey in favorites - else -> entry.source == source +internal fun inLibrarySource(source: String, entry: LibraryEntry, favorites: Set, hidden: (LibraryEntry) -> Boolean = { false }): Boolean { + val concealed = hidden(entry) + return when (source) { + LIBRARY_HIDDEN -> concealed + LIBRARY_ALL -> !concealed + LIBRARY_FAVORITES -> !concealed && entry.favoriteKey in favorites + else -> !concealed && entry.source == source + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt new file mode 100644 index 0000000000..a0fb74ef6f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.SteamHidden +import com.droiddeck.launcher.session.SessionPrefs + +internal const val LIBRARY_HIDDEN = "hidden" + +internal object LibraryHidden { + var keys by mutableStateOf>(emptySet()) + private set + var account by mutableStateOf(null) + private set + var steam by mutableStateOf>(emptySet()) + private set + + fun load(context: Context) { + keys = SessionPrefs.libraryHidden(context) + refreshSteam(context) + } + + fun refreshSteam(context: Context) { + val root = SessionPrefs.activeSteamRoot(context) + adopt(root) + SteamHidden.readOrNull(root)?.let { steam = it } + } + + private fun adopt(root: java.io.File) { + val resolved = AddedGames.accountConfig(root) + if (resolved != account) { + account = resolved + steam = emptySet() + } + } + + fun steamId(game: Library.SteamGame?): Long? = game?.takeIf { Library.fromSteamClient(it) }?.appId?.toLong() + + fun isHidden(key: String, game: Library.SteamGame?): Boolean = key in keys || steamId(game)?.let { it in steam } == true + + fun isHidden(entry: LibraryEntry): Boolean = isHidden(entry.favoriteKey, entry.game) + + fun set(context: Context, key: String, game: Library.SteamGame?, hidden: Boolean): Boolean { + val id = steamId(game) + val root = SessionPrefs.activeSteamRoot(context) + val written = id?.let { SteamHidden.write(root, it, hidden) } + if (id != null) { + adopt(root) + steam = written?.hidden ?: SteamHidden.readOrNull(root) ?: steam + } + keys = if (hidden && (id == null || written == null)) keys + key else keys - key + SessionPrefs.setLibraryHidden(context, keys) + return id == null || written?.queued == true + } +} + +@Composable +internal fun rememberHiddenSync() { + val ctx = LocalContext.current + remember { LibraryHidden.load(ctx) } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + val observer = LifecycleEventObserver { _, event -> if (event == Lifecycle.Event.ON_RESUME) LibraryHidden.refreshSteam(ctx) } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 64e949b2cd..3a96df2f4b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -163,11 +163,17 @@ internal fun collectionEntries(all: List, items: List internal fun installedFirst(entries: List): List = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet()): List = - (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) +internal fun librarySources( + entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet(), + hidden: (LibraryEntry) -> Boolean = { false }, showHidden: Boolean = false, +): List = + (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION + LIBRARY_HIDDEN) .filter { source -> - if (source == LIBRARY_FAVORITES) entries.any { it.favoriteKey in favorites } - else source in always || entries.any { it.source == source } + when (source) { + LIBRARY_HIDDEN -> showHidden + LIBRARY_FAVORITES -> entries.any { it.favoriteKey in favorites && !hidden(it) } + else -> source in always || entries.any { it.source == source && !hidden(it) } + } } internal object LibraryDisplay { @@ -178,11 +184,14 @@ internal object LibraryDisplay { private set var size by mutableStateOf(true) private set + var hidden by mutableStateOf(false) + private set fun load(context: android.content.Context) { level = SessionPrefs.libraryCardLevel(context).coerceIn(0, scales.lastIndex) title = SessionPrefs.libraryShowTitle(context) size = SessionPrefs.libraryShowSize(context) + hidden = SessionPrefs.libraryShowHidden(context) } fun step(context: android.content.Context, by: Int) { @@ -199,6 +208,11 @@ internal object LibraryDisplay { size = !size SessionPrefs.setLibraryShowSize(context, size) } + + fun toggleHidden(context: android.content.Context) { + hidden = !hidden + SessionPrefs.setLibraryShowHidden(context, hidden) + } } internal object LibraryView { @@ -228,8 +242,10 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, remember { LibraryDisplay.load(ctx) } remember { FolderSizes.load(ctx) } remember { LibraryFavorites.load(ctx) } + rememberHiddenSync() val soundMode = selected == "soundtracks" || selected.startsWith("sound:") val favorites = if (soundMode) emptySet() else LibraryFavorites.keys + val concealed: (LibraryEntry) -> Boolean = { !soundMode && LibraryHidden.isHidden(it) } val stores = !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } @@ -267,7 +283,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val sources = librarySources( all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), - favorites, + favorites, concealed, LibraryDisplay.hidden && !soundMode, ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() @@ -290,7 +306,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { - inLibrarySource(source, it, favorites) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) + inLibrarySource(source, it, favorites, concealed) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val trackHits by produceState>(emptyList(), soundMode, q, source, s.soundtracks) { @@ -317,8 +333,8 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } } var savedDialog by remember { mutableStateOf(false) } - val candidates = if (listUninstalled) matching else matching.filter { it.installed } - val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } + val candidates = if (listUninstalled || source == LIBRARY_HIDDEN) matching else matching.filter { it.installed } + val hiddenUninstalled = if (listUninstalled || source == LIBRARY_HIDDEN) 0 else matching.count { !it.installed } val sort = s.storesSort val sizeSort = sort == "sizeAsc" || sort == "sizeDesc" val installedAt = StoresState.installed.associate { it.key to it.sidecar.installedAt } @@ -539,7 +555,7 @@ private fun LibraryGrid( } val picker = s.shortcutPicker && e.game != null val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null - if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES) + if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) } LazyVerticalGrid( columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, @@ -679,17 +695,19 @@ private fun LibraryHeader( @Composable private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit, accounts: Boolean) { - if (sources.size < 2 && !accounts) return + val chips = sources.size >= 2 || sources.singleOrNull() == LIBRARY_HIDDEN + if (!chips && !accounts) return Row( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), ) { - if (sources.size >= 2) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } - if (sources.size >= 2) for (src in sources) { + if (chips) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } + if (chips) for (src in sources) { val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) src == LIBRARY_FAVORITES -> FavoritesColours.dot + src == LIBRARY_HIDDEN -> Color(0xFF9AA0A6) src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot else -> null } @@ -698,6 +716,7 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str when (src) { Library.ADDED -> stringResource(R.string.library_filter_added) LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + LIBRARY_HIDDEN -> stringResource(R.string.apps_filter_hidden) else -> store?.shortLabel ?: sourceLabel(src) }, source == src, dot, @@ -1058,7 +1077,7 @@ internal fun DisplayButton() { HeaderIconButton(title, Icons.Filled.Visibility, "display") { val from = at ?: return@HeaderIconButton Steps.ask(StepAsk( - anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 4, + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 5, handle = { Icon(Icons.Filled.Visibility, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, ) { StepTitle(title) @@ -1081,6 +1100,10 @@ internal fun DisplayButton() { stringResource(R.string.library_display_size), selected = LibraryDisplay.size, enabled = open, modifier = Modifier.fillMaxWidth().stepItem(3), ) { LibraryDisplay.toggleSize(ctx) } + StepChoice( + stringResource(R.string.apps_filter_hidden), selected = LibraryDisplay.hidden, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(4), + ) { LibraryDisplay.toggleHidden(ctx) } } }) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 244ef0096f..7f2d0cb0c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -83,12 +83,21 @@ private const val DRIFT_STEP_NS = 15_000_000L internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val ctx = androidx.compose.ui.platform.LocalContext.current LaunchedEffect(Unit) { com.droiddeck.launcher.frontend.SteamFeatured.load(ctx) } - val featured = com.droiddeck.launcher.frontend.SteamFeatured.games + rememberHiddenSync() + val featuredAll = com.droiddeck.launcher.frontend.SteamFeatured.games val signedIn = s.offlineAccount != null - val owned by produceState(emptyList>(), signedIn) { - value = if (!signedIn) emptyList() else withContext(Dispatchers.IO) { runCatching { Library.steamLibraryArt(ctx).shuffled() }.getOrDefault(emptyList()) } + val account = LibraryHidden.account + val scanned by produceState>>>(account to emptyList(), signedIn, LibraryHidden.steam, account) { + val art = if (!signedIn) emptyList() else withContext(Dispatchers.IO) { runCatching { Library.steamLibraryArt(ctx).shuffled() }.getOrDefault(emptyList()) } + value = account to art } - val games = remember(s.steamGames) { s.steamGames.sortedWith(compareByDescending { it.lastPlayed }.thenBy { it.gameId }) } + val ownedAll = if (scanned.first == account) scanned.second else emptyList() + val concealed = remember(s.steamGames, LibraryHidden.keys, LibraryHidden.steam) { + LibraryHidden.steam + s.steamGames.filter { LibraryHidden.isHidden(hideKey(it), it) }.map { it.appId.toLong() } + } + val owned = remember(ownedAll, concealed) { ownedAll.filter { it.first.toLong() !in concealed } } + val featured = remember(featuredAll, concealed) { featuredAll.filter { it.appId.toLong() !in concealed } } + val games = remember(s.steamGames, LibraryHidden.keys, LibraryHidden.steam) { s.steamGames.filterNot { LibraryHidden.isHidden(hideKey(it), it) }.sortedWith(compareByDescending { it.lastPlayed }.thenBy { it.gameId }) } val narrow = LocalNarrowPane.current var words by remember { mutableStateOf(null) } val mode = com.droiddeck.launcher.session.SessionService.MODE_STEAM diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5f85d0392c..945453d05e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1605,6 +1605,8 @@ تعذّر على Android فتح نافذة ضمن النافذة. المزيد تعديل الصور + إزالة من المخفية + تعذّرت المزامنة مع Steam. أغلق Steam وحاول مرة أخرى. في Steam اختصار إضافة إلى الشاشة الرئيسية diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 6c67130a34..a0fc0812bd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1651,6 +1651,8 @@ Android no pudo abrir imagen en imagen. Más Editar imágenes + Quitar de ocultas + No se pudo sincronizar con Steam. Cierra Steam e inténtalo de nuevo. En Steam Acceso directo Agregar a la pantalla de inicio diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bddb2786e3..821fc8788a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1573,6 +1573,8 @@ Android не можа да отвори картина в картината. Още Редактиране на изображенията + Премахване от скритите + Синхронизирането със Steam не успя. Затворете Steam и опитайте отново. В Steam Пряк път Добавяне към началния екран diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 008b70f6b7..285e30109d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1589,6 +1589,8 @@ Android nemohl otevřít obraz v obraze. Další Upravit grafiku + Odebrat ze skrytých + Synchronizace se Steamem se nezdařila. Zavřete Steam a zkuste to znovu. Ve Steamu Zkratka Přidat na domovskou obrazovku diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 13fed381f1..55cc16e75b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1573,6 +1573,8 @@ Android kunne ikke åbne billede i billede. Mere Rediger grafik + Fjern fra skjulte + Kunne ikke synkronisere med Steam. Luk Steam og prøv igen. I Steam Genvej Tilføj til hjemmeskærm diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 40f17501cb..82e4fe4a75 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1565,6 +1565,8 @@ Android konnte Bild im Bild nicht öffnen. Mehr Grafiken bearbeiten + Nicht mehr ausblenden + Synchronisierung mit Steam fehlgeschlagen. Schließe Steam und versuche es erneut. In Steam Verknüpfung Zum Startbildschirm hinzufügen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ed3372012b..824ee992f2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1573,6 +1573,8 @@ Το Android δεν μπόρεσε να ανοίξει τη λειτουργία εικόνας εντός εικόνας. Περισσότερα Επεξεργασία εικαστικών + Κατάργηση από τις κρυφές + Αποτυχία συγχρονισμού με το Steam. Κλείστε το Steam και δοκιμάστε ξανά. Στο Steam Συντόμευση Προσθήκη στην αρχική οθόνη diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ebd821ecc3..587809e30e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1581,6 +1581,8 @@ Android no pudo abrir imagen en imagen. Más Editar imágenes + Quitar de ocultas + No se pudo sincronizar con Steam. Cierra Steam e inténtalo de nuevo. En Steam Acceso directo Añadir a la pantalla de inicio diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8bcb6fcce1..ed435167da 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1573,6 +1573,8 @@ Android ei pystynyt avaamaan kuva kuvassa -tilaa. Lisää Muokkaa kuvitusta + Poista piilotetuista + Synkronointi Steamin kanssa epäonnistui. Sulje Steam ja yritä uudelleen. Steamissa Pikakuvake Lisää aloitusnäytölle diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d61e1076d0..df6896bd4f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1580,6 +1580,8 @@ Android ne peut pas ouvrir le mode PiP. Plus Modifier les illustrations + Ne plus masquer + Synchronisation avec Steam impossible. Fermez Steam et réessayez. Dans Steam Raccourci Ajouter à l\'écran d\'accueil diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d9fac5e3c2..5e9a887d3d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1573,6 +1573,8 @@ Android पिक्चर इन पिक्चर नहीं खोल सका। और आर्ट एडिट करें + छिपे हुए से हटाएं + Steam के साथ सिंक नहीं हो सका। Steam बंद करके फिर कोशिश करें। Steam में शॉर्टकट होम स्क्रीन पर जोड़ें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9261430fec..a63d2e9c5b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1573,6 +1573,8 @@ Az Android nem tudta megnyitni a kép a képben módot. Továbbiak Illusztrációk szerkesztése + Eltávolítás a rejtettek közül + Nem sikerült szinkronizálni a Steammel. Zárd be a Steamet, és próbáld újra. A Steamben Parancsikon Hozzáadás a kezdőképernyőhöz diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 00dcfe8d3a..fb83ce5228 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1566,6 +1566,8 @@ Android tidak dapat membuka gambar dalam gambar. Lainnya Edit gambar + Hapus dari tersembunyi + Gagal menyinkronkan dengan Steam. Tutup Steam lalu coba lagi. Di Steam Pintasan Tambahkan ke layar utama diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a3ca9a4562..88838f1748 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1572,6 +1572,8 @@ Android non è riuscito ad aprire il picture in picture. Altro Modifica grafica + Rimuovi dai nascosti + Impossibile sincronizzare con Steam. Chiudi Steam e riprova. In Steam Scorciatoia Aggiungi alla schermata Home diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 57cbc6756b..94d29d8716 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1566,6 +1566,8 @@ Androidがピクチャーインピクチャーを開けませんでした。 その他 アートを編集 + 非表示を解除 + Steamと同期できませんでした。Steamを終了してもう一度お試しください。 Steamに追加済み ショートカット ホーム画面に追加 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index be30c1a1df..4f8de4c21a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1566,6 +1566,8 @@ Android에서 PIP를 열 수 없습니다. 더보기 아트 편집 + 숨김 해제 + Steam과 동기화하지 못했습니다. Steam을 종료한 후 다시 시도하세요. Steam에 있음 바로 가기 홈 화면에 추가 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 28e6c4027c..3a79bb392d 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1566,6 +1566,8 @@ Android tidak dapat membuka gambar dalam gambar. Lagi Sunting seni + Alih keluar daripada tersembunyi + Tidak dapat menyegerak dengan Steam. Tutup Steam dan cuba lagi. Dalam Steam Pintasan Tambah ke skrin utama diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2195bf2092..b7aefa8a96 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1573,6 +1573,8 @@ Android kunne ikke åpne bilde-i-bilde. Mer Rediger grafikk + Fjern fra skjulte + Kunne ikke synkronisere med Steam. Lukk Steam og prøv igjen. I Steam Snarvei Legg til på hjem-skjermen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fa50b066ba..76ff862bef 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1573,6 +1573,8 @@ Android kon scherm-in-scherm niet openen. Meer Afbeeldingen bewerken + Niet meer verbergen + Synchroniseren met Steam is mislukt. Sluit Steam en probeer het opnieuw. In Steam Snelkoppeling Toevoegen aan startscherm diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 08ca3aef85..c39caf2a40 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1589,6 +1589,8 @@ Android nie mógł otworzyć obrazu w obrazie. Więcej Edytuj grafiki + Usuń z ukrytych + Nie udało się zsynchronizować ze Steamem. Zamknij Steama i spróbuj ponownie. W Steam Skrót Dodaj do ekranu głównego diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ecbfd10091..3956a1e206 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1572,6 +1572,8 @@ O Android não conseguiu abrir o ecrã no ecrã. Mais Editar imagens + Remover dos ocultos + Não foi possível sincronizar com o Steam. Feche o Steam e tente novamente. No Steam Atalho Adicionar ao ecrã principal diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 940f40dfe6..405ad5bd06 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1580,6 +1580,8 @@ O Android não conseguiu abrir o picture-in-picture. Mais Editar artes + Remover dos ocultos + Não foi possível sincronizar com o Steam. Feche o Steam e tente novamente. Na Steam Atalho Adicionar à tela inicial diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 41052aa32f..29500e74e0 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1581,6 +1581,8 @@ Android nu a putut deschide imaginea în imagine. Mai multe Editează grafica + Elimină din ascunse + Nu s-a putut sincroniza cu Steam. Închide Steam și încearcă din nou. În Steam Comandă rapidă Adaugă pe ecranul principal diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f1cfd1a2de..1f3786b96a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1589,6 +1589,8 @@ Android не может открыть PiP. Ещё Изменить обложку + Убрать из скрытых + Не удалось синхронизировать со Steam. Закройте Steam и повторите попытку. В Steam Ярлык Добавить на главный экран diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2b5b56881a..ec494e1952 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1573,6 +1573,8 @@ Android kunde inte öppna bild-i-bild. Mer Redigera grafik + Ta bort från dolda + Kunde inte synkronisera med Steam. Stäng Steam och försök igen. I Steam Genväg Lägg till på hemskärmen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 72ede34020..9172d0931c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1566,6 +1566,8 @@ Android ไม่สามารถเปิดภาพซ้อนภาพได้ เพิ่มเติม แก้ไขภาพปก + นำออกจากที่ซ่อนไว้ + ซิงค์กับ Steam ไม่สำเร็จ ปิด Steam แล้วลองอีกครั้ง ใน Steam ช็อตคัต เพิ่มไปยังหน้าจอหลัก diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b22e72c040..29153e59f3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1565,6 +1565,8 @@ Android, pencere içinde pencereyi açamadı. Diğer Görseli düzenle + Gizlilikten çıkar + Steam ile senkronize edilemedi. Steam\'i kapatıp tekrar deneyin. Steam\'de Kısayol Ana ekrana ekle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5ed3e0dffe..3af14ceaf0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1589,6 +1589,8 @@ Android не вдалося відкрити режим «Картинка в картинці». Більше Змінити обкладинку + Прибрати з прихованих + Не вдалося синхронізувати зі Steam. Закрийте Steam і спробуйте ще раз. У Steam Ярлик Додати на головний екран diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6179086eb8..ed29d93e42 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1566,6 +1566,8 @@ Android không thể mở hình trong hình. Thêm Sửa ảnh bìa + Bỏ ẩn + Không thể đồng bộ với Steam. Hãy đóng Steam rồi thử lại. Trong Steam Shortcut Thêm vào màn hình chính diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 06b91530e2..2daf99deba 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1649,6 +1649,8 @@ Android 无法打开画中画。 更多 编辑封面 + 取消隐藏 + 无法与 Steam 同步。请关闭 Steam 后重试。 已在 Steam 中 快捷方式 添加到主屏幕 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7425fa7d7c..21abd5d128 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1565,6 +1565,8 @@ Android 無法開啟畫中畫。 更多 編輯圖片 + 取消隱藏 + 無法與 Steam 同步。請關閉 Steam 後再試。 在 Steam 中 捷徑 加至主畫面 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5346cf8bc6..5716d8859c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1565,6 +1565,8 @@ Android 無法開啟子母畫面。 更多 編輯圖片 + 取消隱藏 + 無法與 Steam 同步。請關閉 Steam 後再試。 在 Steam 中 捷徑 新增至主螢幕 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ed9fdd3820..dbad01b39c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1757,6 +1757,8 @@ Android could not open picture in picture. More Edit art + Remove hidden + Couldn\'t sync with Steam. Close Steam and try again. In Steam Shortcut Add to home screen diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt new file mode 100644 index 0000000000..bca99f5188 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt @@ -0,0 +1,101 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamHiddenTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198352563669\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private fun store(root: File, json: String?): File { + val dir = File(root, "userdata/392297941/config/cloudstorage").apply { mkdirs() } + return File(dir, "cloud-storage-namespace-1.json").also { f -> json?.let { f.writeText(it) } } + } + + private fun hiddenEntry(file: File): JSONObject { + val entries = JSONArray(file.readText()) + return (0 until entries.length()).map { entries.getJSONArray(it) }.first { it.getString(0) == "user-collections.hidden" }.getJSONObject(1) + } + + @Test fun hidingAddsTheGameAndKeepsOtherEntries() { + val root = steamRoot() + val file = store(root, """[["user-collections.favorite",{"key":"user-collections.favorite","value":"{}"}],["user-collections.hidden",{"key":"user-collections.hidden","timestamp":5,"version":"7","value":"{\"id\":\"hidden\",\"name\":\"Hidden\",\"added\":[10],\"removed\":[]}"}]]""") + assertNotNull(SteamHidden.write(root, 440, true, now = 99)) + assertEquals(setOf(10L, 440L), SteamHidden.read(root)) + val entry = hiddenEntry(file) + assertEquals(99L, entry.getLong("timestamp")) + assertEquals("8", entry.getString("version")) + assertEquals("Hidden", JSONObject(entry.getString("value")).getString("name")) + assertEquals(2, JSONArray(file.readText()).length()) + } + + @Test fun unhidingTakesTheGameOutAgain() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[10,440],\"removed\":[]}"}]]""") + assertNotNull(SteamHidden.write(root, 440, false)) + assertEquals(setOf(10L), SteamHidden.read(root)) + } + + @Test fun aMissingCollectionIsCreatedWhenHiding() { + val root = steamRoot() + val file = store(root, "[]") + assertNotNull(SteamHidden.write(root, 2931908220L, true)) + assertEquals(setOf(2931908220L), SteamHidden.read(root)) + assertFalse(hiddenEntry(file).getBoolean("is_deleted")) + } + + @Test fun aDeletedCollectionIsRevivedWhenHiding() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","is_deleted":true}]]""") + assertEquals(emptySet(), SteamHidden.read(root)) + assertNotNull(SteamHidden.write(root, 7, true)) + assertEquals(setOf(7L), SteamHidden.read(root)) + } + + @Test fun withoutASteamStoreNothingIsWritten() { + val root = steamRoot() + assertNull(SteamHidden.write(root, 1, true)) + assertEquals(emptySet(), SteamHidden.read(root)) + } + + @Test fun theCollectionIsMarkedAsPendingUploadOnce() { + val root = steamRoot() + val file = store(root, "[]") + SteamHidden.write(root, 1, true) + SteamHidden.write(root, 2, true) + assertEquals("""["user-collections.hidden"]""", File(file.parentFile, "cloud-storage-namespace-1.modified.json").readText()) + } + + @Test fun aMalformedMemberIsRejectedAndTheFileIsLeftAlone() { + val root = steamRoot() + val json = """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[\"x\"],\"removed\":[]}"}]]""" + val file = store(root, json) + assertEquals(emptySet(), SteamHidden.readOrNull(root)) + assertNull(SteamHidden.write(root, 1, true)) + assertEquals(json, file.readText()) + } + + @Test fun numericStringsAreReadAndBadMembersAreSkipped() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[\"440\",\"x\",4.5,730],\"removed\":[]}"}]]""") + assertEquals(setOf(440L, 730L), SteamHidden.read(root)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt new file mode 100644 index 0000000000..ac5835c2a5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class LibraryHiddenTest { + private fun steam(id: Int, name: String) = LibraryEntry("app:$id", Library.SOURCE_STEAM, name, Library.SteamGame(id, name, null, "Steam library"), null, true) + + private val tf2 = steam(440, "Team Fortress 2") + private val cs = steam(10, "Counter-Strike") + private val hiddenSet = setOf(tf2.favoriteKey) + private val hidden: (LibraryEntry) -> Boolean = { it.favoriteKey in hiddenSet } + + @Test fun hiddenGamesLeaveAllAndTheirStoreTab() { + assertFalse(inLibrarySource(LIBRARY_ALL, tf2, emptySet(), hidden)) + assertFalse(inLibrarySource(Library.SOURCE_STEAM, tf2, emptySet(), hidden)) + assertTrue(inLibrarySource(LIBRARY_ALL, cs, emptySet(), hidden)) + assertTrue(inLibrarySource(Library.SOURCE_STEAM, cs, emptySet(), hidden)) + } + + @Test fun hiddenGamesLeaveFavorites() { + assertFalse(inLibrarySource(LIBRARY_FAVORITES, tf2, setOf(tf2.favoriteKey), hidden)) + } + + @Test fun theHiddenSourceHoldsOnlyHiddenGames() { + assertTrue(inLibrarySource(LIBRARY_HIDDEN, tf2, emptySet(), hidden)) + assertFalse(inLibrarySource(LIBRARY_HIDDEN, cs, emptySet(), hidden)) + } + + @Test fun theHiddenTabIsLastAndOnlyWhenEnabled() { + val entries = listOf(tf2, cs) + assertEquals(listOf(Library.SOURCE_STEAM), librarySources(entries, emptyList(), hidden = hidden)) + assertEquals(listOf(Library.SOURCE_STEAM, LIBRARY_HIDDEN), librarySources(entries, emptyList(), hidden = hidden, showHidden = true)) + } + + @Test fun aStoreTabWithOnlyHiddenGamesDisappears() { + assertEquals(emptyList(), librarySources(listOf(tf2), emptyList(), hidden = hidden)) + } +} From 1702f2d72d38cb88003995dc2333d24b252f7b55 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 09:11:14 -0500 Subject: [PATCH 17/60] fix: trust FryMcNugget for test builds (#2830) --- .github/trusted-test-builds.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt index fa4cff1104..4f94e6c268 100644 --- a/.github/trusted-test-builds.txt +++ b/.github/trusted-test-builds.txt @@ -1,5 +1,6 @@ ASEbrahim FX192 +FryMcNugget K11MCH1 KeegantheVeganat0r kingokksa From 0a167e41c20daebca48128bc93f5eb196a202bac Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Wed, 18 Nov 2026 09:37:50 -0500 Subject: [PATCH 18/60] fix(session): Steam's install-script step no longer counts as the game for return after game (#2732) --- .../launcher/session/SteamGameProcess.kt | 3 ++- .../launcher/session/SteamGameProcessTest.kt | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt index 13a88ee493..7a00553f3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamGameProcess.kt @@ -40,8 +40,9 @@ object SteamGameProcess { val appId = args.getOrNull(i + 1) ?.takeIf { it.startsWith("AppId=") } ?.removePrefix("AppId=") + val launchOptions = args.drop(i + 2).takeWhile { it != "--" } - if (appId == expectedAppId) return true + if (appId == expectedAppId && "Install=1" !in launchOptions) return true } if (args[i] == "-applaunch" && diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt index fc1a1bb276..ae9b31d80c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamGameProcessTest.kt @@ -30,6 +30,22 @@ class SteamGameProcessTest { assertFalse(SteamGameProcess.matches(cmdline("python3", "/proton", "waitforexitandrun", "game.exe"), "976310")) } + @Test fun steamsInstallScriptStepIsNotTheGame() { + val wrapper = arrayOf("/root/.local/share/Steam/linuxarm64/steam-launch-wrapper", "--oom-score-adjust", "900", "--") + val reaper = "/root/.local/share/Steam/steamrtarm64/reaper" + val proton = "/root/.local/share/Steam/compatibilitytools.d/DroidDeck-Proton 11-12.8/droiddeck-proton-wrap" + val evaluator = arrayOf(reaper, "SteamLaunch", "AppId=351710", "Install=1", "--", + proton, "run", "/root/.local/share/Steam/legacycompat/iscriptevaluator.exe", "legacycompat\\evaluatorscript_351710.vdf") + val game = arrayOf(reaper, "SteamLaunch", "AppId=351710", "--", + proton, "waitforexitandrun", "/root/.local/share/Steam/steamapps/common/Neptunia Rebirth2/NeptuniaReBirth2.exe") + + assertFalse(SteamGameProcess.matches(cmdline(*evaluator), "351710")) + assertFalse(SteamGameProcess.matches(cmdline(*wrapper, *evaluator), "351710")) + assertTrue(SteamGameProcess.matches(cmdline(*game), "351710")) + assertTrue(SteamGameProcess.matches(cmdline(*wrapper, *game), "351710")) + assertTrue(SteamGameProcess.matches(cmdline(reaper, "SteamLaunch", "AppId=351710", "--", "game", "Install=1"), "351710")) + } + @Test fun shortcutCGameIdsMatchTheir32BitSteamAppId() { val cgameId = ((976310L shl 32) or 0x02000000L).toString() @@ -67,5 +83,9 @@ class SteamGameProcessTest { process("200", "reaper", "SteamLaunch", "AppId=976310", "--", "proton", "waitforexitandrun", "MK11.exe") assertTrue(SteamGameProcess.running("976310", proc)) assertFalse(SteamGameProcess.running("123", proc)) + process("300", "reaper", "SteamLaunch", "AppId=351710", "Install=1", "--", "proton", "run", "iscriptevaluator.exe") + assertFalse(SteamGameProcess.running("351710", proc)) + process("301", "reaper", "SteamLaunch", "AppId=351710", "--", "proton", "waitforexitandrun", "game.exe") + assertTrue(SteamGameProcess.running("351710", proc)) } } From 9e05e4c00c56d7593caa13fe4df15222dbb58412 Mon Sep 17 00:00:00 2001 From: Dennis Zabolotny Date: Wed, 18 Nov 2026 16:53:39 +0200 Subject: [PATCH 19/60] fix(input): keep held keyboard keys when pointer capture ends (#2779) * fix(input): keep held keyboard keys when pointer capture ends When a game gives up its pointer lock, Android pointer capture is released and the session dropped every held input, including keyboard keys. In a windowed session with Relative mouse on Auto, holding W to run and releasing the mouse button after steering stopped the character, because the key press is never sent again. Losing pointer capture now releases only the mouse buttons, the pen and the mouse back-button input. Keys are still released when the window loses focus. * fix(input): release held keys when pointer capture ends for the session menu Opening the session menu releases pointer capture, and the menu then consumes key events, including the key-up. A key held at that moment would stay pressed in the guest after the menu closed. Capture loss with the menu open now releases keys as before; other capture loss keeps them. * fix(input): release held keys whenever another surface takes the keyboard Capture loss released keys only while the session menu was open. The other places that take input from the guest (on-screen keyboard, achievements, input settings, WoW chat, touch editor, picture in picture) have the same problem, so keys are now kept only when the session still owns input and the game itself dropped its pointer lock. * fix(input): release held keys when the session menu opens While the menu is open it takes every key event, including the key-up, so a key held when it opened stayed pressed in the guest. The keys are now released when the menu opens, whether or not pointer capture was active. --------- Co-authored-by: zdennisz <15849186+zdennisz@users.noreply.github.com> --- .../com/droiddeck/launcher/SessionActivity.kt | 27 +++++++++++--- .../launcher/input/SessionInputPointerTest.kt | 36 +++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e7c5c38e77..5a95f1de4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -488,7 +488,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } drawerLayerOpen = false drawerPinned = false - if (value) drawerDocked = dockDrawer() && openDockedMenu() + if (value) { + releaseHeldKeys() + drawerDocked = dockDrawer() && openDockedMenu() + } drawerOpenState = value if (!value && drawerDocked) closeDockedMenu() } @@ -825,7 +828,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde pointerCaptureRefused = false if (usbMouse.active) updatePointerCapture() } else { - releaseHeldGuestInput() + releaseHeldInputOnCaptureLoss() uiHandler.postDelayed(::updatePointerCapture, 250) } } @@ -5118,10 +5121,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun relativeMouseAttached(): Boolean = !isInMultiWindowMode && !glassesOutputActive && mouseAttached() + private fun sessionOwnsInput() = + resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !inputSettingsOpen && + !pipUi && !bottomOutputActive && !touchEditorOpen && !wowChatOnTop + private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = (pointerLocked || relativeMouseAttached()) && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !inputSettingsOpen && !pipUi && !bottomOutputActive && !touchEditorOpen && !wowChatOnTop && mouseAttached() + val want = (pointerLocked || relativeMouseAttached()) && sessionOwnsInput() && hasWindowFocus() && mouseAttached() releaseDesktopMouseGrab() updateUsbMouse(want) if (want == view.hasPointerCapture()) return @@ -5444,14 +5451,26 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun keyboardCoversPad() = SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard - private fun releaseHeldGuestInput() { + private fun releaseHeldInputOnCaptureLoss() { + if (sessionOwnsInput()) releaseHeldPointerInput() else releaseHeldGuestInput() + } + + private fun releaseHeldPointerInput() { mouseBackInput.cancel() cancelPen(releaseKey = true) heldButtons.release(1 or 2 or 8 or 16) + } + + private fun releaseHeldKeys() { guestKeysDown.toList().forEach { sendGuestKey(it, false) } heldKeys.release(8 or 16 or 32) } + private fun releaseHeldGuestInput() { + releaseHeldPointerInput() + releaseHeldKeys() + } + private fun sendGuestKey(key: Int, down: Boolean, owner: Int = 1) { if (down && pipUi) return val code = if (key == KEY_RIGHTCTRL && SessionState.mode == SessionService.MODE_DESKTOP) KEY_LEFTCTRL else key diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt index 835eca2e9b..879c18233c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt @@ -186,6 +186,42 @@ class SessionInputPointerTest { assertEquals(29 to 0, CompositorShadow.keys.last()) } + @Test fun losingPointerCaptureReleasesMouseButtonsButKeepsKeyboardKeysHeld() { + ReflectionHelpers.getField>(activity, "resumed\$delegate").value = true + val keys = ReflectionHelpers.getField(activity, "heldKeys") + val buttons = ReflectionHelpers.getField(activity, "heldButtons") + output.key(17, true) + keys.set(8, 30, true) + buttons.set(2, 272, true) + CompositorShadow.keys.clear() + CompositorShadow.events.clear() + ReflectionHelpers.callInstanceMethod(activity, "releaseHeldInputOnCaptureLoss") + assertTrue(CompositorShadow.keys.none { it.second == 0 }) + assertTrue(CompositorShadow.events.contains(Triple(3, 272, 0))) + output.key(17, false) + assertEquals(17 to 0, CompositorShadow.keys.last()) + } + + @Test fun losingPointerCaptureToAnotherInputSurfaceReleasesKeyboardKeys() { + ReflectionHelpers.getField>(activity, "resumed\$delegate").value = true + for (state in listOf("drawerOpenState", "wowChatOnTop")) { + val open: androidx.compose.runtime.MutableState = ReflectionHelpers.getField(activity, state + "\$delegate") + open.value = true + ReflectionHelpers.getField(activity, "heldKeys").set(16, 17, true) + CompositorShadow.keys.clear() + ReflectionHelpers.callInstanceMethod(activity, "releaseHeldInputOnCaptureLoss") + assertEquals(state, 17 to 0, CompositorShadow.keys.last()) + open.value = false + } + } + + @Test fun openingTheSessionMenuReleasesHeldKeyboardKeys() { + ReflectionHelpers.getField(activity, "heldKeys").set(16, 17, true) + CompositorShadow.keys.clear() + ReflectionHelpers.callInstanceMethod(activity, "setDrawerOpen", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + assertEquals(17 to 0, CompositorShadow.keys.last()) + } + @Test fun horizontalWheelUsesTheSameDirectionInBothMouseBackends() { output.scrollHorizontal(2) assertEquals(listOf(Triple(11, 0, 240)), CompositorShadow.events) From 0a8d6669bfaa6552588c1e939a69be629f73f22a Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 10:09:54 -0500 Subject: [PATCH 20/60] ci: install the arm64 C library headers for the verified components (#2833) * ci: install the arm64 C library headers the verified components cross-compile against * ci: cross-compiling component recipes install the arm64 C library headers --- .github/workflows/build.yml | 2 +- tools/components/recipes.json | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba8049c2ff..d3ef5827b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -291,7 +291,7 @@ jobs: - name: Build the non-Adreno test additions (Mali bridge client, Venus GL probe, Xclipse layer) run: | set -euo pipefail - bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu libvulkan-dev + bash tools/ci/install-ubuntu-packages.sh gcc-aarch64-linux-gnu libc6-dev-arm64-cross libvulkan-dev D=app/src/main/assets/linuxfs mkdir -p "$D/usr/local/bin" "$D/usr/local/lib/droiddeck-xclipse" aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -pthread \ diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 2ccfff641b..79562333d4 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -29,6 +29,7 @@ "ndk": true, "packages": [ "gcc-aarch64-linux-gnu", + "libc6-dev-arm64-cross", "g++-aarch64-linux-gnu", "libvulkan1", "mesa-vulkan-drivers" @@ -155,7 +156,8 @@ "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-comet/version" ], "packages": [ - "gcc-aarch64-linux-gnu" + "gcc-aarch64-linux-gnu", + "libc6-dev-arm64-cross" ] }, "arm64-preloads": { @@ -178,6 +180,7 @@ ], "packages": [ "gcc-aarch64-linux-gnu", + "libc6-dev-arm64-cross", "g++-aarch64-linux-gnu" ], "source_inputs": [ @@ -245,7 +248,8 @@ "app/src/main/assets/linuxfs/usr/local/bin/droiddeck-vkbridge-smoke" ], "packages": [ - "gcc-aarch64-linux-gnu" + "gcc-aarch64-linux-gnu", + "libc6-dev-arm64-cross" ] }, "dirt-ws2": { From ca7b7e74ecadd48cfac33e5eeac2464bc76eca59 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 10:22:28 -0500 Subject: [PATCH 21/60] test(session): skip the /mnt view comparison on hosts where /mnt is a symlink (#2806) rawAndStorageMountViewsOverlapButDistinctFoldersDoNot canonicalizes /mnt/media_rw/... with the host JVM. On SteamOS and Fedora Atomic /mnt is a symlink to var/mnt, so the path resolves to /var/mnt/media_rw/..., which no Android device produces, and the unit suite fails there. Skip the case when the host's /mnt is a symlink. --- .../java/com/droiddeck/launcher/session/SteamLibrariesTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt index 5317e5ca33..cef09d10a5 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamLibrariesTest.kt @@ -4,6 +4,7 @@ import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.Library import java.io.File import org.junit.Assert.* +import org.junit.Assume.assumeFalse import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder @@ -145,6 +146,7 @@ class SteamLibrariesTest { } @Test fun rawAndStorageMountViewsOverlapButDistinctFoldersDoNot() { + assumeFalse(java.nio.file.Files.isSymbolicLink(File("/mnt").toPath())) val raw = SteamLibraries.canonical(File("/mnt/media_rw/ABCD-1234/Games")) val storage = SteamLibraries.canonical(File("/storage/ABCD-1234/Games")) assertEquals(storage, raw) From 75c19cae68fbf8dc4a469bb0aabb9afc08943dc1 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:28:35 +0300 Subject: [PATCH 22/60] fix(library): hide the Favorites soundtrack collection until it has a track --- .../launcher/frontend/SoundtrackCollections.kt | 5 +++-- .../java/com/droiddeck/launcher/ui/LibraryPage.kt | 2 +- .../launcher/frontend/SoundtrackCollectionsTest.kt | 11 +++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt index d680ae0709..9eebd911bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SoundtrackCollections.kt @@ -177,9 +177,10 @@ object SoundtrackCollections { source = Library.SOURCE_COLLECTION, soundtrack = true, ) - fun games(context: Context, favoritesLabel: String): List { + fun games(context: Context, favoritesLabel: String, skipEmptyFavorites: Boolean = false): List { val s = snapshot - return listOf(game(context, FAVORITES_ID, favoritesLabel, s.favorites)) + s.collections.map { game(context, it.id, it.name, it.tracks) } + val favorites = if (skipEmptyFavorites && s.favorites.isEmpty()) emptyList() else listOf(game(context, FAVORITES_ID, favoritesLabel, s.favorites)) + return favorites + s.collections.map { game(context, it.id, it.name, it.tracks) } } fun album(context: Context, id: Int): Soundtrack.Album { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 3a96df2f4b..3c26a37558 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -258,7 +258,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val favoritesLabel = stringResource(R.string.soundtracks_favorites) val all = remember(soundMode, s.steamGames, s.soundtracks, s.soundtracksEnabled, cloudRows, owned, installedStore, savedSnapshot, favoritesLabel) { if (soundMode) s.soundtracks.map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } + - (if (s.soundtracks.isEmpty() && savedSnapshot.favorites.isEmpty() && savedSnapshot.collections.isEmpty()) emptyList() else SoundtrackCollections.games(ctx, favoritesLabel)) + (if (s.soundtracks.isEmpty() && savedSnapshot.favorites.isEmpty() && savedSnapshot.collections.isEmpty()) emptyList() else SoundtrackCollections.games(ctx, favoritesLabel, skipEmptyFavorites = true)) .map { LibraryEntry("sound:${it.appId}", it.source, it.name, it, null, true) } else libraryEntries(s.steamGames + cloudRows + if (s.soundtracksEnabled) emptyList() else s.soundtracks.filter { it.library != Library.ADDED }, owned, installedStore) } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt index 6aa9bb1640..8ae6166895 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt @@ -40,4 +40,15 @@ class SoundtrackCollectionsTest { val list = listOf(Collection(2_000_000_005, "x", emptyList())) assertEquals(2_000_000_006, SoundtrackCollections.nextId(list)) } + + @Test fun emptyFavoritesCanBeLeftOutOfTheLibraryList() { + val context = androidx.test.core.app.ApplicationProvider.getApplicationContext() + SoundtrackCollections.load(context) + SoundtrackCollections.create(context, "Chill", emptyList()) + val ids = { skip: Boolean -> SoundtrackCollections.games(context, "Favorites", skip).map { it.appId } } + assertTrue(SoundtrackCollections.FAVORITES_ID in ids(false)) + assertFalse(SoundtrackCollections.FAVORITES_ID in ids(true)) + SoundtrackCollections.add(context, SoundtrackCollections.FAVORITES_ID, listOf(ref("a"))) + assertTrue(SoundtrackCollections.FAVORITES_ID in ids(true)) + } } From b74d005e7f2ebd4eee5bdffca3664ea59febf2da Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:43:26 +0300 Subject: [PATCH 23/60] fix(library): only list the Collections source when it has something to show --- .../java/com/droiddeck/launcher/ui/LibraryPage.kt | 2 +- .../launcher/frontend/SoundtrackCollectionsTest.kt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 3c26a37558..a90aa79ca8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -282,7 +282,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val gameJoltSignedIn = owned.containsKey(Store.GAMEJOLT) val sources = librarySources( all, SessionPrefs.storesTabOrder(ctx), - listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), + listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }).toSet(), favorites, concealed, LibraryDisplay.hidden && !soundMode, ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt index 8ae6166895..3d85fc18ff 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SoundtrackCollectionsTest.kt @@ -44,11 +44,11 @@ class SoundtrackCollectionsTest { @Test fun emptyFavoritesCanBeLeftOutOfTheLibraryList() { val context = androidx.test.core.app.ApplicationProvider.getApplicationContext() SoundtrackCollections.load(context) - SoundtrackCollections.create(context, "Chill", emptyList()) - val ids = { skip: Boolean -> SoundtrackCollections.games(context, "Favorites", skip).map { it.appId } } - assertTrue(SoundtrackCollections.FAVORITES_ID in ids(false)) - assertFalse(SoundtrackCollections.FAVORITES_ID in ids(true)) - SoundtrackCollections.add(context, SoundtrackCollections.FAVORITES_ID, listOf(ref("a"))) - assertTrue(SoundtrackCollections.FAVORITES_ID in ids(true)) + val custom = SoundtrackCollections.create(context, "Chill", emptyList())!! + val favorites = SoundtrackCollections.FAVORITES_ID + assertEquals(listOf(custom), SoundtrackCollections.games(context, "Favorites", skipEmptyFavorites = true).map { it.appId }) + assertEquals(listOf(favorites, custom), SoundtrackCollections.games(context, "Favorites").map { it.appId }) + SoundtrackCollections.add(context, favorites, listOf(ref("a"))) + assertEquals(listOf(favorites, custom), SoundtrackCollections.games(context, "Favorites", skipEmptyFavorites = true).map { it.appId }) } } From bb5218746f3ee14c93165d8f2c9681b8a26e6572 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 10:44:32 -0500 Subject: [PATCH 24/60] fix(drivers): Auto gives Xclipse GPUs the old RADV pair only where that build supports them (#2337) * fix: route unsupported Xclipse generations upstream * fix: let Auto load upstream Xclipse pairs * fix: clear stale auto-owned Xclipse RADV pair * fix(drivers): clear independently owned fallback selections * fix(drivers): keep independently chosen drivers when session start reconciles an unsupported Xclipse * fix(drivers): name the Xclipse from Vulkan before session start picks which drivers Auto clears * fix(drivers): keep the Vulkan query off the UI thread when session start reconciles Xclipse drivers * test(drivers): control Xclipse GPU family in auto-driver reconciliation test * fix(gpu): guard Xclipse auto-driver cleanup when running and handle open-driver bundles * fix(gpu): keep active RADV-Xclipse-upstream bundle on unsupported Xclipse --- .../com/droiddeck/launcher/DriverMenus.kt | 14 +- .../com/droiddeck/launcher/gpu/DriverPairs.kt | 11 +- .../com/droiddeck/launcher/gpu/GpuInfo.kt | 7 +- .../launcher/session/SessionPrefs.kt | 38 ++- .../launcher/session/SessionService.kt | 2 +- .../droiddeck/launcher/DriverMenusAutoTest.kt | 56 ++++- .../droiddeck/launcher/gpu/DriverPairsTest.kt | 40 ++- .../session/PowerVrAutoDriversTest.kt | 233 +++++++++++++++++- 8 files changed, 373 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt index 689279742f..925884b3c3 100644 --- a/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt +++ b/app/src/main/java/com/droiddeck/launcher/DriverMenus.kt @@ -319,7 +319,7 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl refreshDrivers() return } - if (gpu.family.mali && DriverPairs.recommendedKey(gpu, emptyList()) == null && + if (gpu.family.mali && !DriverPairs.autoEligible(gpu) && com.droiddeck.launcher.gpu.VulkanInfo.cachedOrNull() == null) { releaseChecking = true autoStatus = activity.getString(R.string.drivers_checking_latest) @@ -335,14 +335,14 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl }, "gpu-name").start() return } - Log.i(TAG, "auto: ${gpu.name} (${gpu.family}) -> " + (DriverPairs.recommendedKey(gpu, emptyList()) ?: "no pair")) - if (gpu.family.mali && DriverPairs.recommendedKey(gpu, emptyList()) == null) { + Log.i(TAG, "auto: ${gpu.name} (${gpu.family}) eligible=${DriverPairs.autoEligible(gpu)}") + if (gpu.family.mali && !DriverPairs.autoEligible(gpu)) { // No PanVK build covers this Mali (e.g. the G1 series, arch v14): the phone's own driver. autoStatus = useMaliFallback(null) refreshDrivers() return } - if (DriverPairs.recommendedKey(gpu, emptyList()) == null) { + if (!DriverPairs.autoEligible(gpu)) { autoStatus = activity.getString(R.string.drivers_none_to_set, gpu.supportText(activity, com.droiddeck.launcher.core.DeviceSupport.vkBridge(activity)).lowercase()) return } @@ -372,7 +372,11 @@ internal class DriverMenus(private val activity: Activity, private val ui: Handl } gpu.family == GpuInfo.Family.POWERVR && (pair == null || !pair.complete) -> { // RADV is not published right now: the Xclipse falls back to the system route. - SessionPrefs.ensurePowerVrAutoDrivers(activity) + if (gpu.name.contains("Xclipse", ignoreCase = true) && DriverPairs.xclipseNeedsUpstream(gpu.name)) { + if (!SessionState.running) SessionPrefs.ensurePowerVrAutoDrivers(activity, powerVr = true, autoOwnedOnly = true) + } else { + SessionPrefs.ensurePowerVrAutoDrivers(activity) + } autoStatus = activity.getString(R.string.drivers_powervr_builtin) refreshDrivers() } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt index ce7572bba4..fc40dc7143 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DriverPairs.kt @@ -18,6 +18,7 @@ object DriverPairs { /** RADV-Xclipse rebased on JimVulkan's upstream: a manual choice, never Auto. */ const val NAD_RADV_XCLIPSE_UPSTREAM = "nad:radv-xclipse-upstream" private val XCLIPSE_MODEL = Regex("""(?i)xclipse\s*(\d{3})\b""") + private val SUPPORTED_XCLIPSE_MODELS = setOf("530", "920", "940") const val NAD_MALI_JM = "nad:panvk-mali-jm" const val NAD_MALI_G710 = "nad:panvk-mali-g710" const val NAD_MALI_G615 = "nad:panvk-mali-g615" @@ -112,9 +113,12 @@ object DriverPairs { } } - /** 950 and 960 panic on the older build; a name without a model number is treated the same way. */ - private fun xclipseNeedsUpstream(name: String): Boolean = - XCLIPSE_MODEL.find(name)?.groupValues?.get(1).let { it == null || it == "950" || it == "960" } + internal fun xclipseNeedsUpstream(name: String): Boolean = + XCLIPSE_MODEL.find(name)?.groupValues?.get(1) !in SUPPORTED_XCLIPSE_MODELS + + fun autoEligible(gpu: GpuInfo, sdk: Int = android.os.Build.VERSION.SDK_INT): Boolean = + recommendedKey(gpu, emptyList(), sdk = sdk) != null || + (gpu.family == Family.POWERVR && gpu.name.contains("Xclipse", ignoreCase = true)) fun recommendedKey( gpu: GpuInfo, pairs: List, @@ -125,6 +129,7 @@ object DriverPairs { Family.POWERVR -> return when { !gpu.name.contains("Xclipse", ignoreCase = true) -> null xclipseNeedsUpstream(gpu.name) && pairs.any { it.key == NAD_RADV_XCLIPSE_UPSTREAM } -> NAD_RADV_XCLIPSE_UPSTREAM + xclipseNeedsUpstream(gpu.name) -> null else -> NAD_RADV_XCLIPSE } Family.MALI_OTHER, Family.NOT_ADRENO -> return null diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt index 7645d3326a..77cbdf55cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuInfo.kt @@ -118,9 +118,7 @@ data class GpuInfo( val samsung = Build.MANUFACTURER.equals("samsung", ignoreCase = true) return GpuInfo( name = when { - family == Family.POWERVR -> SystemVulkanDriver.gpuName().let { gpu -> - VulkanInfo.cachedOrNull()?.get("device")?.takeIf { it.contains(gpu, ignoreCase = true) } ?: gpu - } + family == Family.POWERVR -> systemDriverName(SystemVulkanDriver.gpuName(), VulkanInfo.cachedOrNull()) mali != null && mali.isNotEmpty() -> mali !adreno -> Build.HARDWARE.ifBlank { UNNAMED } model > 0 -> "Adreno $model" @@ -134,6 +132,9 @@ data class GpuInfo( ) } + fun systemDriverName(gpu: String, vulkan: Map?): String = + vulkan?.get("device")?.takeIf { it.contains(gpu, ignoreCase = true) } ?: gpu + internal fun verifiedOn(model: Int, device: String): Boolean = model == 722 && device.equals("Retroid Pocket Duo", ignoreCase = true) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 7a234c561c..d0da893c7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -697,14 +697,42 @@ object SessionPrefs { } @JvmStatic - fun ensurePowerVrAutoDrivers(context: Context) { - if (com.droiddeck.launcher.core.DeviceSupport.openDriverActive(context)) return - ensurePowerVrAutoDrivers(context, SystemVulkanDriver.isPowerVr()) + fun ensurePowerVrAutoDrivers(context: Context) = reconcilePowerVrAutoDrivers( + context, SystemVulkanDriver.isPowerVr(), SystemVulkanDriver.isXclipse(), + com.droiddeck.launcher.gpu.VulkanInfo::cachedOrNull, + ) + + fun ensurePowerVrAutoDriversAfterGpuQuery(context: Context) = reconcilePowerVrAutoDrivers( + context, SystemVulkanDriver.isPowerVr(), SystemVulkanDriver.isXclipse(), + com.droiddeck.launcher.gpu.VulkanInfo::query, + ) + + internal fun reconcilePowerVrAutoDrivers( + context: Context, powerVr: Boolean, xclipse: Boolean, vulkan: () -> Map?, + ) { + val device = if (xclipse) vulkan() ?: return else null + val unsupported = unsupportedXclipse(xclipse) { + com.droiddeck.launcher.gpu.GpuInfo.systemDriverName(SystemVulkanDriver.gpuName(), device) + } + val activeKey = com.droiddeck.launcher.gpu.DriverBundle.active(context) + ?.id + ?.let(com.droiddeck.launcher.gpu.DriverPairs::nonAdreno) + val upstreamBundle = activeKey == com.droiddeck.launcher.gpu.DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM || + (activeKey != null && activeKey.startsWith("${com.droiddeck.launcher.gpu.DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM}-")) + if (com.droiddeck.launcher.core.DeviceSupport.openDriverActive(context) && (!unsupported || upstreamBundle)) return + ensurePowerVrAutoDrivers(context, powerVr, unsupported) } - internal fun ensurePowerVrAutoDrivers(context: Context, powerVr: Boolean) { + internal fun unsupportedXclipse(xclipse: Boolean, gpuName: () -> String): Boolean = + xclipse && com.droiddeck.launcher.gpu.DriverPairs.xclipseNeedsUpstream(gpuName()) + + internal fun ensurePowerVrAutoDrivers(context: Context, powerVr: Boolean, autoOwnedOnly: Boolean = false) { if (!powerVr || gpuDriverMode(context) != GPU_DRIVERS_AUTO) return - prefs(context).edit().putString("linuxDriver", "").putString("androidDriver", TurnipDriver.AUTO).apply() + val owned = gpuAutoInstalled(context) + val edit = prefs(context).edit() + if (!autoOwnedOnly || linuxDriver(context) in owned) edit.putString("linuxDriver", "") + if (!autoOwnedOnly || androidDriver(context) in owned) edit.putString("androidDriver", TurnipDriver.AUTO) + edit.apply() } fun gpuAutoInstalled(context: Context): Set = diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 26b024aefc..278919bf54 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -497,7 +497,7 @@ class SessionService : Service() { private fun runSession(gen: Int) { - SessionPrefs.ensurePowerVrAutoDrivers(this) + SessionPrefs.ensurePowerVrAutoDriversAfterGpuQuery(this) if (!com.droiddeck.launcher.core.DeviceSupport.adreno()) { com.droiddeck.launcher.gpu.VulkanInfo.query()["api"]?.let { SessionPrefs.setHostVulkanApi(this, it) } if (SessionPrefs.venus(this)) VenusComponent.hostVulkanTooOld(this)?.let { diff --git a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt index 923c1f41fd..98feec59bc 100644 --- a/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/DriverMenusAutoTest.kt @@ -8,6 +8,10 @@ import com.droiddeck.launcher.session.QuestExperimental import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.gpu.TpUbwcHint import com.droiddeck.launcher.gpu.TurnipDriver +import com.droiddeck.launcher.gpu.TurnipReleases +import com.droiddeck.launcher.gpu.VulkanInfo +import com.droiddeck.launcher.gpu.SystemVulkanDriver +import com.droiddeck.launcher.wayland.CompositorHost import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -20,12 +24,26 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowBuild +import org.robolectric.shadows.ShadowLooper +import org.robolectric.annotation.Implementation +import org.robolectric.annotation.Implements import org.robolectric.util.ReflectionHelpers @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28], manifest = Config.NONE) +@Config(sdk = [28], manifest = Config.NONE, shadows = [DriverMenusAutoTest.XclipseDriver::class]) class DriverMenusAutoTest { + @Implements(SystemVulkanDriver::class) + class XclipseDriver { + companion object { + var enabled = false + @JvmStatic @Implementation fun isPowerVr() = enabled + @JvmStatic @Implementation fun isXclipse() = enabled + @JvmStatic @Implementation fun gpuName() = if (enabled) "Xclipse" else "PowerVR" + } + } + @Before fun reset() { + XclipseDriver.enabled = false ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "resolved", false) ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "cached", null) ReflectionHelpers.setStaticField(TpUbwcHint::class.java, "activeMode", null) @@ -35,6 +53,42 @@ class DriverMenusAutoTest { ShadowBuild.setDevice("eureka") } + @Test fun unsupportedXclipseFallsBackThroughAutoAndFlagsDisplayRestart() { + XclipseDriver.enabled = true + ShadowBuild.setModel("Generic phone") + ShadowBuild.setDevice("generic") + ReflectionHelpers.setStaticField(VulkanInfo::class.java, "cached", mapOf("device" to "Xclipse 540")) + val originalFetch = TurnipReleases.fetch + TurnipReleases.fetch = { _, _, _ -> "[]" } + val activity = Robolectric.buildActivity(Activity::class.java).setup().get() + SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setAndroidDriver(activity, "old-display") + SessionPrefs.setLinuxDriver(activity, "old-linux") + SessionPrefs.setGpuAutoInstalled(activity, setOf("old-display", "old-linux")) + ReflectionHelpers.setStaticField(CompositorHost::class.java, "started", true) + CompositorHost.displayChoice = "old-display" + try { + val menus = DriverMenus(activity, Handler(Looper.getMainLooper())) + menus.ensureAuto(force = true) + val deadline = System.currentTimeMillis() + 10000 + while (menus.releaseChecking && System.currentTimeMillis() < deadline) { + Thread.sleep(10) + ShadowLooper.idleMainLooper() + } + assertFalse(menus.releaseChecking) + assertEquals(activity.getString(R.string.drivers_powervr_builtin), menus.autoStatus) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(activity)) + assertEquals("", SessionPrefs.linuxDriver(activity)) + assertTrue(menus.restartPending) + } finally { + TurnipReleases.fetch = originalFetch + ReflectionHelpers.setStaticField(VulkanInfo::class.java, "cached", null) + ReflectionHelpers.setStaticField(CompositorHost::class.java, "started", false) + CompositorHost.displayChoice = null + XclipseDriver.enabled = false + } + } + @Test fun pickingTheAutoDisplayHandsBothHalvesToAuto() { val activity = Robolectric.buildActivity(Activity::class.java).setup().get() SessionPrefs.setGpuDriverMode(activity, SessionPrefs.GPU_DRIVERS_MIX) diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt index b234260030..ac77658543 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/DriverPairsTest.kt @@ -217,13 +217,43 @@ class DriverPairsTest { assertFalse(upstream.suits(GpuInfo("PowerVR", 0, Family.POWERVR, "", false))) assertEquals("RADV upstream · Samsung Xclipse", upstream.name) assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(xclipse, pairs)) - for (name in listOf("Samsung Xclipse 530", "Samsung Xclipse 540", "Samsung Xclipse 920")) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(GpuInfo("Samsung Xclipse 920", 0, Family.POWERVR, "", false), pairs)) + for (name in listOf("Samsung Xclipse 530")) assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(GpuInfo(name, 0, Family.POWERVR, "", false), pairs)) + for (name in listOf("Samsung Xclipse 540", "Samsung Xclipse 950", "Samsung Xclipse 960", "Xclipse")) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM, DriverPairs.recommendedKey(GpuInfo(name, 0, Family.POWERVR, "", false), pairs)) assertTrue(DriverPairs.isNonAdreno("RADV-Xclipse-upstream")) - for (name in listOf("Samsung Xclipse 950", "Samsung Xclipse 960", "Xclipse")) { - val newer = GpuInfo(name, 0, Family.POWERVR, "", false) - assertEquals(DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM, DriverPairs.recommendedKey(newer, pairs)) - assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(newer, pairs.filter { it.key != DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM })) + for (name in listOf("Samsung Xclipse 540", "Samsung Xclipse 950", "Samsung Xclipse 960", "Xclipse")) + assertNull(DriverPairs.recommendedKey(GpuInfo(name, 0, Family.POWERVR, "", false), pairs.filter { it.key != DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM })) + } + + @Test + fun autoEligibilityDoesNotDependOnPublishedXclipsePairs() { + fun mali(name: String) = GpuInfo(name, 0, GpuInfo.familyOf(false, 0, mali = name), "", false) + val xclipse540 = GpuInfo("Samsung Xclipse 540", 0, Family.POWERVR, "", false) + val xclipse920 = GpuInfo("Samsung Xclipse 920", 0, Family.POWERVR, "", false) + val upstream = TurnipReleases.Asset("Non-Adreno", "r1", "RADV-Xclipse-upstream.zip", "https://example/upstream", 9_000_000, + false, "label", "0".repeat(64), DriverPairs.nonAdreno("RADV-Xclipse-upstream"), bundle = true) + val pairs = DriverPairs.from(TurnipReleases.Check(listOf(upstream), emptyList(), emptyList(), 0L)) + assertTrue(DriverPairs.autoEligible(xclipse540)) + assertNull(DriverPairs.recommendedKey(xclipse540, emptyList())) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE_UPSTREAM, DriverPairs.recommendedKey(xclipse540, pairs)) + assertTrue(DriverPairs.autoEligible(xclipse920)) + assertEquals(DriverPairs.NAD_RADV_XCLIPSE, DriverPairs.recommendedKey(xclipse920, emptyList())) + assertTrue(DriverPairs.autoEligible(gpu(740))) + assertTrue(DriverPairs.autoEligible(mali("Mali-G57"))) + assertFalse(DriverPairs.autoEligible(mali("Mali-G1-Ultra"))) + assertFalse(DriverPairs.autoEligible(GpuInfo("PowerVR", 0, Family.POWERVR, "", false))) + } + + @Test + fun autoEligibilityMatchesRecommendedKeyForAdrenoAndMali() { + fun mali(name: String) = GpuInfo(name, 0, GpuInfo.familyOf(false, 0, mali = name), "", false) + for (gpu in listOf(gpu(710), gpu(740), mali("Mali-G57"), mali("Mali-G925-Immortalis MC12"))) { + assertEquals( + DriverPairs.recommendedKey(gpu, emptyList(), sdk = 34) != null, + DriverPairs.autoEligible(gpu, sdk = 34), + ) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/PowerVrAutoDriversTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PowerVrAutoDriversTest.kt index fe2f6a8125..804d96e88f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PowerVrAutoDriversTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PowerVrAutoDriversTest.kt @@ -1,26 +1,94 @@ package com.droiddeck.launcher.session import android.content.Context -import org.robolectric.RuntimeEnvironment +import android.net.Uri +import com.droiddeck.launcher.DriverMenusAutoTest +import com.droiddeck.launcher.core.DeviceSupport +import com.droiddeck.launcher.gpu.DriverBundle +import com.droiddeck.launcher.gpu.GpuInfo +import com.droiddeck.launcher.gpu.LinuxVulkanDriverManager import com.droiddeck.launcher.gpu.TurnipDriver +import org.json.JSONObject +import org.junit.After import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment import org.robolectric.annotation.Config +import java.io.File +import java.util.zip.ZipEntry +import java.util.zip.ZipOutputStream @RunWith(RobolectricTestRunner::class) -@Config(sdk = [28], manifest = Config.NONE) +@Config(sdk = [28], manifest = Config.NONE, shadows = [DriverMenusAutoTest.XclipseDriver::class]) class PowerVrAutoDriversTest { private val context: Context = RuntimeEnvironment.getApplication() @Before fun reset() { + DriverMenusAutoTest.XclipseDriver.enabled = false + clearBundles() context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() SessionPrefs.setLinuxDriver(context, "imported-linux") SessionPrefs.setAndroidDriver(context, "imported-display") } + @After fun cleanupBundles() { + clearBundles() + } + + private fun clearBundles() { + File(context.filesDir, "graphics_driver").deleteRecursively() + File(context.filesDir, LinuxVulkanDriverManager.DIR_NAME).deleteRecursively() + context.getSharedPreferences("driver_bundles", Context.MODE_PRIVATE).edit().clear().commit() + } + + private fun installAndSelectNonAdrenoBundle( + tag: String = "RADV-Xclipse", + packageName: String = "RADV-Xclipse", + ): DriverBundle.Bundle { + fun library(libc: String) = ByteArray(64).also { + byteArrayOf(0x7f, 'E'.code.toByte(), 'L'.code.toByte(), 'F'.code.toByte(), 2, 1).copyInto(it) + it[18] = 0xB7.toByte() + } + libc.toByteArray() + ByteArray(1) + + val manifest = JSONObject() + .put("package", packageName) + .put("version", "0.1.0") + .put("tag", tag) + .put( + "drivers", + JSONObject() + .put("android", JSONObject().put("path", "android")) + .put("linux", JSONObject().put("path", "linux")), + ) + val entries = mapOf( + "android/meta.json" to JSONObject().put("name", "radv v0.1.0").put("libraryName", "libvulkan_radeon.so").toString().toByteArray(), + "android/libvulkan_radeon.so" to library("libc.so"), + "linux/meta.json" to JSONObject().put("name", "radv v0.1.0").put("driverVersion", "radv-test").toString().toByteArray(), + "linux/libvulkan_radeon.so" to library("libc.so.6"), + "manifest.json" to manifest.toString().toByteArray(), + ) + val file = File.createTempFile("radv-bundle", ".zip", context.cacheDir) + return try { + ZipOutputStream(file.outputStream()).use { z -> + for ((name, data) in entries) { + z.putNextEntry(ZipEntry(name)) + z.write(data) + z.closeEntry() + } + } + val bundle = DriverBundle.install(context, Uri.fromFile(file)) + DriverBundle.select(context, bundle) + bundle + } finally { + file.delete() + } + } + @Test fun autoRepairsStaleAdrenoSelectionsOnPowerVr() { SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true) @@ -28,17 +96,172 @@ class PowerVrAutoDriversTest { assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) } - @Test fun explicitManualChoicesRemainOnPowerVr() { - SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_MANUAL) - SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true) + @Test fun nonXclipsePowerVrKeepsManualPair() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = true) assertEquals("imported-linux", SessionPrefs.linuxDriver(context)) assertEquals("imported-display", SessionPrefs.androidDriver(context)) } + @Test fun unsupportedXclipseClearsAnAutoOwnedOldPair() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setLinuxDriver(context, "old-linux") + SessionPrefs.setAndroidDriver(context, "old-display") + SessionPrefs.setGpuAutoInstalled(context, setOf("old-display", "old-linux")) + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = true) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + } + + @Test fun unsupportedXclipseKeepsAManualPair() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_MANUAL) + SessionPrefs.setLinuxDriver(context, "old-linux") + SessionPrefs.setAndroidDriver(context, "old-display") + SessionPrefs.setGpuAutoInstalled(context, setOf("old-display", "old-linux")) + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = true) + assertEquals("old-linux", SessionPrefs.linuxDriver(context)) + assertEquals("old-display", SessionPrefs.androidDriver(context)) + } + + @Test fun autoClearsOwnedDisplayButKeepsManualLinux() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-display")) + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = true) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + assertEquals("imported-linux", SessionPrefs.linuxDriver(context)) + } + + @Test fun autoClearsOwnedLinuxButKeepsManualDisplay() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-linux")) + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = true) + assertEquals("imported-display", SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + } + @Test fun adrenoAutoChoicesRemain() { SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = false) assertEquals("imported-linux", SessionPrefs.linuxDriver(context)) assertEquals("imported-display", SessionPrefs.androidDriver(context)) } + + @Test fun sessionStartKeepsStandaloneDriverOnUnsupportedXclipse() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setAndroidDriver(context, "standalone-display") + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-linux")) + val ownedOnly = SessionPrefs.unsupportedXclipse(true) { "Samsung Xclipse 540" } + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = ownedOnly) + assertEquals("standalone-display", SessionPrefs.androidDriver(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + } + + @Test fun sessionStartOwnershipRuleIgnoresOtherGpus() { + assertEquals(false, SessionPrefs.unsupportedXclipse(false) { "Samsung Xclipse 540" }) + assertEquals(false, SessionPrefs.unsupportedXclipse(true) { "Samsung Xclipse 920" }) + } + + @Test fun sessionStartNamesTheXclipseFromVulkanBeforeTheOwnershipRule() { + val queried = mapOf("device" to "Samsung Xclipse 920") + assertEquals("Xclipse", GpuInfo.systemDriverName("Xclipse", null)) + assertEquals("Samsung Xclipse 920", GpuInfo.systemDriverName("Xclipse", queried)) + assertEquals("PowerVR", GpuInfo.systemDriverName("PowerVR", queried)) + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-linux")) + val ownedOnly = SessionPrefs.unsupportedXclipse(true) { GpuInfo.systemDriverName("Xclipse", queried) } + SessionPrefs.ensurePowerVrAutoDrivers(context, powerVr = true, autoOwnedOnly = ownedOnly) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartLeavesTheGpuUnqueriedOffXclipse() { + var asked = false + assertEquals(false, SessionPrefs.unsupportedXclipse(false) { asked = true; "Xclipse" }) + assertEquals(false, asked) + } + + @Test fun cachedOnlySessionStartLeavesPrefsWhenTheXclipseIsUnnamed() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-display", "imported-linux")) + var reads = 0 + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { reads++; null } + assertEquals(1, reads) + assertEquals("imported-linux", SessionPrefs.linuxDriver(context)) + assertEquals("imported-display", SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartWithANamedXclipseClearsOnlyAutoOwnedSelections() { + DriverMenusAutoTest.XclipseDriver.enabled = true + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf("imported-linux")) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { + mapOf("device" to "Samsung Xclipse 540") + } + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals("imported-display", SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartUnsupportedXclipseResetsAutoOwnedEvenWithBothOpenDriversSelected() { + DriverMenusAutoTest.XclipseDriver.enabled = true + val bundle = installAndSelectNonAdrenoBundle() + assertTrue(DeviceSupport.openDriverActive(context)) + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf(bundle.androidId, bundle.linuxId)) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { + mapOf("device" to "Samsung Xclipse 540") + } + assertFalse(DeviceSupport.openDriverActive(context)) + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartUnsupportedXclipseKeepsAutoOwnedUpstreamBundle() { + DriverMenusAutoTest.XclipseDriver.enabled = true + val bundle = installAndSelectNonAdrenoBundle( + tag = "RADV-Xclipse-upstream", + packageName = "RADV-Xclipse-upstream", + ) + assertTrue(DeviceSupport.openDriverActive(context)) + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf(bundle.androidId, bundle.linuxId)) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { + mapOf("device" to "Samsung Xclipse 540") + } + assertTrue(DeviceSupport.openDriverActive(context)) + assertEquals(bundle.linuxId, SessionPrefs.linuxDriver(context)) + assertEquals(bundle.androidId, SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartSupportedXclipseKeepsActiveOpenDriverBundle() { + DriverMenusAutoTest.XclipseDriver.enabled = true + val bundle = installAndSelectNonAdrenoBundle() + assertTrue(DeviceSupport.openDriverActive(context)) + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.setGpuAutoInstalled(context, setOf(bundle.androidId, bundle.linuxId)) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { + mapOf("device" to "Samsung Xclipse 920") + } + assertTrue(DeviceSupport.openDriverActive(context)) + assertEquals(bundle.linuxId, SessionPrefs.linuxDriver(context)) + assertEquals(bundle.androidId, SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartWithASupportedXclipseClearsUnownedSelections() { + DriverMenusAutoTest.XclipseDriver.enabled = true + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = true) { + mapOf("device" to "Samsung Xclipse 920") + } + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + } + + @Test fun sessionStartReadsNoVulkanNameOffXclipse() { + SessionPrefs.setGpuDriverMode(context, SessionPrefs.GPU_DRIVERS_AUTO) + SessionPrefs.reconcilePowerVrAutoDrivers(context, powerVr = true, xclipse = false) { + throw AssertionError("queried") + } + assertEquals("", SessionPrefs.linuxDriver(context)) + assertEquals(TurnipDriver.AUTO, SessionPrefs.androidDriver(context)) + } } From a139d9eff43e25d9828ab863708803b4871ecca1 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:10:57 -0500 Subject: [PATCH 25/60] fix(compositor): hold releases from synchronized subsurfaces until the parent commits (#2721) * fix(compositor): hold releases from synchronized subsurfaces until the parent commits gamescope's Wayland backend moves layers between synchronized subsurface planes and commits the parent last. Each child commit was applied at once, so a buffer leaving one plane could be released before the next plane took it, and gamescope then logged "Compositor released us but we were not acquired". A buffer attached again also dropped its queued release, and the buffer trace records every attach. * fix(compositor): hold a synchronized release at its sync boundary and recheck holds on set_desync --------- Co-authored-by: maxjivi05 --- app/src/main/cpp/waylandcomp/src/compositor.c | 100 +++++- tools/tests/subsurface_release_harness.c | 318 ++++++++++++++++++ tools/tests/test_subsurface_release.py | 96 ++++++ tools/tests/test_vk_dmabuf_quarantine.py | 4 + tools/tests/test_wayland_clock_domain.py | 6 +- tools/tests/vk_dmabuf_quarantine_test.c | 6 +- 6 files changed, 508 insertions(+), 22 deletions(-) create mode 100644 tools/tests/subsurface_release_harness.c create mode 100644 tools/tests/test_subsurface_release.py diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index c2c26d63fe..f78f0d3f86 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -256,6 +256,7 @@ struct surface { struct wl_list child_link; int sub_x, sub_y, sub_pending_x, sub_pending_y, sub_pending; int below_parent; + int sub_desync; int fullscreen; int toplevel_committed; @@ -332,6 +333,7 @@ struct pending_release { struct wl_resource *buffer; struct wl_listener destroy; struct surface *surface; + struct surface *held_by; int64_t at_ns; int64_t since_ns; struct wl_list link; @@ -434,10 +436,54 @@ static void pending_release_free(struct pending_release *pr) { free(pr); } +static void release_due_buffers(void); +static void arm_release_timer(void); + static void pending_releases_forget_surface(struct surface *s) { struct pending_release *pr; - wl_list_for_each(pr, &g_pending_releases, link) + int unheld = 0; + wl_list_for_each(pr, &g_pending_releases, link) { if (pr->surface == s) pr->surface = NULL; + if (pr->held_by == s) { pr->held_by = NULL; unheld = 1; } + } + if (unheld) { release_due_buffers(); arm_release_timer(); } +} + +static void pending_releases_cancel(struct wl_resource *buffer) { + struct pending_release *pr, *tmp; + wl_list_for_each_safe(pr, tmp, &g_pending_releases, link) + if (pr->buffer == buffer) pending_release_free(pr); +} + +static void pending_releases_apply(struct surface *holder) { + struct pending_release *pr; + int unheld = 0; + wl_list_for_each(pr, &g_pending_releases, link) + if (pr->held_by == holder) { pr->held_by = NULL; unheld = 1; } + if (unheld) { release_due_buffers(); arm_release_timer(); } +} + +static struct surface *sync_holder(struct surface *s) { + struct surface *holder = NULL; + for (int depth = 0; s && s->role == ROLE_SUBSURFACE && s->parent && depth < 8; depth++) { + if (!s->sub_desync) holder = s->parent; + s = s->parent; + } + return holder; +} + +static void pending_releases_rehold(struct surface *changed) { + struct pending_release *pr; + int unheld = 0; + wl_list_for_each(pr, &g_pending_releases, link) { + if (!pr->held_by || !pr->surface) continue; + struct surface *s = pr->surface; + for (int depth = 0; s && s != changed && depth < 8; depth++) s = s->parent; + if (s != changed) continue; + pr->held_by = sync_holder(pr->surface); + if (!pr->held_by) unheld = 1; + } + if (unheld) { release_due_buffers(); arm_release_timer(); } } static void on_pending_release_buffer_destroyed(struct wl_listener *l, void *data) { @@ -450,20 +496,18 @@ static void arm_release_timer(void) { int64_t earliest = 0; if (g_release_timer_fd < 0) return; wl_list_for_each(pr, &g_pending_releases, link) - if (!buffer_release_blocked(pr->buffer) && (!earliest || pr->at_ns < earliest)) + if (!pr->held_by && !buffer_release_blocked(pr->buffer) && (!earliest || pr->at_ns < earliest)) earliest = pr->at_ns; struct itimerspec its = {0}; if (earliest) { its.it_value.tv_sec = earliest / 1000000000LL; its.it_value.tv_nsec = earliest % 1000000000LL; } timerfd_settime(g_release_timer_fd, TFD_TIMER_ABSTIME, &its, NULL); } -static int on_release_timer(int fd, uint32_t mask, void *data) { +static void release_due_buffers(void) { struct pending_release *pr, *tmp; - uint64_t expirations; int64_t now = now_ns() + 300000; - if (read(fd, &expirations, sizeof(expirations)) < 0 && errno != EAGAIN) return 0; wl_list_for_each_safe(pr, tmp, &g_pending_releases, link) { - if (pr->at_ns <= now && !buffer_release_blocked(pr->buffer)) { + if (!pr->held_by && pr->at_ns <= now && !buffer_release_blocked(pr->buffer)) { /* Attached again since (to its surface or another): that surface releases it later. */ if (buffer_shown_elsewhere(pr->buffer, NULL)) { pending_release_free(pr); @@ -474,28 +518,39 @@ static int on_release_timer(int fd, uint32_t mask, void *data) { pending_release_free(pr); } } +} + +static int on_release_timer(int fd, uint32_t mask, void *data) { + uint64_t expirations; + if (read(fd, &expirations, sizeof(expirations)) < 0 && errno != EAGAIN) return 0; + release_due_buffers(); wl_display_flush_clients(g_display); arm_release_timer(); return 0; } -static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_t since_ns) { +static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_t since_ns, struct surface *holder) { /* No allocation or immediate-release fallback is allowed for a quarantined * DMA-BUF. Existing queued releases stay held; their timer is disarmed. */ if (buffer_release_blocked(buffer)) return; const int limit = g_fps_limit; const int64_t interval = limit > 0 ? 1000000000LL / limit : g_refresh_ns; - if (g_release_unpaced || interval <= 0 || g_release_timer_fd < 0) { send_buffer_release(buffer); perf_note_release(since_ns); return; } + const int paced = !g_release_unpaced && interval > 0 && g_release_timer_fd >= 0; + if (!paced && !holder) { send_buffer_release(buffer); perf_note_release(since_ns); return; } int64_t now = now_ns(); - int64_t at = s->next_release_ns + interval; - int64_t latest = now + interval * (int64_t)(s->releases_pending + 1); - if (at < now) at = now; - if (at > latest) at = latest; - s->next_release_ns = at; + int64_t at = now; + if (paced) { + int64_t latest = now + interval * (int64_t)(s->releases_pending + 1); + at = s->next_release_ns + interval; + if (at < now) at = now; + if (at > latest) at = latest; + s->next_release_ns = at; + } struct pending_release *pr = calloc(1, sizeof(*pr)); if (!pr) { send_buffer_release(buffer); perf_note_release(since_ns); return; } pr->buffer = buffer; pr->surface = s; + pr->held_by = holder; pr->at_ns = at; pr->since_ns = since_ns; pr->destroy.notify = on_pending_release_buffer_destroyed; @@ -721,7 +776,7 @@ static void drop_dmabuf(struct surface *s, int paced) { wl_list_remove(&s->dmabuf_destroy.link); if (buffer_shown_elsewhere(s->dmabuf, s)) { } else if (!ahb_swapchain_defer_release(s->dmabuf_buf, s->dmabuf, s, paced)) { - if (paced) release_buffer(s, s->dmabuf, now_ns()); + if (paced) release_buffer(s, s->dmabuf, now_ns(), sync_holder(s)); else send_buffer_release(s->dmabuf); } s->dmabuf = NULL; @@ -887,6 +942,7 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re s->last_dmabuf = buffer; pace_note_buffer(buffer); drop_dmabuf(s, 1); + pending_releases_cancel(buffer); s->dmabuf = buffer; s->dmabuf_buf = b; b->refs++; @@ -977,7 +1033,7 @@ void droiddeck_dmabuf_ref(struct dmabuf_buffer *b) { b->refs++; } void droiddeck_dmabuf_unref(struct dmabuf_buffer *b) { dmabuf_buffer_unref(b); } void droiddeck_release_buffer(struct surface *s, struct wl_resource *buffer, int paced, int64_t since_ns) { if (buffer_release_blocked(buffer)) return; - if (paced && s) release_buffer(s, buffer, since_ns); + if (paced && s) release_buffer(s, buffer, since_ns, NULL); else { send_buffer_release(buffer); perf_note_release(since_ns); } } void droiddeck_surface_describe(const struct surface *s, char *out, size_t size) { describe(s, out, size); } @@ -1265,6 +1321,7 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { s->pending_attach = 0; surface_drop_idle(s); + buf_trace_attach(buffer); if (s->role == ROLE_CURSOR) { if (!buffer) { cursor_publish_hidden(); @@ -1275,7 +1332,6 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { } else if (s->role == ROLE_NONE) { if (buffer) surface_hold_idle(s, buffer); } else if (db) { - buf_trace_attach(buffer); take_dmabuf(s, db, buffer); } else if (shm) { drop_dmabuf(s, 1); @@ -1289,6 +1345,7 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { if (buffer) send_buffer_release(buffer); } } + pending_releases_apply(s); wl_list_for_each(child, &s->children, child_link) { if (child->sub_pending) { @@ -1486,8 +1543,14 @@ static void subsurface_place_below(struct wl_client *c, struct wl_resource *r, struct wl_resource *sibling) { restack_child(wl_resource_get_user_data(r), wl_resource_get_user_data(sibling), 0); } -static void subsurface_set_sync(struct wl_client *c, struct wl_resource *r) {} -static void subsurface_set_desync(struct wl_client *c, struct wl_resource *r) {} +static void subsurface_set_sync(struct wl_client *c, struct wl_resource *r) { + struct surface *s = wl_resource_get_user_data(r); + if (s) s->sub_desync = 0; +} +static void subsurface_set_desync(struct wl_client *c, struct wl_resource *r) { + struct surface *s = wl_resource_get_user_data(r); + if (s) { s->sub_desync = 1; pending_releases_rehold(s); } +} static const struct wl_subsurface_interface subsurface_impl = { .destroy = subsurface_destroy, .set_position = subsurface_set_position, @@ -1521,6 +1584,7 @@ static void subcompositor_get_subsurface(struct wl_client *c, struct wl_resource s->subsurface = sub; s->parent = p; s->below_parent = 0; + s->sub_desync = 0; s->sub_x = s->sub_y = 0; wl_list_insert(p->children.prev, &s->child_link); } diff --git a/tools/tests/subsurface_release_harness.c b/tools/tests/subsurface_release_harness.c new file mode 100644 index 0000000000..0921666d45 --- /dev/null +++ b/tools/tests/subsurface_release_harness.c @@ -0,0 +1,318 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include +#include +#include +#include "wayland-util.h" + +void wl_list_init(struct wl_list *list) { list->prev = list->next = list; } +void wl_list_insert(struct wl_list *list, struct wl_list *elm) { + elm->prev = list; + elm->next = list->next; + list->next = elm; + elm->next->prev = elm; +} +void wl_list_remove(struct wl_list *elm) { + elm->prev->next = elm->next; + elm->next->prev = elm->prev; + elm->next = elm->prev = NULL; +} +int wl_list_empty(const struct wl_list *list) { return list->next == list; } + +struct wl_listener { struct wl_list link; void (*notify)(struct wl_listener *, void *); }; +struct wl_resource { struct wl_list listeners; int acquired, releases, errors; }; +struct dmabuf_buffer { int unused; }; +enum surface_role { ROLE_NONE, ROLE_TOPLEVEL, ROLE_SUBSURFACE }; +struct surface { + struct wl_list link; + struct wl_resource *dmabuf; + struct dmabuf_buffer *dmabuf_buf; + struct wl_listener dmabuf_destroy; + int64_t next_release_ns; + int releases_pending; + enum surface_role role; + struct surface *parent; + int sub_desync; +}; + +#define TFD_TIMER_ABSTIME 1 +static struct wl_list g_surfaces; +static struct wl_list g_pending_releases; +static int g_release_timer_fd = 3; +static int g_fps_limit; +static int64_t g_refresh_ns = 8333333; +static int g_release_unpaced; +static int64_t g_now = 1000000000LL; +static int64_t g_armed; +static struct dmabuf_buffer g_buf; + +static int64_t now_ns(void) { return g_now; } +static void perf_note_release(int64_t since) { (void)since; } +static int buffer_release_blocked(struct wl_resource *b) { (void)b; return 0; } +static int ahb_swapchain_defer_release(struct dmabuf_buffer *b, struct wl_resource *r, struct surface *s, int paced) { + (void)b; (void)r; (void)s; (void)paced; + return 0; +} +static void dmabuf_buffer_unref(struct dmabuf_buffer *b) { (void)b; } +static void wl_resource_add_destroy_listener(struct wl_resource *r, struct wl_listener *l) { + wl_list_insert(r->listeners.prev, &l->link); +} +static int timerfd_settime(int fd, int flags, const struct itimerspec *its, struct itimerspec *old) { + (void)fd; (void)flags; (void)old; + g_armed = (int64_t)its->it_value.tv_sec * 1000000000LL + its->it_value.tv_nsec; + return 0; +} +static void send_buffer_release(struct wl_resource *b) { + b->releases++; + if (b->acquired) b->acquired = 0; + else b->errors++; +} + +#include "release.inc" + +static void present(struct wl_resource *b) { b->acquired = 1; } + +static void commit(struct surface *s, struct wl_resource *b) { + if (s->dmabuf != b) { + drop_dmabuf(s, 1); + if (b) { + pending_releases_cancel(b); + s->dmabuf = b; + s->dmabuf_buf = &g_buf; + wl_resource_add_destroy_listener(b, &s->dmabuf_destroy); + } + } + pending_releases_apply(s); +} + +static void timer_fires(int64_t at) { + if (g_now < at) g_now = at; + release_due_buffers(); + arm_release_timer(); +} + +static void surface_init(struct surface *s, enum surface_role role, struct surface *parent) { + memset(s, 0, sizeof(*s)); + s->role = role; + s->parent = parent; + wl_list_insert(g_surfaces.prev, &s->link); +} + +static void buffer_init(struct wl_resource *b) { + memset(b, 0, sizeof(*b)); + wl_list_init(&b->listeners); +} + +static void check(const struct wl_resource *b, int releases) { + if (b->releases != releases || b->errors) { + fprintf(stderr, "releases %d (want %d), released while not acquired %d\n", b->releases, releases, b->errors); + exit(1); + } +} + +static void moved_between_planes(void) { + struct surface root, low, high; + struct wl_resource a, b, c; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&low, ROLE_SUBSURFACE, &root); + surface_init(&high, ROLE_SUBSURFACE, &root); + buffer_init(&a); buffer_init(&b); buffer_init(&c); + + present(&a); present(&b); + commit(&high, &a); + commit(&low, &b); + commit(&root, NULL); + + present(&a); present(&b); + commit(&high, NULL); + timer_fires(g_now); + check(&a, 0); + commit(&low, &a); + timer_fires(g_now); + commit(&root, &b); + timer_fires(g_now + 100000000LL); + check(&a, 0); + check(&b, 0); + + present(&c); + commit(&high, NULL); + commit(&low, NULL); + commit(&root, &c); + timer_fires(g_now + 100000000LL); + check(&a, 1); + check(&b, 1); + check(&c, 0); +} + +static void reattached_before_release(void) { + struct surface s; + struct wl_resource a, b, c; + surface_init(&s, ROLE_TOPLEVEL, NULL); + buffer_init(&a); buffer_init(&b); buffer_init(&c); + g_fps_limit = 60; + present(&a); commit(&s, &a); + present(&b); commit(&s, &b); + present(&a); commit(&s, &a); + present(&c); commit(&s, &c); + timer_fires(g_now + 1000000000LL); + check(&a, 1); + check(&b, 1); + check(&c, 0); +} + +static void desync_child_not_held(void) { + struct surface root, child; + struct wl_resource a, b; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&child, ROLE_SUBSURFACE, &root); + child.sub_desync = 1; + buffer_init(&a); buffer_init(&b); + present(&a); commit(&child, &a); + present(&b); commit(&child, &b); + timer_fires(g_now + 100000000LL); + check(&a, 1); + check(&b, 0); +} + +static void toplevel_pacing_kept(void) { + struct surface s; + struct wl_resource a, b, c; + surface_init(&s, ROLE_TOPLEVEL, NULL); + buffer_init(&a); buffer_init(&b); buffer_init(&c); + g_fps_limit = 60; + const int64_t interval = 1000000000LL / 60; + present(&a); commit(&s, &a); + present(&b); commit(&s, &b); + present(&c); commit(&s, &c); + const int64_t start = g_now; + timer_fires(g_now); + check(&a, 1); + check(&b, 0); + assert(g_armed == start + interval); + timer_fires(start + interval / 2); + check(&b, 0); + timer_fires(g_armed); + check(&b, 1); + check(&c, 0); +} + +static void unpaced_sync_child(void) { + struct surface root, low, high; + struct wl_resource a, b; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&low, ROLE_SUBSURFACE, &root); + surface_init(&high, ROLE_SUBSURFACE, &root); + buffer_init(&a); buffer_init(&b); + g_release_unpaced = 1; + present(&a); commit(&high, &a); commit(&root, NULL); + present(&a); + commit(&high, NULL); + check(&a, 0); + commit(&low, &a); + commit(&root, NULL); + check(&a, 0); + commit(&low, NULL); + check(&a, 0); + commit(&root, NULL); + check(&a, 1); + present(&b); commit(&root, &b); + commit(&root, NULL); + check(&b, 1); +} + +static void holder_destroyed(void) { + struct surface root, child; + struct wl_resource a, b; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&child, ROLE_SUBSURFACE, &root); + buffer_init(&a); buffer_init(&b); + present(&a); commit(&child, &a); commit(&root, NULL); + present(&b); commit(&child, &b); + timer_fires(g_now + 100000000LL); + check(&a, 0); + child.parent = NULL; + wl_list_remove(&root.link); + pending_releases_forget_surface(&root); + check(&a, 1); +} + +static void cycled_faster_than_releases(void) { + struct surface s; + struct wl_resource a, b, c; + struct wl_resource *order[3] = {&a, &b, &c}; + surface_init(&s, ROLE_TOPLEVEL, NULL); + buffer_init(&a); buffer_init(&b); buffer_init(&c); + g_fps_limit = 60; + const int64_t interval = 1000000000LL / 60; + for (int i = 0; i < 30; i++) { + present(order[i % 3]); + commit(&s, order[i % 3]); + assert(s.releases_pending <= 2); + assert(g_armed <= g_now + 3 * interval); + } + timer_fires(g_now + 1000000000LL); + check(&a, 1); + check(&b, 1); + check(&c, 0); +} + +static void desync_parent_holds_sync_grandchild(void) { + struct surface root, middle, child; + struct wl_resource a, b; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&middle, ROLE_SUBSURFACE, &root); + surface_init(&child, ROLE_SUBSURFACE, &middle); + middle.sub_desync = 1; + buffer_init(&a); buffer_init(&b); + present(&a); commit(&child, &a); commit(&middle, NULL); + present(&b); commit(&child, &b); + timer_fires(g_now + 100000000LL); + check(&a, 0); + commit(&middle, NULL); + timer_fires(g_now + 100000000LL); + check(&a, 1); + check(&b, 0); +} + +static void set_desync_frees_held_release(void) { + struct surface root, outer, inner; + struct wl_resource a, b, c, d; + surface_init(&root, ROLE_TOPLEVEL, NULL); + surface_init(&outer, ROLE_SUBSURFACE, &root); + surface_init(&inner, ROLE_SUBSURFACE, &outer); + buffer_init(&a); buffer_init(&b); buffer_init(&c); buffer_init(&d); + present(&a); commit(&inner, &a); commit(&root, NULL); + present(&b); commit(&inner, &b); + present(&c); commit(&outer, &c); commit(&root, NULL); + present(&d); commit(&outer, &d); + inner.sub_desync = 1; + pending_releases_rehold(&inner); + timer_fires(g_now + 100000000LL); + check(&a, 1); + check(&c, 0); + outer.sub_desync = 1; + pending_releases_rehold(&outer); + timer_fires(g_now + 100000000LL); + check(&c, 1); + check(&b, 0); + check(&d, 0); +} + +int main(int argc, char **argv) { + assert(argc == 2); + wl_list_init(&g_surfaces); + wl_list_init(&g_pending_releases); + if (!strcmp(argv[1], "moved")) moved_between_planes(); + else if (!strcmp(argv[1], "reattached")) reattached_before_release(); + else if (!strcmp(argv[1], "cycled")) cycled_faster_than_releases(); + else if (!strcmp(argv[1], "desync")) desync_child_not_held(); + else if (!strcmp(argv[1], "toplevel")) toplevel_pacing_kept(); + else if (!strcmp(argv[1], "unpaced")) unpaced_sync_child(); + else if (!strcmp(argv[1], "destroyed")) holder_destroyed(); + else if (!strcmp(argv[1], "nested")) desync_parent_holds_sync_grandchild(); + else if (!strcmp(argv[1], "set-desync")) set_desync_frees_held_release(); + else return 2; + return 0; +} diff --git a/tools/tests/test_subsurface_release.py b/tools/tests/test_subsurface_release.py new file mode 100644 index 0000000000..2254eb1a71 --- /dev/null +++ b/tools/tests/test_subsurface_release.py @@ -0,0 +1,96 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] +SOURCE = REPO / 'app/src/main/cpp/waylandcomp/src/compositor.c' +FUNCTIONS = ( + 'pending_release_free', 'pending_releases_forget_surface', 'pending_releases_cancel', + 'pending_releases_apply', 'sync_holder', 'pending_releases_rehold', 'on_pending_release_buffer_destroyed', + 'arm_release_timer', 'release_due_buffers', 'release_buffer', 'buffer_shown_elsewhere', + 'drop_dmabuf', +) + + +def extract_function(source, name): + match = re.search(r'^static [^\n;]*?\b' + re.escape(name) + r'\([^;{]*\) \{$', source, re.MULTILINE) + if match is None: + raise AssertionError(f'Missing compositor function: {name}') + cursor, depth = match.end(), 1 + while depth: + depth += (source[cursor] == '{') - (source[cursor] == '}') + cursor += 1 + return match.group(0)[:-2] + ';', source[match.start():cursor] + + +def function_body(source, name): + return extract_function(source, name)[1] + + +class SubsurfaceReleaseTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + cls.source = SOURCE.read_text() + start = cls.source.index('struct pending_release {') + end = cls.source.index('\n};\n', start) + 4 + parts = [extract_function(cls.source, name) for name in FUNCTIONS] + code = cls.source[start:end] + '\n'.join(p[0] for p in parts) + '\n' + '\n'.join(p[1] for p in parts) + '\n' + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-subsurface-release-') + cls.addClassCleanup(cls.temp.cleanup) + folder = Path(cls.temp.name) + (folder / 'release.inc').write_text(code) + cls.binary = folder / 'release-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Werror', '-Wno-unused-function', + '-I', str(folder), '-I', str(REPO / 'app/src/main/cpp/waylandcomp/prebuilt/include'), + str(REPO / 'tools/tests/subsurface_release_harness.c'), '-o', str(cls.binary)], + check=True, capture_output=True, text=True) + + def check_case(self, case): + result = subprocess.run([str(self.binary), case], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + + def test_buffer_moved_to_another_plane_is_released_once_after_the_parent_commit(self): + self.check_case('moved') + + def test_buffer_attached_again_before_its_paced_release_is_released_once(self): + self.check_case('reattached') + + def test_buffers_cycled_faster_than_their_paced_releases_are_released_once_each(self): + self.check_case('cycled') + + def test_unpaced_sync_child_waits_for_the_parent_commit(self): + self.check_case('unpaced') + + def test_desynchronized_child_is_released_without_a_parent_commit(self): + self.check_case('desync') + + def test_toplevel_release_pacing_is_unchanged(self): + self.check_case('toplevel') + + def test_held_release_is_sent_when_the_parent_is_destroyed(self): + self.check_case('destroyed') + + def test_desynchronized_parent_releases_its_synchronized_child(self): + self.check_case('nested') + + def test_set_desync_releases_what_the_old_parent_held(self): + self.check_case('set-desync') + + def test_compositor_attach_and_commit_use_the_release_hold(self): + self.assertIn('pending_releases_cancel(buffer);', function_body(self.source, 'take_dmabuf')) + commit = function_body(self.source, 'surface_commit') + self.assertIn('pending_releases_apply(s);', commit) + self.assertLess(commit.index('take_dmabuf(s, db, buffer);'), commit.index('pending_releases_apply(s);')) + self.assertLess(commit.index('buf_trace_attach(buffer);'), commit.index('if (s->role == ROLE_CURSOR)')) + self.assertIn('pending_releases_rehold(s);', function_body(self.source, 'subsurface_set_desync')) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_vk_dmabuf_quarantine.py b/tools/tests/test_vk_dmabuf_quarantine.py index aeafada3ef..5bd0f1b016 100644 --- a/tools/tests/test_vk_dmabuf_quarantine.py +++ b/tools/tests/test_vk_dmabuf_quarantine.py @@ -51,6 +51,10 @@ class VkDmabufQuarantineTest(unittest.TestCase): # One surface per buffer in these scenarios: never shown elsewhere. helpers += ['static int buffer_shown_elsewhere(struct wl_resource *b, const struct surface *e) ' '{ (void)b; (void)e; return 0; }'] + if re.search(r'^static void release_due_buffers\(void\) \{', comp, re.M): + helpers += ['static void release_due_buffers(void);', 'static void arm_release_timer(void);', + function(comp, 'sync_holder')] + names.insert(names.index('on_release_timer'), 'release_due_buffers') if re.search(r'\bvolatile int g_release_unpaced;', comp): # Releases stay paced in these scenarios (fps limit -1 sends them at once). helpers.insert(0, 'static int g_release_unpaced;') diff --git a/tools/tests/test_wayland_clock_domain.py b/tools/tests/test_wayland_clock_domain.py index a805ff9c09..265b0b17b2 100644 --- a/tools/tests/test_wayland_clock_domain.py +++ b/tools/tests/test_wayland_clock_domain.py @@ -58,7 +58,7 @@ class WaylandClockDomainTest(unittest.TestCase): #include #include "clock_domain.h" -struct pending_release { void *buffer; int64_t at_ns; struct pending_release *next; }; +struct pending_release { void *buffer; int64_t at_ns; struct pending_release *next; void *held_by; }; static struct pending_release *g_pending_releases; static int g_release_timer_fd; #define wl_list_for_each(pr, list, link) for (pr = *(list); pr; pr = pr->next) @@ -79,8 +79,8 @@ int main(int argc, char **argv) { struct timespec started, ended; clock_gettime(CLOCK_MONOTONIC, &started); int64_t start = now_ns(); - struct pending_release blocked = {(void *)1, start + 1000000LL, NULL}; - struct pending_release release = {NULL, start + 60000000LL, &blocked}; + struct pending_release blocked = {(void *)1, start + 1000000LL, NULL, NULL}; + struct pending_release release = {NULL, start + 60000000LL, &blocked, NULL}; g_pending_releases = &release; arm_release_timer(); int64_t next_offset = offsets[i] + 10000000000LL; diff --git a/tools/tests/vk_dmabuf_quarantine_test.c b/tools/tests/vk_dmabuf_quarantine_test.c index cbcf724b19..f9dcf85bf0 100644 --- a/tools/tests/vk_dmabuf_quarantine_test.c +++ b/tools/tests/vk_dmabuf_quarantine_test.c @@ -25,7 +25,11 @@ struct dmabuf_buffer { struct vkp_image *img; void *ahb_state; }; +enum surface_role { ROLE_NONE, ROLE_TOPLEVEL, ROLE_SUBSURFACE }; struct surface { + enum surface_role role; + struct surface *parent; + int sub_desync; struct wl_resource *dmabuf; struct dmabuf_buffer *dmabuf_buf; struct wl_listener dmabuf_destroy; @@ -113,7 +117,7 @@ static void test_queue(int mixed, int client_gone) { g_release_timer_fd = 123; g_refresh_ns = 100000; drop_dmabuf(&s, 1); assert(s.releases_pending == 1 && !r.releases); assert(last_timer.it_value.tv_sec || last_timer.it_value.tv_nsec); - if (mixed) { init_resource(&shm, NULL); release_buffer(&s, &shm, now_ns()); } + if (mixed) { init_resource(&shm, NULL); droiddeck_release_buffer(&s, &shm, 1, now_ns()); } pending_releases_forget_surface(&s); g_dev_state = -3; fire_timer(); From 19fa6fd8e2e640a7346a2694c743afa45c3b2d1a Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Wed, 18 Nov 2026 18:42:37 +0100 Subject: [PATCH 26/60] fix(files): keep private app folders out of the documents provider (#2846) The provider rooted at dataDir exposed the wireless ADB pairing identity, shared_prefs, databases, store logins and Steam's saved login to any app the user picked the DroidDeck root for. Those folders are now hidden from listings and search, refused on open, and can't be created, renamed into, or carried out by renaming, moving or deleting a parent. Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> --- .../launcher/files/AppFilesProvider.kt | 36 +++++- .../launcher/files/AppFilesProviderTest.kt | 105 ++++++++++++++++++ 2 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/files/AppFilesProviderTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt b/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt index 9f534b39be..affd27293d 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/AppFilesProvider.kt @@ -13,6 +13,7 @@ import android.provider.DocumentsContract.Root import android.provider.DocumentsProvider import android.webkit.MimeTypeMap import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.io.FileNotFoundException import java.io.IOException @@ -26,11 +27,21 @@ import java.nio.file.attribute.BasicFileAttributes class AppFilesProvider : DocumentsProvider() { private lateinit var base: File private lateinit var baseCanonical: String + private lateinit var privatePaths: List override fun attachInfo(context: Context, info: ProviderInfo) { super.attachInfo(context, info) base = context.dataDir baseCanonical = base.canonicalPath + // The wireless ADB pairing identity, preferences, store logins and Steam's saved login stay app-only. + privatePaths = listOf( + context.noBackupFilesDir, + File(base, "shared_prefs"), + context.getDatabasePath("x").parentFile!!, + File(context.filesDir, "stores"), + File(SessionPrefs.steamRoot(context, "arm64"), "config"), + File(SessionPrefs.steamRoot(context, "x86_64"), "config"), + ).flatMap { listOf(it.absoluteFile.normalize().path, runCatching { it.canonicalPath }.getOrDefault(it.path)) }.distinct() } override fun onCreate() = true @@ -74,6 +85,7 @@ class AppFilesProvider : DocumentsProvider() { var file = File(parent, name) var n = 2 while (file.exists()) file = File(parent, "$name (${n++})") + if (isPrivate(file)) throw FileNotFoundException("could not create ${file.path}") val made = try { if (mimeType == Document.MIME_TYPE_DIR) file.mkdir() else file.createNewFile() } catch (e: IOException) { @@ -85,7 +97,7 @@ class AppFilesProvider : DocumentsProvider() { override fun deleteDocument(documentId: String) { val file = fileFor(documentId) - if (file.canonicalPath == baseCanonical) throw FileNotFoundException("the app folder itself is not deleted") + if (file.canonicalPath == baseCanonical || holdsPrivate(file)) throw FileNotFoundException("$documentId holds the app's private files") try { deleteTree(file.toPath()) } catch (e: IOException) { @@ -116,17 +128,19 @@ class AppFilesProvider : DocumentsProvider() { override fun renameDocument(documentId: String, displayName: String): String { val file = fileFor(documentId) + if (holdsPrivate(file)) throw FileNotFoundException("$documentId holds the app's private files") val target = File(file.parentFile, displayName.substringAfterLast('/')) - if (target.exists() || !file.renameTo(target)) throw FileNotFoundException("could not rename $documentId") + if (target.exists() || isPrivate(target) || !file.renameTo(target)) throw FileNotFoundException("could not rename $documentId") return target.absolutePath } override fun moveDocument(sourceDocumentId: String, sourceParentDocumentId: String, targetParentDocumentId: String): String { val source = fileFor(sourceDocumentId) + if (holdsPrivate(source)) throw FileNotFoundException("$sourceDocumentId holds the app's private files") val targetParent = fileFor(targetParentDocumentId) if (!targetParent.isDirectory) throw FileNotFoundException("$targetParentDocumentId is not a folder") val target = File(targetParent, source.name) - if (target.exists() || !source.renameTo(target)) throw FileNotFoundException("could not move $sourceDocumentId") + if (target.exists() || isPrivate(target) || !source.renameTo(target)) throw FileNotFoundException("could not move $sourceDocumentId") return target.absolutePath } @@ -163,7 +177,19 @@ class AppFilesProvider : DocumentsProvider() { val abs = f.absoluteFile.normalize().path if (abs != base.absolutePath && !abs.startsWith(base.absolutePath + "/")) return false val real = runCatching { f.canonicalPath }.getOrNull() ?: return false - return real == baseCanonical || real.startsWith("$baseCanonical/") + if (real != baseCanonical && !real.startsWith("$baseCanonical/")) return false + return !isPrivate(f) + } + + private fun isPrivate(f: File): Boolean { + val real = runCatching { f.canonicalPath }.getOrNull() ?: return true + val paths = listOf(f.absoluteFile.normalize().path, real) + return privatePaths.any { p -> paths.any { it == p || it.startsWith("$p/") } } + } + + private fun holdsPrivate(f: File): Boolean { + val paths = listOfNotNull(f.absoluteFile.normalize().path, runCatching { f.canonicalPath }.getOrNull()) + return privatePaths.any { p -> paths.any { p.startsWith("$it/") } } } private fun addRow(result: MatrixCursor, file: File) { @@ -173,7 +199,7 @@ class AppFilesProvider : DocumentsProvider() { } else if (file.canWrite()) { flags = flags or Document.FLAG_SUPPORTS_WRITE } - if (file.absolutePath != base.absolutePath && file.parentFile?.canWrite() == true) { + if (file.absolutePath != base.absolutePath && file.parentFile?.canWrite() == true && !holdsPrivate(file)) { flags = flags or Document.FLAG_SUPPORTS_DELETE or Document.FLAG_SUPPORTS_RENAME or Document.FLAG_SUPPORTS_MOVE or Document.FLAG_SUPPORTS_REMOVE } diff --git a/app/src/test/java/com/droiddeck/launcher/files/AppFilesProviderTest.kt b/app/src/test/java/com/droiddeck/launcher/files/AppFilesProviderTest.kt new file mode 100644 index 0000000000..6a413cc81a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/AppFilesProviderTest.kt @@ -0,0 +1,105 @@ +package com.droiddeck.launcher.files + +import android.Manifest +import android.content.pm.ProviderInfo +import android.database.Cursor +import android.provider.DocumentsContract.Document +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File +import java.io.FileNotFoundException + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class AppFilesProviderTest { + private val app get() = RuntimeEnvironment.getApplication() + private lateinit var provider: AppFilesProvider + private lateinit var base: File + + @Before fun setUp() { + base = app.dataDir + provider = AppFilesProvider() + provider.attachInfo(app, ProviderInfo().apply { + authority = "${app.packageName}.documents" + exported = true + grantUriPermissions = true + readPermission = Manifest.permission.MANAGE_DOCUMENTS + writePermission = Manifest.permission.MANAGE_DOCUMENTS + }) + } + + private fun file(path: String, text: String = "x") = File(base, path).apply { parentFile!!.mkdirs(); writeText(text) } + + private fun children(dir: File): List { + val c: Cursor = provider.queryChildDocuments(dir.absolutePath, null, null as String?) + try { + val names = mutableListOf() + while (c.moveToNext()) names += c.getString(c.getColumnIndexOrThrow(Document.COLUMN_DISPLAY_NAME)) + return names + } finally { + c.close() + } + } + + @Test fun listingHidesPrivateFolders() { + file("no_backup/adbkey") + file("shared_prefs/settings.xml") + file("databases/app.db") + file("files/stores/epic/auth.json") + file("files/saves/slot1.sav") + val steam = SessionPrefs.steamRoot(app, "arm64") + File(steam, "config/loginusers.vdf").apply { parentFile!!.mkdirs(); writeText("x") } + File(steam, "steamapps/game.txt").apply { parentFile!!.mkdirs(); writeText("x") } + + val root = children(base) + assertFalse(root.contains("no_backup")) + assertFalse(root.contains("shared_prefs")) + assertFalse(root.contains("databases")) + assertTrue(root.contains("files")) + val files = children(File(base, "files")) + assertFalse(files.contains("stores")) + assertTrue(files.contains("saves")) + val steamChildren = children(steam) + assertFalse(steamChildren.contains("config")) + assertTrue(steamChildren.contains("steamapps")) + } + + @Test fun privateFilesDoNotOpen() { + val key = file("no_backup/adbkey") + val prefs = file("shared_prefs/settings.xml") + val login = File(SessionPrefs.steamRoot(app, "x86_64"), "config/loginusers.vdf").apply { parentFile!!.mkdirs(); writeText("x") } + listOf(key, prefs, login).forEach { f -> + assertThrows(FileNotFoundException::class.java) { provider.openDocument(f.absolutePath, "r", null) } + assertThrows(FileNotFoundException::class.java) { provider.queryDocument(f.absolutePath, null) } + assertThrows(FileNotFoundException::class.java) { provider.deleteDocument(f.absolutePath) } + } + assertTrue(key.exists()) + } + + @Test fun ordinaryFileStillOpens() { + val save = file("files/saves/slot1.sav", "progress") + provider.openDocument(save.absolutePath, "r", null).use { pfd -> + assertEquals("progress", android.os.ParcelFileDescriptor.AutoCloseInputStream(pfd).bufferedReader().readText()) + } + } + + @Test fun privateFoldersCannotBeCreatedOrCarriedOut() { + File(base, "databases").deleteRecursively() + assertThrows(FileNotFoundException::class.java) { provider.createDocument(base.absolutePath, Document.MIME_TYPE_DIR, "databases") } + assertFalse(File(base, "databases").exists()) + file("files/stores/epic/auth.json") + val files = File(base, "files") + assertThrows(FileNotFoundException::class.java) { provider.renameDocument(files.absolutePath, "elsewhere") } + assertThrows(FileNotFoundException::class.java) { provider.deleteDocument(files.absolutePath) } + assertTrue(File(files, "stores/epic/auth.json").exists()) + } +} From fd2f1eec8afafaaab31b45b6cf23f051acc2a1d9 Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Wed, 18 Nov 2026 18:43:31 +0100 Subject: [PATCH 27/60] ci: fail the checks gate when store engine tests fail (#2844) * ci: fail the checks gate when store engine tests fail * test(ci): expect store-tests in the checks gate --------- Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> --- .github/workflows/build.yml | 7 +++---- tools/tests/test_ci_checks.py | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3ef5827b6..08cb6341be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -765,7 +765,6 @@ jobs: if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.draft }} runs-on: ubuntu-24.04 timeout-minutes: 15 - continue-on-error: true permissions: contents: read actions: read @@ -811,7 +810,6 @@ jobs: stores-host-v1-${{ runner.os }}-${{ runner.arch }}-${{ steps.rust.outputs.rustc }}- - name: Store engines host unit tests timeout-minutes: 10 - continue-on-error: true run: | set -o pipefail cd app/src/main/rust/stores @@ -900,7 +898,7 @@ jobs: checks: name: Compile and test APK - needs: [build, python-tests] + needs: [build, python-tests, store-tests] if: ${{ !cancelled() && (github.event_name != 'pull_request' || !github.event.pull_request.draft) }} runs-on: ubuntu-24.04 timeout-minutes: 5 @@ -909,7 +907,8 @@ jobs: env: BUILD_RESULT: ${{ needs.build.result }} PYTHON_RESULT: ${{ needs.python-tests.result }} - run: test "$BUILD_RESULT" = success && test "$PYTHON_RESULT" = success + STORE_RESULT: ${{ needs.store-tests.result }} + run: test "$BUILD_RESULT" = success && test "$PYTHON_RESULT" = success && test "$STORE_RESULT" = success sign: needs: [build, checks] diff --git a/tools/tests/test_ci_checks.py b/tools/tests/test_ci_checks.py index 125dba0398..bf3db6ec69 100644 --- a/tools/tests/test_ci_checks.py +++ b/tools/tests/test_ci_checks.py @@ -115,15 +115,15 @@ class CiChecksTest(unittest.TestCase): jobs = yaml.safe_load((ROOT / '.github/workflows/build.yml').read_text())['jobs'] gate = jobs['checks'] self.assertEqual(gate['name'], 'Compile and test APK') - self.assertEqual(set(gate['needs']), {'build', 'python-tests'}) + self.assertEqual(set(gate['needs']), {'build', 'python-tests', 'store-tests'}) self.assertIn('!cancelled()', gate['if']) - for build, python in itertools.product(('success', 'failure', 'cancelled', 'skipped'), repeat=2): - with self.subTest(build=build, python=python): + for build, python, store in itertools.product(('success', 'failure', 'cancelled', 'skipped'), repeat=3): + with self.subTest(build=build, python=python, store=store): result = subprocess.run( ['bash', '-c', gate['steps'][0]['run']], - env=dict(os.environ, BUILD_RESULT=build, PYTHON_RESULT=python), + env=dict(os.environ, BUILD_RESULT=build, PYTHON_RESULT=python, STORE_RESULT=store), capture_output=True) - self.assertEqual(result.returncode == 0, build == python == 'success') + self.assertEqual(result.returncode == 0, build == python == store == 'success') for publisher in ('sign', 'packs'): self.assertIn('checks', jobs[publisher]['needs']) From 801da99c11084a96ba6d72166301a95ea9bcf360 Mon Sep 17 00:00:00 2001 From: Dennis Zabolotny Date: Wed, 18 Nov 2026 19:55:22 +0200 Subject: [PATCH 28/60] fix(game-env): per-game DROIDDECK_GAME_TU_DEBUG reaches the game (#2781) * fix(game-env): per-game DROIDDECK_GAME_TU_DEBUG reaches the game game_gpu() ran on the inherited environment before apply_config() added the entries from game-environment.json, so a DROIDDECK_GAME_TU_DEBUG (or DROIDDECK_GAME_MESA_NO_ERROR) set for one game was passed through unchanged and TU_DEBUG was never set. apply_config() now returns its result through game_gpu(), so a per-game value is applied the same way as one from the session. * fix(game-env): a game's own TU_DEBUG still wins over a shared prefixed one Resolve the prefixed GPU keys inside the shared entries and inside the game's entries separately, before the game's entries are laid over the shared ones. A game's plain TU_DEBUG (or its removal with null) now beats a shared DROIDDECK_GAME_TU_DEBUG, and a prefixed value set for one game still applies. * fix(game-env): keep a plain TU_DEBUG over the prefixed key in the same profile --------- Co-authored-by: zdennisz <15849186+zdennisz@users.noreply.github.com> Co-authored-by: maxjivi05 --- .../overlay/usr/local/bin/droiddeck-game-env | 14 ++++++++++++-- tools/tests/test_game_environment.py | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index e58bf19790..042abd60bf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -453,6 +453,16 @@ def game_gpu(env, keep=False): return result +def split_game_gpu(entries): + result = dict(entries) + for key in GAME_SPLIT_KEYS: + if GAME_PREFIX + key in result: + value = result.pop(GAME_PREFIX + key) + if key not in entries: + result[key] = None if value == "" else value + return result + + def vram_cap(env): value = env.get("DD_VRAM_MB", "") if not re.fullmatch(r"[1-9][0-9]{0,6}", value): @@ -596,12 +606,12 @@ def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") result = env.copy() - entries = dict(config.get("shared", {})) + entries = split_game_gpu(config.get("shared", {})) for name, value in (fixes or {}).items(): if name == "WINEDLLOVERRIDES" and entries.get(name, env.get(name)): value = entries.get(name, env.get(name)) + ";" + value entries[name] = value - game = config.get("games", {}).get(app_id, {}) + game = split_game_gpu(config.get("games", {}).get(app_id, {})) fix = (fixes or {}).get("WINEDLLOVERRIDES") if fix and isinstance(game.get("WINEDLLOVERRIDES"), str): own = game["WINEDLLOVERRIDES"] diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 2e4a347f33..4b1974632b 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1231,6 +1231,22 @@ class GameEnvironmentTest(unittest.TestCase): env = gpu({"TU_DEBUG": "sysmem", "DROIDDECK_GAME_TU_DEBUG": ""}) self.assertEqual(MODULE["apply_config"](env, config, "42")["TU_DEBUG"], "sysmem") self.assertNotIn("TU_DEBUG", MODULE["apply_config"](env, config, "43")) + def applied(config, app_id="42", env=None): + return MODULE["apply_config"](env or {"TU_DEBUG": "sysmem"}, config, app_id) + prefixed = "DROIDDECK_GAME_TU_DEBUG" + config = {"version": 1, "games": {"42": {prefixed: "gmem"}, "43": {prefixed: ""}}} + self.assertEqual(applied(config)["TU_DEBUG"], "gmem") + self.assertNotIn("TU_DEBUG", applied(config, "43")) + self.assertNotIn(prefixed, applied(config)) + shared = {"version": 1, "shared": {prefixed: "gmem"}, "games": {"42": {"TU_DEBUG": "nolrz"}, "43": {"TU_DEBUG": None}}} + self.assertEqual(applied(shared)["TU_DEBUG"], "nolrz") + self.assertNotIn("TU_DEBUG", applied(shared, "43")) + self.assertEqual(applied(shared, "44")["TU_DEBUG"], "gmem") + self.assertNotIn(prefixed, applied(shared, "44")) + both = {"version": 1, "games": {"42": {"TU_DEBUG": "sysmem", prefixed: ""}, "43": {"TU_DEBUG": None, prefixed: "gmem"}}} + self.assertEqual(applied(both)["TU_DEBUG"], "sysmem") + self.assertNotIn("TU_DEBUG", applied(both, "43", {"TU_DEBUG": "nolrz"})) + self.assertNotIn(prefixed, applied(both)) def test_games_run_with_gl_error_checks_unless_the_user_turns_them_off(self): gpu = MODULE["game_gpu"] From d94906bd9c384355acc97c6e6da90d4894eab918 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 12:55:25 -0500 Subject: [PATCH 29/60] fix(audio): hold host restarts until an in-flight sink guard command finishes (#2821) * fix(audio): hold host restarts until an in-flight sink guard command finishes * fix(audio): judge sink guard commands by exit status and reap timed-out pactl * test(audio): hold the sink guard command until the test has checked the queued restart * test(audio): bound the stop check so a blocking stop fails instead of hanging * test(audio): bound the exit check while the sink guard command is paused --- .../launcher/audio/PulseAudioComponent.java | 87 +++++++++++++------ .../launcher/audio/PulseAudioComponentTest.kt | 74 ++++++++++++++++ 2 files changed, 134 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java index 6aa7d13456..53a0a6aacf 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java @@ -16,8 +16,10 @@ import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.IntConsumer; import java.util.function.IntSupplier; +import java.util.function.Supplier; public class PulseAudioComponent extends SessionPart { private static final String TAG = "PulseAudio"; @@ -38,6 +40,7 @@ public class PulseAudioComponent extends SessionPart { private long generation; private long launches; private final IntConsumer terminate; + final ReentrantReadWriteLock commands = new ReentrantReadWriteLock(); HostLifecycle(IntConsumer terminate) { this.terminate = terminate; @@ -54,11 +57,27 @@ public class PulseAudioComponent extends SessionPart { pid = -1; } - synchronized boolean launch(long expected, IntSupplier launch) { - if (expected != generation) return false; - launches++; - pid = launch.getAsInt(); - return true; + boolean launch(long expected, IntSupplier launch) { + commands.writeLock().lock(); + try { + synchronized (this) { + if (expected != generation) return false; + launches++; + pid = launch.getAsInt(); + return true; + } + } finally { + commands.writeLock().unlock(); + } + } + + T command(long token, Supplier command) { + commands.readLock().lock(); + try { + return live(token) ? command.get() : null; + } finally { + commands.readLock().unlock(); + } } synchronized boolean current(long expected) { @@ -218,13 +237,13 @@ public class PulseAudioComponent extends SessionPart { String loadedAs = null; for (int attempt = 1; attempt <= 5 && loadedAs == null && host.live(token); attempt++) { try { Thread.sleep(2000L); } catch (InterruptedException e) { Thread.currentThread().interrupt(); return; } - if (pactlFor(token, "load-module", "module-directaudio-native-sink", "sink_name=DirectAudio", "performance_mode=1", - "adaptive=1", "decay=0", "limiter=1", "watchdog=1", "volume=1.0", "control_dir=" + deviceControls) != null - && pactlFor(token, "set-default-sink", "DirectAudio") != null) { + if (pactlOk(token, "load-module", "module-directaudio-native-sink", "sink_name=DirectAudio", "performance_mode=1", + "adaptive=1", "decay=0", "limiter=1", "watchdog=1", "volume=1.0", "control_dir=" + deviceControls) + && pactlOk(token, "set-default-sink", "DirectAudio")) { loadedAs = "DirectAudio on attempt " + attempt; - } else if (pactlFor(token, "load-module", "module-aaudio-sink", "sink_name=AAudioSink", - "performance_mode=" + (attempt == 1 ? "1" : "0"), "adaptive=1", "volume=1.0", "control_dir=" + deviceControls) != null - && pactlFor(token, "set-default-sink", "AAudioSink") != null) { + } else if (pactlOk(token, "load-module", "module-aaudio-sink", "sink_name=AAudioSink", + "performance_mode=" + (attempt == 1 ? "1" : "0"), "adaptive=1", "volume=1.0", "control_dir=" + deviceControls) + && pactlOk(token, "set-default-sink", "AAudioSink")) { loadedAs = "the plain AAudio sink (AAudioSink) on attempt " + attempt; } } @@ -248,14 +267,24 @@ public class PulseAudioComponent extends SessionPart { } private String pactlFor(long token, String... args) { - return host.live(token) ? pactl(args) : null; + return host.command(token, () -> pactl(true, args)); } - /** Runs pactl against this daemon; its stdout, or null when it failed or timed out. */ - private String pactl(String... args) { + private boolean pactlOk(long token, String... args) { + return host.command(token, () -> pactl(false, args)) != null; + } + + private static void reap(java.lang.Process process) throws InterruptedException { + process.destroyForcibly(); + process.waitFor(2, TimeUnit.SECONDS); + } + + /** Runs pactl against this daemon; its stdout when captured (empty otherwise), or null when it failed or timed out. */ + private String pactl(boolean capture, String... args) { File pactl = new File(workingDir, "pactl"); if (!pactl.isFile() || host.pid <= 1) return null; java.lang.Process process = null; + File output = null; try { File modules = new File(workingDir, "modules/arm64"); ArrayList cmd = new ArrayList<>(); @@ -268,29 +297,33 @@ public class PulseAudioComponent extends SessionPart { builder.environment().put("HOME", workingDir.getAbsolutePath()); builder.environment().put("TMPDIR", workingDir.getAbsolutePath()); builder.environment().put("PULSE_SERVER", "unix:" + socket().getAbsolutePath()); - process = builder.start(); - String output; - try (InputStream in = process.getInputStream(); - java.io.ByteArrayOutputStream outStream = new java.io.ByteArrayOutputStream()) { - byte[] buf = new byte[4096]; - int n; - while ((n = in.read(buf)) != -1) { - outStream.write(buf, 0, n); - } - output = outStream.toString(java.nio.charset.StandardCharsets.UTF_8.name()); + if (capture) { + output = File.createTempFile("pactl", ".out", workingDir); + builder.redirectOutput(output); + } else { + builder.redirectOutput(new File("/dev/null")); } + process = builder.start(); if (!process.waitFor(5, TimeUnit.SECONDS)) { - process.destroyForcibly(); + reap(process); return null; } - return process.exitValue() == 0 ? output : null; + if (process.exitValue() != 0) return null; + return capture ? new String(Files.readAllBytes(output.toPath()), java.nio.charset.StandardCharsets.UTF_8) : ""; } catch (InterruptedException e) { Thread.currentThread().interrupt(); return null; } catch (Throwable t) { return null; } finally { - if (process != null && process.isAlive()) process.destroyForcibly(); + if (process != null && process.isAlive()) { + try { + reap(process); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + } + if (output != null) output.delete(); } } diff --git a/app/src/test/java/com/droiddeck/launcher/audio/PulseAudioComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/audio/PulseAudioComponentTest.kt index d06cc52d03..63c1003b4f 100644 --- a/app/src/test/java/com/droiddeck/launcher/audio/PulseAudioComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/audio/PulseAudioComponentTest.kt @@ -68,6 +68,80 @@ class PulseAudioComponentTest { assertFalse(host.live(host.token())) } + @Test + fun aRestartWaitsForAnInFlightSinkGuardCommand() { + val killed = mutableListOf() + val host = PulseAudioComponent.HostLifecycle { killed.add(it) } + val generation = host.begin() + host.launch(generation) { 31463 } + val first = host.token() + val checked = CountDownLatch(1) + val resume = CountDownLatch(1) + val pool = Executors.newFixedThreadPool(2) + try { + val command = pool.submit { + host.command(first) { + checked.countDown() + resume.await() + "old host" + } + } + assertTrue(checked.await(5, TimeUnit.SECONDS)) + assertTrue(pool.submit { host.exited(generation) }.get(5, TimeUnit.SECONDS)) + val launched = CountDownLatch(1) + val restart = pool.submit { + host.launch(generation) { + launched.countDown() + 31464 + } + } + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (!host.commands.hasQueuedThreads() && !restart.isDone && System.nanoTime() < deadline) Thread.yield() + assertTrue(host.commands.hasQueuedThreads()) + assertEquals(1L, launched.count) + assertFalse(restart.isDone) + resume.countDown() + assertEquals("old host", command.get(5, TimeUnit.SECONDS)) + assertTrue(restart.get(5, TimeUnit.SECONDS)) + assertEquals(31464, host.pid) + assertEquals(null, host.command(first) { error("stale guard reached the replacement host") }) + assertEquals("new host", host.command(host.token()) { "new host" }) + assertTrue(killed.isEmpty()) + } finally { + resume.countDown() + pool.shutdownNow() + } + } + + @Test + fun stopIsNotHeldUpByAnInFlightSinkGuardCommand() { + val killed = mutableListOf() + val host = PulseAudioComponent.HostLifecycle { killed.add(it) } + host.launch(host.begin()) { 31463 } + val token = host.token() + val checked = CountDownLatch(1) + val resume = CountDownLatch(1) + val pool = Executors.newFixedThreadPool(2) + try { + val command = pool.submit { + host.command(token) { + checked.countDown() + resume.await() + "done" + } + } + assertTrue(checked.await(5, TimeUnit.SECONDS)) + pool.submit { host.stop() }.get(5, TimeUnit.SECONDS) + assertEquals(listOf(31463), killed) + assertFalse(host.live(token)) + resume.countDown() + assertEquals("done", command.get(5, TimeUnit.SECONDS)) + } finally { + resume.countDown() + pool.shutdownNow() + } + } + @Test fun failedLaunchDoesNotRestartOrTerminateAnInvalidPid() { val host = PulseAudioComponent.HostLifecycle { error("invalid pid terminated") } From cca84f7b6b254afae05def785945e018c177f4fe Mon Sep 17 00:00:00 2001 From: unixenon <107151801+unixenon@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:55:28 -0600 Subject: [PATCH 30/60] fix(setup): show the saved Mali (Venus) switch after the app restarts (#2684) refresh() reloaded the Mali bridge switch from SessionPrefs but not Mali (Venus), so after any process restart (an app update, or Android reclaiming the app) Setup showed "Mali (Venus): off" while the saved setting stayed on and sessions kept using Venus. Only opening the Performance page (refreshCores) loaded the real value. The Vulkan 1.2 warning (venusHostVulkan) was dropped the same way. --- app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 711790c010..4a88837c8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -3101,6 +3101,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet installed = LinuxRuntimeInstaller.installedVersion(this) ready = LinuxRuntime.isInstalled(this) vkBridge = SessionPrefs.vkBridge(this) + venus = SessionPrefs.venus(this) + venusHostVulkan = com.droiddeck.launcher.session.VenusComponent.hostVulkanTooOld(this) vkBridgeSafe = SessionPrefs.vkBridgeSafe(this) bridgeProtonDxvk = SessionPrefs.bridgeProtonDxvk(this) removalPending = LinuxRuntimeInstaller.hasRemovalPending(this) From fc5dd7f3c59707b53fb3b6a9cf88a7cecffe91cd Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 19 Nov 2026 01:57:15 +0800 Subject: [PATCH 31/60] fix(input): the layout editor shows the same placement as the session (#2783) * fix(input): the layout editor shows the same placement as the session Editing a layout stored for one orientation while the editor is open in the other drew raw stored coordinates, so elements turned into flat, overlapping bars. Route the editor through OnScreenLayout like the on-screen controls: matched layouts are regenerated for the current screen, everything else follows the same fit, and the dirty check compares against what was shown when the editor opened. * fix(input): reset and scale in the editor frame the session saves The editor draft now carries the frame it was rebased to: the gamepad scaler is rebuilt with the editor surface's real dimensions when edits begin, so reset regenerates legacy controls for the display the user is editing instead of the primary display. Stock default positions keep their own frame aspect and are refitted into the draft frame before being applied, so reset on a differently shaped display lands where the editor shows and no longer marks an untouched layout as changed. * fix(input): refit only the default positions on reset and update the test callers --------- Co-authored-by: maxjivi05 --- .../launcher/input/InputLibraries.kt | 8 ++--- .../launcher/ui/InputSurfaceDialog.kt | 29 +++++++++++++------ .../launcher/ui/InputSurfaceEditorView.kt | 4 +-- .../launcher/input/InputLayoutToolsTest.kt | 4 +-- .../launcher/ui/InputSurfaceEditorViewTest.kt | 2 +- 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt index bcc641ebaa..5f0b082c8c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/InputLibraries.kt @@ -138,16 +138,16 @@ object InputLibraries { update(context) { library -> library.layouts.firstOrNull { it.id == layoutId && it.editable }?.let { library.withLayout(it.withQuickButton(button, shown)) } ?: library } }.isSuccess - fun defaultPositions(context: Context, library: InputLibrary, layout: SavedInputLayout): List? { + fun defaultPositions(context: Context, library: InputLibrary, layout: SavedInputLayout): Pair, Float>? { val origin = layout.origin ?: layout.id - InputStockLayouts.layouts().firstOrNull { it.id == origin }?.let { return it.elements } + InputStockLayouts.layouts().firstOrNull { it.id == origin }?.let { return it.elements to it.aspect } if (origin == OVERLAY || origin.startsWith("migrated.layout.")) { val (surfaceContext, metrics) = primaryDisplay(context) val size = if (origin == OVERLAY) listOf(metrics.widthPixels, metrics.heightPixels) else origin.removePrefix("migrated.layout.").split('x').mapNotNull { it.toIntOrNull() } - return size.takeIf { it.size == 2 && it.all { side -> side > 0 } }?.let { LegacyGamepadLayout(surfaceContext, it[0], it[1]).elements() } + return size.takeIf { it.size == 2 && it.all { side -> side > 0 } }?.let { LegacyGamepadLayout(surfaceContext, it[0], it[1]).elements() to it[0].toFloat() / it[1] } } - return library.layouts.firstOrNull { it.id == origin && it.id != layout.id }?.elements + return library.layouts.firstOrNull { it.id == origin && it.id != layout.id }?.let { it.elements to it.aspect } } @Suppress("DEPRECATION") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt index 065b2183ff..5b94225115 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceDialog.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.ui import android.app.Presentation +import android.graphics.Rect import android.hardware.display.DisplayManager import android.os.Bundle import android.os.Handler @@ -37,6 +38,7 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntSize +import kotlin.math.abs import kotlin.math.roundToInt import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalContext @@ -69,7 +71,8 @@ private class GamepadScaler(private val context: android.content.Context, privat } private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputBindings, val defaults: List? = null, - private val gamepad: GamepadScaler? = null, snap: Boolean = true) { + private val defaultsFrame: Float = 0f, private var gamepad: GamepadScaler? = null, snap: Boolean = true) { + val hasGamepad get() = gamepad != null var elements by mutableStateOf(layout.elements) var actions by mutableStateOf(preset.elements) var clicks by mutableStateOf(preset.clicks) @@ -86,30 +89,37 @@ private class SurfaceDraft(val layout: SavedInputLayout, val preset: SavedInputB var aspect by mutableFloatStateOf(layout.aspect) private var scaleBase by mutableStateOf, List, Float>?>(null) private var scaleValue by mutableIntStateOf(100) - private val rescales get() = gamepad != null && elements.any { it.id in gamepad.ids } + private val rescales get() = gamepad?.let { pad -> elements.any { it.id in pad.ids } } == true val scale get() = when { scaleBase?.second == elements -> scaleValue rescales -> (layoutScale * 100).roundToInt() else -> 100 } - val positioned get() = (if (rescales) gamepad!!.reset(elements) else defaults?.let { elements.withPositionsOf(it) }) + val positioned get() = (if (rescales) gamepad!!.reset(elements) else defaults?.let { elements.withPositionsOf(refit(it, defaultsFrame)) }) ?.takeIf { it != elements || rescales && layoutScale != 1f } + + private fun refit(placed: List, from: Float): List { + if (from <= 0f || aspect <= 0f || abs(from / aspect - 1f) < .01f) return placed + return OnScreenLayout.fit(placed, from, 1f, (aspect * 1000).roundToInt().coerceAtLeast(1), 1000, Rect()) + } val element get() = elements.firstOrNull { it.id == selected } val dirty get() = elements != layout.elements || actions != preset.elements || clicks != preset.clicks || layoutScale != layout.scale || aspect != layout.aspect fun checkpoint() { history = (history + SurfaceSnapshot(elements, actions, clicks, layoutScale, aspect)).takeLast(40) } fun undo() { history.lastOrNull()?.let { elements = it.elements; actions = it.actions; clicks = it.clicks; layoutScale = it.scale; aspect = it.aspect; history = history.dropLast(1) } } - fun beginEdit(displayed: List, aspect: Float) { + fun beginEdit(displayed: List, aspect: Float, scaler: GamepadScaler? = gamepad) { checkpoint() elements = OnScreenLayout.editorFrame(layout.copy(elements = elements), displayed) this.aspect = aspect + scaler?.let { gamepad = it } } fun scaleAll(percent: Int) { val base = scaleBase?.takeIf { it.second == elements } ?: Triple(elements, elements, if (rescales) layoutScale else 0f).also { checkpoint() } val factor = percent / 100f - elements = if (base.third > 0f && gamepad != null) { + val pad = gamepad + elements = if (base.third > 0f && pad != null) { layoutScale = factor - val others = base.first.filterNot { it.id in gamepad.ids }.scaled(factor / base.third).associateBy { it.id } - gamepad.rescale(base.first, base.third, factor).map { others[it.id] ?: it } + val others = base.first.filterNot { it.id in pad.ids }.scaled(factor / base.third).associateBy { it.id } + pad.rescale(base.first, base.third, factor).map { others[it.id] ?: it } } else base.first.scaled(factor) scaleValue = percent; scaleBase = Triple(base.first, elements, base.third) } @@ -134,7 +144,8 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () -> val (w, h) = OnScreenLayout.generatedSize(context, savedLayout, metrics.widthPixels, metrics.heightPixels) ?: (metrics.widthPixels to metrics.heightPixels) GamepadScaler(display, w, h) } - SurfaceDraft(savedLayout, savedBindings, InputLibraries.defaultPositions(context, library, savedLayout), gamepad, ControllerPrefs.snap(context)) + val defaults = InputLibraries.defaultPositions(context, library, savedLayout) + SurfaceDraft(savedLayout, savedBindings, defaults?.first, defaults?.second ?: 0f, gamepad, ControllerPrefs.snap(context)) } val manager = remember { context.getSystemService(DisplayManager::class.java) } var revision by remember { mutableIntStateOf(0) } @@ -258,7 +269,7 @@ private fun SurfaceCanvas(draft: SurfaceDraft, transparent: Boolean = false) { view.style = draft.layout.style.copy(hidden = emptySet()); view.sourceLayout = draft.layout; view.aspect = draft.aspect; view.elements = draft.elements; view.selected = draft.selected; view.snap = draft.snap view.isEnabled = !draft.properties && !draft.adding view.onSelect = { if (!draft.properties) draft.selected = it } - view.onBeginEdit = draft::beginEdit + view.onBeginEdit = { e, w, h -> draft.beginEdit(e, w.toFloat() / h, if (draft.hasGamepad) GamepadScaler(view.context, w, h) else null) } view.onChange = { e -> if (!draft.properties) draft.elements = draft.elements.map { if (it.id == e.id) e else it } } }) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt index e71aba6a59..1e21a245de 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/InputSurfaceEditorView.kt @@ -32,7 +32,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { var selected: String? = null set(value) { field = value; invalidate() } var onSelect: (String?) -> Unit = {} - var onBeginEdit: (List, Float) -> Unit = { _, _ -> } + var onBeginEdit: (List, Int, Int) -> Unit = { _, _, _ -> } var onChange: (InputSurfaceElement) -> Unit = {} private val preview = InputSurfaceView(context) private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = Color.rgb(26, 159, 255); strokeWidth = 2 * resources.displayMetrics.density } @@ -101,7 +101,7 @@ internal class InputSurfaceEditorView(context: Context) : FrameLayout(context) { MotionEvent.ACTION_MOVE -> { val e = original ?: return true if (!dragging && abs(event.x - downX) + abs(event.y - downY) > ViewConfiguration.get(context).scaledTouchSlop) { - dragging = true; onBeginEdit(visibleElements, width.toFloat() / height) + dragging = true; onBeginEdit(visibleElements, width, height) } if (!dragging) return true val dx = (event.x - downX) / width; val dy = (event.y - downY) / height diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt index a7a1138957..cdaa68a779 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputLayoutToolsTest.kt @@ -50,7 +50,7 @@ class InputLayoutToolsTest { assertEquals(InputLibraries.DECK, independent.layout(InputProfile.GAME, InputRole.SECONDARY)!!.origin) val stock = InputStockLayouts.layouts().first { it.id == InputLibraries.DECK }.elements val dragged = mine.copy(elements = mine.elements.map { it.copy(x = 0f, y = 0f) }) - assertEquals(stock, InputLibraries.defaultPositions(context, copied, dragged)) + assertEquals(stock to InputStockLayouts.layouts().first { it.id == InputLibraries.DECK }.aspect, InputLibraries.defaultPositions(context, copied, dragged)) assertEquals(mine.elements, dragged.elements.withPositionsOf(stock)) assertEquals(copied, InputLibraries.decode(InputLibraries.encode(copied))) } @@ -58,7 +58,7 @@ class InputLayoutToolsTest { @Test fun builtInGamepadDefaultsComeFromTheGamepadGenerator() { val library = InputLibraries.read(context) val gamepad = library.layouts.first { it.id == InputLibraries.OVERLAY } - val defaults = InputLibraries.defaultPositions(context, library, gamepad)!! + val defaults = InputLibraries.defaultPositions(context, library, gamepad)!!.first assertEquals(gamepad.elements.map { it.id }.toSet(), defaults.map { it.id }.toSet()) assertNull(InputLibraries.defaultPositions(context, library, SavedInputLayout("new", "New"))) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt index c74e5be155..192e70d5e1 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/InputSurfaceEditorViewTest.kt @@ -37,7 +37,7 @@ class InputSurfaceEditorViewTest { @Test fun editingStartsInTheDisplayedFrame() { val view = view() var started: Pair, Float>? = null - view.onBeginEdit = { elements, aspect -> started = elements to aspect } + view.onBeginEdit = { elements, w, h -> started = elements to w.toFloat() / h } val (x, y) = center() view.touch(MotionEvent.ACTION_DOWN, x, y) view.touch(MotionEvent.ACTION_MOVE, x + 100f, y + 50f) From 8cfe19cd1328b89c68fcd11244a6cec780830624 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Wed, 18 Nov 2026 12:13:04 -0600 Subject: [PATCH 32/60] fix(apps): B in the folder name field saves the name and returns to the title (#2534) * fix(apps): B in the folder name field saves the name and returns to the title With a controller, B in the folder name field only hid the keyboard and left focus in the field. The field now takes B as its way out: the keyboard goes, the name is saved and focus lands on the folder title. AdbTextField gets an optional onBack for this; fields without it behave as before. * fix(apps): closing the bottom-screen keyboard also leaves the folder name field With typing on the bottom screen, B is handled there and only cleared focus, so the folder name was not saved. A field with onBack now leaves through it on that path too. * fix(apps): the folder sheet hands B to the name field while renaming The sheet's own B handler sits above the name field and could take the press first, closing the folder. While the name is being edited the sheet now treats B as leaving the field: the keyboard goes, the name is saved and focus lands on the title. * chore: drop the added comments * Return focus to the folder title once the frame settles after renaming * Only let the active typing request close the field --------- Co-authored-by: maxjivi05 --- .../droiddeck/launcher/ui/AndroidAppsPage.kt | 27 +++++++++++++++++-- .../launcher/ui/WirelessAdbFixPage.kt | 8 ++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt index 4303dde0fe..8904f2c2d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AndroidAppsPage.kt @@ -848,13 +848,28 @@ private fun FolderSheet( renaming = false } val firstApp = remember { FocusRequester() } + val title = remember { FocusRequester() } + var toTitle by remember { mutableStateOf(false) } + var titleFocused by remember { mutableStateOf(false) } + val sheetView = androidx.compose.ui.platform.LocalView.current + val leaveName = { + if (renaming) { + (ctx.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(sheetView.windowToken, 0) + toTitle = true + commit() + } + } val inputMode = LocalInputModeManager.current.inputMode val ff = LocalFrontFocus.current val grid = rememberLazyGridState() var closing by remember { mutableStateOf(false) } var inside by remember { mutableStateOf(false) } LaunchedEffect(renaming, inputMode) { - if (!renaming && !closing && inputMode == InputMode.Keyboard && apps.isNotEmpty()) { + if (!renaming && !closing && toTitle) { + focusWithinFrames({ titleFocused || closing }) { title } + toTitle = false + } else if (!renaming && !closing && inputMode == InputMode.Keyboard && apps.isNotEmpty()) { grid.scrollToItem(0) androidx.compose.runtime.withFrameNanos { } // After touch, focus starts outside the page and the first request is turned to the page's own entry, behind the sheet. Ask until it is in here. @@ -885,6 +900,12 @@ private fun FolderSheet( .clip(Shape16).background(pal.surfaceVariant.copy(alpha = 0.97f)) .glideBorder(false, Shape16, pal.signal, pal.signal.copy(alpha = 0.22f)) .pointerInput(Unit) { awaitEachGesture { awaitFirstDown(requireUnconsumed = false).consume() } } + .onPreviewKeyEvent { event -> + val k = event.nativeKeyEvent + if (!renaming || k.keyCode != KeyEvent.KEYCODE_BUTTON_B) return@onPreviewKeyEvent false + if (k.action == KeyEvent.ACTION_DOWN && k.repeatCount == 0) leaveName() + true + } .controllerBack(close) .onFocusChanged { inside = it.hasFocus } .focusProperties { @@ -901,7 +922,7 @@ private fun FolderSheet( AdbTextField( value = name, onValueChange = { name = it.take(40) }, label = stringResource(R.string.apps_folder_name), keyboardType = KeyboardType.Text, imeAction = ImeAction.Done, compact = true, showLabel = false, - placeholder = folder.name, focusOnShow = true, onDone = { commit() }, + placeholder = folder.name, focusOnShow = true, onDone = { commit() }, onBack = leaveName, ) } else { val src = remember { MutableInteractionSource() } @@ -914,6 +935,8 @@ private fun FolderSheet( modifier = Modifier.clip(Shape12) .background(if (hot) pal.signal.copy(alpha = 0.12f) else colors.onBackground.copy(alpha = 0.07f)) .glideBorder(hot, Shape12, pal.signal) + .focusRequester(title) + .onFocusChanged { titleFocused = it.isFocused } .hoverable(src) .clickable(interactionSource = src, indication = LocalIndication.current, onClickLabel = stringResource(R.string.apps_folder_rename), role = Role.Button, onClick = rename) .controllerConfirm(onClick = rename) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index a685e414f3..276f82f79f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -365,8 +365,10 @@ internal fun AdbTextField( onDone: (() -> Unit)? = null, focusOnShow: Boolean = false, showLabel: Boolean = true, + onBack: (() -> Unit)? = null, ) { val context = LocalContext.current + val onBackLatest = rememberUpdatedState(onBack) val focusAsked = remember { booleanArrayOf(false) } val palette = LocalPalette.current val onValueChangeLatest = rememberUpdatedState(onValueChange) @@ -384,7 +386,8 @@ internal fun AdbTextField( fun typeOnBottom(editText: EditText): Boolean { if (!bottomTypingLatest.value || !DualScreenPanel.attached) return false val text = editText.text.toString() - val request = TypingRequest( + lateinit var request: TypingRequest + request = TypingRequest( TextFieldValue(text, TextRange(editText.selectionStart.coerceIn(0, text.length), editText.selectionEnd.coerceIn(0, text.length))), ImeOptions(singleLine = true, keyboardType = keyboardType, imeAction = imeAction), { next -> @@ -392,7 +395,7 @@ internal fun AdbTextField( editText.setSelection(next.selection.start.coerceIn(0, next.text.length), next.selection.end.coerceIn(0, next.text.length)) }, { action -> editText.onEditorAction(imeActionFlag(action)) }, - { editText.post { editText.clearFocus() } }, + { editText.post { if (typingRequest[0] === request) onBackLatest.value?.invoke() ?: editText.clearFocus() } }, ) typingRequest[0] = request DualScreenPanel.startTyping(request) @@ -463,6 +466,7 @@ internal fun AdbTextField( ?.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime()) == true if (hidingKeyboard) (view.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) ?.hideSoftInputFromWindow(view.windowToken, 0) + onBackLatest.value?.let { hidingKeyboard = true; it() } } hidingKeyboard } From 5afa8695a89cc5b53c13d00d63aed62eabcc4c50 Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Wed, 18 Nov 2026 19:14:49 +0100 Subject: [PATCH 33/60] fix(session): undo start-up work when a session is stopped while starting (#2840) * fix(session): undo start-up work when a session is stopped while starting * style(session): drop the added comment --------- Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> Co-authored-by: maxjivi05 --- .../launcher/session/SessionService.kt | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 278919bf54..f9ea8582d2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -569,7 +569,15 @@ class SessionService : Service() { stopSession(-1, gen) return } + if (!stillStarting()) { + Log.i(TAG, "session stopped while its files were staging") + return + } SessionArtifacts.awaitCollections() + if (!stillStarting()) { + Log.i(TAG, "session stopped while earlier session logs were being collected") + return + } SessionArtifacts.finishAbandoned(this, beforeGuestStart = true) VacDiagnostics.arm(this) com.droiddeck.launcher.agent.AgentGuest.reset(this) @@ -582,6 +590,7 @@ class SessionService : Service() { } catch (e: Exception) { Log.e(TAG, "could not publish the game environment", e) stopSession(-1, gen) + abandonStart(gen, sessionDir) return } val sessionLog = File(sessionDir, "session.log") @@ -610,6 +619,7 @@ class SessionService : Service() { Log.e(TAG, "Could not resolve the selected Linux Vulkan driver", e) failSession(gen, "VULKAN_DRIVER_UNAVAILABLE", e.message ?: "Selected Linux Vulkan driver is unavailable", -1) stopSession(-1, gen) + abandonStart(gen, sessionDir) return } if (steamHere) guest.add("DD_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) @@ -710,6 +720,7 @@ class SessionService : Service() { if (program.isNullOrEmpty()) { Log.e(TAG, "run mode without a program") stopSession(65, gen) + abandonStart(gen, sessionDir) return } guest.add(program) @@ -805,15 +816,25 @@ class SessionService : Service() { components.add(deviceControls) if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while it was starting; not launching it") - if (gen == sessionGen) components.clear() + abandonStart(gen, sessionDir) return } + val started = ArrayList() try { - components.forEach { it.start() } + for (part in components.toList()) { + if (!stillStarting()) { + Log.i(TAG, "session stopped while its components were starting; stopping the ${started.size} already started") + abandonStart(gen, sessionDir, started) + return + } + started.add(part) + part.start() + } } catch (e: Exception) { Log.e(TAG, "Could not start the session components", e) failSession(gen, "COMPONENT_START_FAILED", e.message ?: "Session component could not be started", -1) stopSession(-1, gen) + abandonStart(gen, sessionDir, started) return } @@ -840,9 +861,8 @@ class SessionService : Service() { launchWatcher = null syncWatcher?.stopWatching() syncWatcher = null - components.reversed().forEach { runCatching { it.stop() } } - components.clear() } + abandonStart(gen, sessionDir, started) if (pid > 1) Thread({ teardown(pid) }, "session-teardown").start() return } @@ -854,6 +874,7 @@ class SessionService : Service() { SessionEvents.record("guest.start_failed", mapOf("pid" to pid)) failSession(gen, "GUEST_START_FAILED", "The guest process could not be started", pid) stopSession(-1, gen) + abandonStart(gen, sessionDir, started) return } if (gen == sessionGen && SessionState.running) { @@ -908,6 +929,30 @@ class SessionService : Service() { } } + private fun abandonStart(gen: Int, sessionDir: File, started: List = emptyList()) { + val (ended, endedArch) = synchronized(stopLock) { + if (gen != sessionGen || SessionState.running) return + components.clear() + GpuClockPin.stop(this) + GameThreadHints.stop() + com.droiddeck.launcher.stores.StoreLaunchRequests.stop() + MemoryLog.stop() + val ended = synchronized(SessionPaths) { + if (SessionPaths.current() == sessionDir) SessionPaths.take() else null + } + if (ended != null) SessionArtifacts.collectionStarted(ended) + ended to SessionState.steamClientArch + } + started.asReversed().forEach { + try { + it.stop() + } catch (e: Exception) { + Log.w(TAG, "stopping ${it.javaClass.simpleName}", e) + } + } + if (ended != null) Thread({ collectSessionArtifacts(ended, endedArch) }, "session-collect").start() + } + private fun openSessionFolder(): File { val sessionDir = SessionPaths.beginOrCurrent(this) val sessionLog = File(sessionDir, "session.log") From 7680b4d771133da87c5bf9685f4ec0289740fb31 Mon Sep 17 00:00:00 2001 From: DeathKhan Date: Wed, 18 Nov 2026 13:05:30 -0600 Subject: [PATCH 34/60] fix(ui): fit the color picker on landscape screens (#2542) * fix(ui): lay the color picker out side by side on wide screens On a landscape screen the single column was taller than the screen. The wheel and swatches now sit beside the sliders and the hex field, so the whole picker is visible without scrolling. * fix(ui): give the landscape color picker a larger wheel and one closing row On a wide screen the picker still reached both screen edges: three sliders, the hex field and the buttons were stacked beside a small wheel. The wheel now fills the height of the sliders, and the comparison chip, the hex field, Cancel and OK share one row under them, so the dialog keeps a margin. OK is centered in both layouts. * fix(ui): keep the column color picker in landscape windows narrower than 600 dp The side by side layout needs 382 dp for its closing row before the hex field gets any width, so a small landscape window could squeeze the field to nothing. * fix(ui): fit the side by side color picker on short landscape screens On a 740 x 360 dp phone the closing row sat below the screen and had to be scrolled to. The wheel now takes its size from the screen height (up to the old 216 dp), and on a short screen the sliders get a shorter track and tighter spacing, so the whole dialog fits down to about 360 dp. Screens 468 dp tall and up, such as the Odin 3, look as before. ColorPickerLayoutTest now also checks that OK is on screen without scrolling at 740 x 360, 800 x 384 and in portrait. * chore: drop the added comments --------- Co-authored-by: maxjivi05 --- .../launcher/ui/ColorPickerDialog.kt | 98 ++++++++++++++----- .../droiddeck/launcher/ui/SettingsWidgets.kt | 7 +- .../launcher/ui/ColorPickerLayoutTest.kt | 54 ++++++++++ 3 files changed, 129 insertions(+), 30 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/ColorPickerLayoutTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt index d8b3c61a27..e9ff41cbe9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ColorPickerDialog.kt @@ -10,13 +10,17 @@ import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -31,12 +35,14 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.Role import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.droiddeck.launcher.R import kotlin.math.atan2 @@ -77,33 +83,63 @@ internal fun ColorPickerDialog(title: String, initial: Int, onDismiss: () -> Uni hue = h.coerceIn(0f, 360f); sat = s.coerceIn(0f, 1f); value = v.coerceIn(0f, 1f) hexText = ThemeColors.hex(ThemeColors.fromHsv(hue, sat, value)) } - AppDialog(shown, close, "colorPicker", wide = false, maxWidth = 460.dp, scrollState = scroll) { + val screen = LocalConfiguration.current + val beside = screen.screenWidthDp > screen.screenHeightDp && screen.screenWidthDp >= 600 + val wheelSize = if (beside) (screen.screenHeightDp - 176).coerceIn(160, 216).dp else 168.dp + val short = beside && wheelSize < 216.dp + AppDialog(shown, close, "colorPicker", wide = false, maxWidth = if (beside) 680.dp else 460.dp, scrollState = scroll) { DialogTitleRow(title, close) - Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { - ColorWheel(hue, sat, value) { h, s -> picked(h = h, s = s) } - Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Swatch(Color(initial)) - Swatch(Color(current)) - } + val wheel: @Composable () -> Unit = { ColorWheel(hue, sat, value, wheelSize) { h, s -> picked(h = h, s = s) } } + val track = if (short) 24.dp else 40.dp + val sliders: @Composable () -> Unit = { + ValueSlider(hue.toInt(), 0..360, step = 5, enabled = true, label = stringResource(R.string.theme_color_hue), format = { "$it°" }, + modifier = Modifier.focusRequester(first), track = track) { picked(h = it.toFloat()) } + ValueSlider((sat * 100).toInt(), 0..100, step = 2, enabled = true, label = stringResource(R.string.theme_color_saturation), format = { "$it%" }, + track = track) { picked(s = it / 100f) } + ValueSlider((value * 100).toInt(), 0..100, step = 2, enabled = true, label = stringResource(R.string.theme_color_brightness), format = { "$it%" }, + track = track) { picked(v = it / 100f) } } - ValueSlider(hue.toInt(), 0..360, step = 5, enabled = true, label = stringResource(R.string.theme_color_hue), format = { "$it°" }, - modifier = Modifier.focusRequester(first)) { picked(h = it.toFloat()) } - ValueSlider((sat * 100).toInt(), 0..100, step = 2, enabled = true, label = stringResource(R.string.theme_color_saturation), format = { "$it%" }) { picked(s = it / 100f) } - ValueSlider((value * 100).toInt(), 0..100, step = 2, enabled = true, label = stringResource(R.string.theme_color_brightness), format = { "$it%" }) { picked(v = it / 100f) } - AdbTextField( - value = hexText, - onValueChange = { text -> - hexText = text - ThemeColors.parseHex(text)?.let { argb -> ThemeColors.toHsv(argb).let { hsv -> hue = hsv.h; sat = hsv.s; value = hsv.v } } - }, - label = "", keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Done, placeholder = stringResource(R.string.theme_color_hex), - onFocusChange = { typingHex = it }, - onDone = { ThemeColors.parseHex(hexText)?.let { onApply(it); close() } }, - ) - Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { - SecondaryButton(stringResource(R.string.common_cancel), modifier = Modifier.weight(1f), onClick = close) - PrimaryButton(stringResource(R.string.common_ok), enabled = ThemeColors.parseHex(hexText) != null, modifier = Modifier.weight(1f)) { - ThemeColors.parseHex(hexText)?.let { onApply(it); close() } + val hex: @Composable (Modifier) -> Unit = { modifier -> + AdbTextField( + value = hexText, + onValueChange = { text -> + hexText = text + ThemeColors.parseHex(text)?.let { argb -> ThemeColors.toHsv(argb).let { hsv -> hue = hsv.h; sat = hsv.s; value = hsv.v } } + }, + label = "", keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Done, placeholder = stringResource(R.string.theme_color_hex), + showLabel = false, compact = beside, modifier = modifier, + onFocusChange = { typingHex = it }, + onDone = { ThemeColors.parseHex(hexText)?.let { onApply(it); close() } }, + ) + } + val ok = { ThemeColors.parseHex(hexText)?.let { onApply(it); close() }; Unit } + val valid = ThemeColors.parseHex(hexText) != null + if (beside) { + Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + wheel() + Column(verticalArrangement = Arrangement.spacedBy(if (short) 2.dp else 8.dp), modifier = Modifier.weight(1f)) { + CompositionLocalProvider(LocalCompactSettings provides true) { sliders() } + } + } + Row(horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + BeforeAfter(Color(initial), Color(current), Modifier.size(96.dp, 44.dp)) + hex(Modifier.weight(1f)) + SecondaryButton(stringResource(R.string.common_cancel), modifier = Modifier.width(128.dp), onClick = close) + PrimaryButton(stringResource(R.string.common_ok), enabled = valid, modifier = Modifier.width(128.dp), fill = true, onClick = ok) + } + } else { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { + wheel() + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Swatch(Color(initial)) + Swatch(Color(current)) + } + } + sliders() + hex(Modifier) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.common_cancel), modifier = Modifier.weight(1f), onClick = close) + PrimaryButton(stringResource(R.string.common_ok), enabled = valid, modifier = Modifier.weight(1f), fill = true, onClick = ok) } } } @@ -116,9 +152,17 @@ private fun Swatch(color: Color) { } @Composable -private fun ColorWheel(hue: Float, sat: Float, value: Float, onPick: (hue: Float, sat: Float) -> Unit) { +private fun BeforeAfter(before: Color, after: Color, modifier: Modifier) { + val shape = RoundedCornerShape(10.dp) + Row(modifier.clip(shape).border(1.dp, LocalPalette.current.line2, shape)) { + Box(Modifier.weight(1f).fillMaxHeight().background(before)) + Box(Modifier.weight(1f).fillMaxHeight().background(after)) + } +} + +@Composable +private fun ColorWheel(hue: Float, sat: Float, value: Float, size: Dp, onPick: (hue: Float, sat: Float) -> Unit) { val rim = MaterialTheme.colorScheme.onBackground - val size = 168.dp fun at(offset: Offset, side: Float) { val center = side / 2f val dx = offset.x - center diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index b5595a52b7..5ebcc3c051 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -108,6 +108,7 @@ import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalInputModeManager import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.IntRect import androidx.compose.ui.unit.IntSize @@ -605,7 +606,7 @@ fun SliderRow( @Composable fun ValueSlider( value: Int, range: IntRange, step: Int, enabled: Boolean, label: String?, format: (Int) -> String, - modifier: Modifier = Modifier, onChange: (Int) -> Unit, + modifier: Modifier = Modifier, track: Dp = 40.dp, onChange: (Int) -> Unit, ) { val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme @@ -628,7 +629,7 @@ fun ValueSlider( } } Column( - modifier = modifier.fillMaxWidth().heightIn(min = if (compact) 64.dp else 72.dp) + modifier = modifier.fillMaxWidth().heightIn(min = track + if (compact) 24.dp else 32.dp) .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) .glideBorder(hot, shape, pal.signal) .alpha(if (enabled) 1f else 0.5f) @@ -663,7 +664,7 @@ fun ValueSlider( Text(text, fontSize = if (compact) 12.sp else 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) } Canvas( - Modifier.fillMaxWidth().height(40.dp).onSizeChanged { trackPx = it.width } + Modifier.fillMaxWidth().height(track).onSizeChanged { trackPx = it.width } .pointerInput(enabled, range, step, thumbInset) { if (enabled) detectTapGestures { fromX(it.x) } } .pointerInput(enabled, range, step, thumbInset) { if (enabled) detectHorizontalDragGestures { change, _ -> fromX(change.position.x); change.consume() } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ColorPickerLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ColorPickerLayoutTest.kt new file mode 100644 index 0000000000..41c43ad81c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/ColorPickerLayoutTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.test.getUnclippedBoundsInRoot +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.R +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w832dp-h468dp-land-369dpi") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class ColorPickerLayoutTest { + @get:Rule val compose = createRobolectricComposeRule() + + private fun show() { + compose.setContent { + DroidDeckTheme(theme = Themes.GRAPHITE) { ColorPickerDialog("Highlight color", 0xFFE53935.toInt(), onDismiss = {}) {} } + } + compose.mainClock.advanceTimeBy(1_000) + } + + private fun ok() = compose.onNodeWithText(RuntimeEnvironment.getApplication().getString(R.string.common_ok)).getUnclippedBoundsInRoot() + + private fun assertOkOnScreen() { + val height = RuntimeEnvironment.getApplication().resources.configuration.screenHeightDp.dp + val ok = ok() + assertTrue("OK ends at ${ok.bottom} on a $height screen", ok.bottom <= height - 28.dp) + assertTrue("OK starts at ${ok.top}", ok.top >= 0.dp) + } + + @Test fun onALandscapeHandheldThePickerEndsWellAboveTheScreenEdge() { + show() + val ok = ok() + val title = compose.onNodeWithText("Highlight color").getUnclippedBoundsInRoot() + assertTrue("OK ends at ${ok.bottom}, title ${title.top}", ok.bottom <= 468.dp - 40.dp) + assertTrue("title starts at ${title.top}", title.top >= 40.dp) + } + + @Test @Config(qualifiers = "w740dp-h360dp-land-420dpi") + fun onAShortLandscapePhoneOkIsOnScreen() { show(); assertOkOnScreen() } + + @Test @Config(qualifiers = "w800dp-h384dp-land") + fun onAShortWideScreenOkIsOnScreen() { show(); assertOkOnScreen() } + + @Test @Config(qualifiers = "w411dp-h891dp-port-420dpi") + fun inPortraitOkIsOnScreen() { show(); assertOkOnScreen() } +} From a5d8abeab454925636003f17c029a5083847f762 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 14:14:26 -0500 Subject: [PATCH 35/60] feat(xbox): install legacy EAppx titles through Windows Update (on main) (#2825) * feat(xbox): install legacy EAppx titles through Windows Update A legacy Store title does not ship as MSIXVC. It ships as an encrypted EAppx bundle, which streaming rejects, so the store could list the game and never install it. Accept EAPPX and EAPPXBUNDLE beside MSIXVC, carry the format through the catalogue, the install record and the cached library, and dispatch legacy-install for those formats. Two backend patches do the work: - droiddeck-legacy-packages.patch lets the plan, license and extract verbs handle a legacy package, and expands a bundle in place (nesting bounded at three), decrypting each inner EAppx with the same keys. - droiddeck-legacy-install.patch adds legacy-install: resolve, license, download, extract, hoist AppxManifest.xml to the game root. Resolution asks the Xbox content service first and Windows Update second, because some legacy products return no files from the content service at all. The WU endpoint needs no Xbox credential but chains to Microsoft's ECC Product Root CA 2018, which Android's CA bundle does not carry, so that one public root is pinned for those requests. The manifest reader accepts AppxManifest.xml as well as MicrosoftGame.config, since a legacy package carries only the former. Running it against a real title exposed four things that only show up at full size: - A licence names a key by its 16-byte content id, while a bundle header names it as a (content id, package id) pair. Reading the 16-byte id yields a different pair, so a complete key file reported every key missing and no bundle could be opened. Keys are now aligned against the header's own ids before the header is judged. - Windows Update answers with several updates whose PackageContentId differs from the bundle's own. Licensing used to take the first and fail with content-http 400; every candidate is now tried in order, preferring the one the container is named after. - A container already in .xodus-container is reused rather than fetched again, so a failed run does not cost another download of tens of gigabytes. The space preflight no longer counts a container twice for the same reason. - A bundle that carries add-on packages unpacks each into its own folder, leaving the manifest one level down. Hoisting lifts the largest folder that holds a manifest, so the game still lands at the root beside its add-ons. Unpacking now reports bytes written, so the install bubble fills while a package is decrypted instead of holding a single unchanging word. * fix(xbox): unpack a legacy package across cores and report the bytes Unpacking one title ran as a single thread on a saturated core at about 40 MB/s. Files sit at independent offsets, so each worker now opens its own handle and takes every Nth file, with a 1 MiB read buffer in place of the 8 KiB default that turned one 64 KiB block into eight reads. Measured on the Forza Horizon 4 bundle, writes went from 40 MB/s to about 200 MB/s. Two things the first full-size run exposed: - The container was deleted only after the whole nested tree was unpacked, so a title that holds its package as one member held the archive and the decrypted copy at once. On this device that runs out of space partway through the second stage. The container is now deleted once its members are on disk, which frees the archive before they are decrypted. - A bundle member is written as a single file, so a counter that advances when a file finishes stays at zero for the whole of the longest stage. The reported figure now also follows the growth of the destination while that is the case, and never moves backwards when the container is freed. Progress is exact during the per-file stage: each file's declared length is added as it lands, instead of walking the whole destination every tick. * docs(xbox): record the completed legacy install The evidence section said a finished legacy install and its decrypted contents were unverified, because the first run was still unpacking when it was written. That install has now completed on the same device: the 85,219,173,025-byte container produced 79.3 GB at the game root with AppxManifest.xml and the package DLLs directly beneath it, and the launcher lists the title as installed. It also records what unpacking costs, since that decided the change: one thread held a core at 100% for about 40 MB/s and four reach about 200 MB/s, and releasing each container once its members are on disk is what keeps the peak footprint at one package rather than the archive plus its contents. The launch is not part of this evidence, and the entry says so. * fix(xbox): place the 64-bit framework beside a legacy title A Windows Update framework category lists one package per architecture under identifier-only names. The first package was unpacked, which on this device was the x86 build, so a 64-bit title got 32-bit DLLs and every load failed with STATUS_INVALID_IMAGE_FORMAT. Candidates are unpacked now and only the one whose manifest declares ProcessorArchitecture="x64" is kept. The framework folder was also never created, so a finished download failed at the move with "no such file or directory". unzip.rs belongs to this patch: legacy-install calls it and the recipe left it out, so a rebuild from the pinned source could not compile. * feat(xbox): report a UWP entry point at launch An unpacked package can name a COM class as its entry point instead of Windows.FullTrustApplication. That class is a UWP application, which expects the app model to activate a view; Wine has no host for it, so the launch died inside the loader with no explanation. The launch now reads the entry point and reports uwp-entry-point, and full-trust packages are unaffected. Forza Horizon 4 is such a package: its manifest names Forza.App. Its frameworks are installed and the loader is clean before that point. * fix(xbox): report why a launch was refused A failed prepare replaced the backend message with a fixed sign-in hint, so a title that was not installed or a runtime that refused all read as a bad account. The reason is kept, with paths and URLs dropped, and written to the store log. * fix(adb): dismiss the keyboard on Search and Go Search and Go were terminal IME actions but were not handled, so focus stayed in the field and the keyboard covered the results it had just fetched. * fix(xbox): keep a cache row without a legacy format plain Decoding added a format key with an empty value to every cached title, so a library restored from storage no longer matched the one that was saved. * test(ui): match the manifest message a legacy package reports The message covers both a MicrosoftGame.config and an AppxManifest, so the assertion follows the text the content dialog now prints. * fix(xbox): refuse to start a title that needs the Windows app model A legacy package that names an entry point other than Windows.FullTrustApplication is a UWP application. Wine has no app-model host, so starting its executable crashes inside the loader and the launch looks like nothing happened. Read the entry point from the manifest the installer already parses and stop the Play action with a message instead. Forza Horizon 4 names Forza.App, so it installs and reports as installed but cannot be started here yet. * fix(xbox): dispatch on the container format of the chosen package The catalogue records the format of the first installable desktop package, and the picker only replaced the content id. An offer that lists MSIXVC and a legacy container would then hand the legacy id to streaming, or the streamed id to legacy-install, and the install failed after resolution had succeeded. The choice now carries its own format and the catalogue value only fills a gap. * fix(xbox): keep an extraction reason that the sanitizer rewrote The extraction sanitizer replaces anything outside letters, digits, space, dot, underscore and dash with a question mark, so a reason such as "(os error 28)" arrived as "?os error 28?" and the allowlist dropped the line. The failure then showed only the stage code, with no cause. Add that replacement character to the class the allowlist accepts. * fix(xbox): print the reason a launch was refused The account channel sends a reason with a refusal, and the guest replaced it with a fixed sign-in message, so a title that was never installed still read as a bad account. The guest now shows the reason it was given, and a token holding a path is dropped whole instead of having its slashes removed and its directory names kept. * build(xbox): leave RUST_TEST_THREADS unset when the host has no value The recipe always passed the variable, empty when the host had none, and the pinned test harness rejects an empty count. On an ARM64 host that runs cargo test, so the default local build failed before compiling. * fix(xbox): rebuild the backend patches from the tree that ran The two patches in this branch were not the ones the verified install ran, and one of them did not compile. `unzip.rs` inflates deflated entries but the dependency that provides the inflater was never added, so `prepare.py` produced a tree that failed at `flate2::read::DeflateDecoder`. Anything else missing fell into the same gap: the install stage reported no bytes, so the bar held one value for the whole unpack, and a container a stopped run had finished was downloaded again. Rebuilt from the patched source, and fixed the defects a review of the patch found: - Unpacking reports bytes again: the workers count each file's declared length, and for the single-file bundle member the folder's growth stands in, which is what the device run showed. - A finished container is reused, so a retry after a failure past the download does not spend hours fetching it again. The space preflight counts it as reclaimable, since the retry truncates it first. - An install over a folder that already has a manifest replaces the old files instead of leaving the new package nested and reporting success. A first install still refuses to merge into an existing target. - The manifest search looks at the depth a nested bundle writes, not only one level down. - `withdraw_libraries` removes only the DLLs `copy_libraries` recorded copying, so a framework replacement cannot delete a library the title owns. - ZIP64 sizes and offsets stay `u64`; truncating them to `u32` read the wrong local header past 4 GiB. - The extraction checks the blockmap length against the footer's before writing, which the crate only does when asked. - The container being unpacked is never treated as a nested member, so `extract-eappx title.eappx .` no longer re-enters and deletes its own input. - `flate2` is declared and the lock is updated. `prepare.py` reproduces this from a pristine checkout and `cargo test` passes on it. * fix(xbox): apply the legacy install patch over the Nexus 0.2.15 backend * fix(xbox): install only the newest x64 build of a legacy title and size the space check at its real peak * fix(xbox): install a store package that is a plain archive instead of an XVD * fix(xbox): refuse a package entry that ends before its recorded size * fix(xbox): credit only complete staged containers toward the free space a legacy install needs * fix(xbox): bound each package entry to its data and check ZIP64 decoded sizes * fix(xbox): refuse duplicate package names and clear an unfinished download before measuring space * fix(xbox): bound package entries by the next header and stage a plain package until it validates * fix(xbox): hold the install folder lock through a legacy install * fix(xbox): fall back to an older build when Microsoft refuses the newest one a license * fix(xbox): keep the registered device across sign-out * feat(xbox): explain device-limit and license refusals, with a link to manage devices * fix(xbox): locate each build only once licensed, roll back a failed package swap, report the final license answer * fix(xbox): skip trial and preorder packages, read runtime behavior, keep licensing timeouts * fix(xbox): keep a failed package swap recoverable, size bundles up front, report key-write and framework errors cleanly * fix(xbox): drop a pending manifest check on any newer launch, keep committed backups out of restores, match the app-model order * fix(xbox): cancel pending launch checks on a new intent, remember entries a rollback could not remove * fix(xbox): clear the removal list before a restore moves old files back --------- Co-authored-by: TimmyCraft <46533729+TimmyTurner51@users.noreply.github.com> --- .../droiddeck/launcher/FrontEndActivity.kt | 48 +- .../launcher/stores/StoreLaunchRequests.kt | 20 +- .../launcher/stores/xbox/XboxBackend.kt | 14 +- .../launcher/stores/xbox/XboxCatalog.kt | 23 +- .../launcher/stores/xbox/XboxContent.kt | 5 +- .../launcher/stores/xbox/XboxCredentials.kt | 13 +- .../launcher/stores/xbox/XboxInstaller.kt | 68 +- .../launcher/stores/xbox/XboxLibraryCache.kt | 14 +- .../launcher/stores/xbox/XboxManifest.kt | 55 +- .../droiddeck/launcher/stores/xbox/Xodus.kt | 4 +- .../droiddeck/launcher/ui/FrontEndWidgets.kt | 33 +- .../com/droiddeck/launcher/ui/GameDetail.kt | 4 +- .../droiddeck/launcher/ui/GogMaintenanceUi.kt | 2 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 4 +- .../com/droiddeck/launcher/ui/StoreChips.kt | 15 +- .../droiddeck/launcher/ui/StoresDownloads.kt | 6 + .../launcher/ui/WirelessAdbFixPage.kt | 14 + app/src/main/res/values/strings.xml | 4 + .../launcher/stores/xbox/XboxCatalogTest.kt | 17 + .../stores/xbox/XboxDeviceKeptTest.kt | 67 + .../stores/xbox/XboxInstallerRefusalTest.kt | 22 + .../launcher/stores/xbox/XboxManifestTest.kt | 69 + .../stores/xbox/XodusDiagnosticsTest.kt | 10 + .../launcher/ui/StoreRestorationTest.kt | 2 +- docs/development/xbox-store.md | 87 +- tools/xbox/README.md | 22 +- tools/xbox/build-local.sh | 7 +- tools/xbox/droiddeck-legacy-install.patch | 2794 +++++++++++++++++ tools/xbox/droiddeck-legacy-packages.patch | 570 ++++ tools/xbox/droiddeck-legacy-run.patch | 124 + tools/xbox/prepare.py | 3 +- 31 files changed, 4072 insertions(+), 68 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxDeviceKeptTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxInstallerRefusalTest.kt create mode 100644 tools/xbox/droiddeck-legacy-install.patch create mode 100644 tools/xbox/droiddeck-legacy-packages.patch create mode 100644 tools/xbox/droiddeck-legacy-run.patch diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 4a88837c8e..284970c9c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -963,13 +963,36 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } } - private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false, onHandled: () -> Unit = {}): Boolean { + private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false, onHandled: () -> Unit = {}, onSettled: () -> Unit = {}) { + val request = gameLaunchRequest.incrementAndGet() if (!SessionPrefs.soundtracksIngame(this)) com.droiddeck.launcher.playback.SoundtrackController.pause(this) if (pkgStage != null) { onHandled() android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() - return false + return } + val files = game.gameFiles + if (game.source != com.droiddeck.launcher.stores.Store.XBOX.id || files == null) { + if (startGame(game, returnHome, onHandled)) onSettled() + return + } + Thread({ + val refused = com.droiddeck.launcher.stores.xbox.XboxManifest.needsAppModel(files) + ui.post { + when { + request != gameLaunchRequest.get() || isFinishing || isDestroyed -> onHandled() + refused -> { + onHandled() + android.widget.Toast.makeText(this, getString(R.string.game_needs_app_model, game.name), android.widget.Toast.LENGTH_LONG).show() + onSettled() + } + startGame(game, returnHome, onHandled) -> onSettled() + } + } + }, "xbox-app-model").start() + } + + private fun startGame(game: Library.SteamGame, returnHome: Boolean, onHandled: () -> Unit): Boolean { if (com.droiddeck.launcher.session.NoSteamLaunch.enabled(this, game)) return launchWithoutSteam(game, returnHome, onHandled) onHandled() if (SessionState.running) { @@ -1184,19 +1207,19 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (!isDestroyed && lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) syncDualPanel() }, LINK_PANEL_MS) val game = games.firstOrNull { it.gameIdString == id } - if (game == null) { + val link = intent + fun consume() { + if (intent !== link || pendingGameLink != id) return pendingGameLink = null - intent.data = null - intent.action = Intent.ACTION_MAIN - intent.removeExtra(GameLaunchIntent.EXTRA_APP_ID) + link.data = null + link.action = Intent.ACTION_MAIN + link.removeExtra(GameLaunchIntent.EXTRA_APP_ID) + } + if (game == null) { + consume() syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_missing, android.widget.Toast.LENGTH_LONG).show() - } else if (launchGame(game, returnHome = true)) { - pendingGameLink = null - intent.data = null - intent.action = Intent.ACTION_MAIN - intent.removeExtra(GameLaunchIntent.EXTRA_APP_ID) - } + } else launchGame(game, returnHome = true, onSettled = ::consume) } private fun chooseGameShortcut(game: Library.SteamGame) { @@ -1914,6 +1937,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) + gameLaunchRequest.incrementAndGet() if (intent.action == SteamIntegration.ACTION_SETUP) { gameLinkReading = false pendingGameLink = null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index af4ea74964..9ec0dad5fd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -60,8 +60,7 @@ object StoreLaunchRequests { "xbox-prepare" -> runCatching { com.droiddeck.launcher.stores.xbox.XboxRuntime.prepare(app, request.getString("id")) } .getOrElse { StoresState.logLine("Xbox: launch prepare failed (${it.javaClass.simpleName}: ${it.message})") - val reason = (it as? IllegalStateException)?.message ?: "Xbox account service is unavailable. Sign in again and retry." - JSONObject().put("ok", false).put("reason", reason) + JSONObject().put("ok", false).put("reason", reasonFor(it)) } "ea-prepare" -> runCatching { lastLaunched = Store.EA to request.optString("id"); com.droiddeck.launcher.stores.ea.EaLaunch.prepare(app, request) } .getOrElse { JSONObject().put("ok", false).put("reason", "error-" + it.javaClass.simpleName) } @@ -176,4 +175,21 @@ object StoreLaunchRequests { Log.w(TAG, "could not answer ${file.name}: ${e.message}") } } + + /// What the guest prints when a launch is refused. + /// + /// The message is the only thing that separates a stale sign-in from a title + /// that is not installed, so it is kept, minus anything that could carry a + /// device path or a token: segments lookng like a path are dropped and the + /// rest is folded to plain text. + internal fun reasonFor(error: Throwable): String { + val text = error.message.orEmpty() + .split(' ') + .filterNot { it.contains('/') || it.startsWith("http") } + .joinToString(" ") + .filter { it.isLetterOrDigit() || it in " .,:;_-()'" } + .trim() + .take(160) + return if (text.isEmpty()) "Xbox account service is unavailable. Sign in again and retry." else text + } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt index d678a2f410..32597faeb7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt @@ -112,11 +112,21 @@ object XboxBackend : StoreBackend { fun selectPackage(context: Context, choice: org.json.JSONObject) { val pending = packageChoice ?: return packageChoice = null - val item = pending.item.copy(extra = pending.item.extra + ("contentId" to choice.getString("contentId"))) + val item = pending.item.chosen(choice) com.droiddeck.launcher.stores.download.SavedQueue.remember(context, item, pending.root) enqueue(context.applicationContext, item, pending.root) } + /** + * The picker can offer a package in a different container format than the + * catalogue listed, and the installer dispatches on that format, so the + * choice decides it and the catalogue value only fills a missing one. + */ + private fun CatalogItem.chosen(choice: org.json.JSONObject): CatalogItem { + val format = choice.optString("packageFormat").takeIf { it.isNotBlank() } ?: extra["format"].orEmpty() + return copy(extra = extra + mapOf("contentId" to choice.getString("contentId"), "format" to format)) + } + override fun install(context: Context, item: CatalogItem, root: File) { val app = context.applicationContext if (!item.extra["baseId"].isNullOrBlank()) { XboxContent.install(app, item); return } @@ -128,7 +138,7 @@ object XboxBackend : StoreBackend { val choices = XboxCatalog.objects(plan.getJSONArray("choices")).filter { it.optBoolean("supported") && it.optString("kind") == "Game" } check(choices.isNotEmpty()) { "This offer has no supported PC package." } if (plan.getString("status") == "ready" && choices.size == 1) { - val selected = item.copy(extra = item.extra + ("contentId" to choices.single().getString("contentId"))) + val selected = item.chosen(choices.single()) com.droiddeck.launcher.stores.download.SavedQueue.remember(app, selected, root) enqueue(app, selected, root) } else StoresState.post { packageChoice = PackageChoice(item, root, choices) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt index 6f50a03039..cd3982ebdd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt @@ -18,6 +18,14 @@ internal object XboxCatalog { "CFQ7TTC10QFD" to "Xbox Game Pass (Starter Edition)", ) + /** + * The formats the installer can put on disk, so the catalogue never lists a + * title it cannot install. `MSIXVC` streams in place; an EAppx container is a + * legacy package that takes `legacy-install` instead. + */ + internal fun installableFormat(format: String): Boolean = + format.equals("MSIXVC", true) || format.equals("EAPPX", true) || format.equals("EAPPXBUNDLE", true) + fun access(json: JSONObject, account: String, market: String, now: Instant = Instant.now(), report: (String) -> Unit = {}): Map { require(json.getInt("schema") == 1 && json.getString("account") == account && json.getString("market") == market) val age = java.time.Duration.between(timestamp(json.getString("checkedAt")), now).seconds @@ -102,11 +110,15 @@ internal object XboxCatalog { if (!productId.matches(id) || json.optString("ProductType") != "Game") return null val localized = objects(json.optJSONArray("LocalizedProperties")).firstOrNull() ?: return null val title = localized.optString("ProductTitle").takeIf { it.isNotBlank() } ?: return null - val packages = objects(json.optJSONArray("DisplaySkuAvailabilities")).flatMap { - objects(it.optJSONObject("Sku")?.optJSONObject("Properties")?.optJSONArray("Packages")) - } + val packages = objects(json.optJSONArray("DisplaySkuAvailabilities")) + .mapNotNull { it.optJSONObject("Sku")?.optJSONObject("Properties") } + .filter { it.opt("IsTrial") != true && it.opt("IsPreOrder") != true } + .flatMap { objects(it.optJSONArray("Packages")) } val pc = packages.filter { pkg -> objects(pkg.optJSONArray("PlatformDependencies")).any { it.optString("PlatformName") == "Windows.Desktop" } } - val installable = pc.any { it.optString("PackageFormat").equals("MSIXVC", true) } + val installable = pc.any { installableFormat(it.optString("PackageFormat")) } + // The installer needs the format, not just the fact that one exists: a + // legacy container takes a different subcommand from a streamed package. + val format = pc.firstOrNull { installableFormat(it.optString("PackageFormat")) }?.optString("PackageFormat").orEmpty() val streams = cloud?.streams(id, access[id].orEmpty()) == true if (!installable && !streams) return null val images = objects(localized.optJSONArray("Images")) @@ -129,7 +141,8 @@ internal object XboxCatalog { publisher = localized.optString("PublisherName"), developer = localized.optString("DeveloperName"), description = localized.optString("ProductDescription"), sizeBytes = if (installable) pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L else 0L, - extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty(), "pc" to flag(installable), "cloud" to flag(streams)), + extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty(), "pc" to flag(installable), + "cloud" to flag(streams), "format" to format), ) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxContent.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxContent.kt index 1594dee927..be9731cdb7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxContent.kt @@ -40,7 +40,8 @@ internal object XboxContent { val item = CatalogItem(Store.XBOX, id, localized?.optString("ProductTitle")?.ifBlank { id } ?: id, imageUrl = base.sidecar.cover, owned = access == "owned", subscription = access == "gamepass", sizeBytes = pkg.optLong("MaxDownloadSizeInBytes"), - extra = mapOf("baseId" to base.sidecar.id, "contentId" to cid, "market" to market, "family" to pkg.getString("PackageFamilyName"))) + extra = mapOf("baseId" to base.sidecar.id, "contentId" to cid, "market" to market, + "family" to pkg.getString("PackageFamilyName"), "format" to pkg.optString("PackageFormat"))) Offer(item, File(base.folder, ".xbox-content/$id/.droiddeck-content.json").isFile) } StoresState.post { plan = Plan(base, offers) } @@ -51,7 +52,7 @@ internal object XboxContent { private fun packages(product: JSONObject?): List = XboxCatalog.objects(product?.optJSONArray("DisplaySkuAvailabilities")) .filter { it.optJSONObject("Sku")?.optJSONObject("Properties")?.optBoolean("IsTrial", true) == false } .flatMap { XboxCatalog.objects(it.optJSONObject("Sku")?.optJSONObject("Properties")?.optJSONArray("Packages")) } - .filter { pkg -> pkg.optString("PackageFormat") == "MSIXVC" && + .filter { pkg -> XboxCatalog.installableFormat(pkg.optString("PackageFormat")) && XboxCatalog.objects(pkg.optJSONArray("PlatformDependencies")).any { it.optString("PlatformName") == "Windows.Desktop" } } private val parents = java.util.concurrent.ConcurrentHashMap() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt index 59403dac0f..0daee79ccd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt @@ -249,10 +249,17 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str block(current) } fun invalidate(app: Context, revoked: () -> Unit = {}) = storage(app) { - java.io.File(StoreAccounts.dir(app, Store.XBOX), "generation").writeText(UUID.randomUUID().toString()) - StoreAccounts.clear(app, Store.XBOX) - revoked() + try { + java.io.File(StoreAccounts.dir(app, Store.XBOX), "generation").writeText(UUID.randomUUID().toString()) + val device = StoreAccounts.read(app, Store.XBOX)?.optJSONObject("slots")?.opt(DEVICE_SLOT) + val kept = device != null && runCatching { StoreAccounts.write(app, Store.XBOX, deviceOnly(device)) }.isSuccess + if (!kept) StoreAccounts.clear(app, Store.XBOX) + } finally { + revoked() + } } + internal const val DEVICE_SLOT = "dev_license" + internal fun deviceOnly(device: Any): JSONObject = JSONObject().put("slots", JSONObject().put(DEVICE_SLOT, device)) fun storage(app: Context, block: () -> T): T = synchronized(lock) { java.io.RandomAccessFile(java.io.File(StoreAccounts.dir(app, Store.XBOX), "account.lock"), "rw").use { file -> file.channel.lock().use { block() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt index 3d02e4db57..85ea9fad69 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt @@ -15,6 +15,10 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog private val paused = CountDownLatch(1) @Volatile private var child: Xodus.Child? = null @Volatile private var delete = false + /** A legacy container has no pause protocol: the downloader is killed instead. */ + private val legacy = item.extra["format"]?.lowercase() in setOf("eappx", "eappxbundle") + /** Release builds hide logcat from adb, so the tail is reported in the failure itself. */ + private val errors = java.util.concurrent.ConcurrentLinkedQueue() override fun run(handle: DownloadQueue.JobHandle): String? { if (cancelled.get()) return null @@ -41,13 +45,21 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog val source = if (content) selected else item.id val guestFolder = StoreInstallRoot.guestPathForXodus(app, folder) val selection = if (content) emptyList() else listOf("--selected-content-id", selected) - Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market, - "--progress-json", "--control-stdin") + selection).use { process -> + // Streaming rejects a legacy container outright, so dispatch on the + // format the catalogue recorded rather than fail after a download. + val command = if (legacy) "legacy-install" else "streaming" + Xodus.start(app, if (legacy) { + listOf(command, source, guestFolder, "--market", market, "--progress-json", "--store-id", item.id) + selection + } else { + listOf(command, source, guestFolder, "--market", market, "--progress-json", "--control-stdin") + selection + }).use { process -> child = process val rejected = AtomicBoolean(false) val rejectedLine = Regex(Xodus.SIGN_IN_REJECTED) val diagnostics = Xodus.diagnostics(process) { line -> StoresState.logLine("Xbox: $line") + errors.add(line) + while (errors.size > MAX_ERROR_LINES) errors.poll() if (line.matches(rejectedLine)) rejected.set(true) } if (cancelled.get()) process.process.destroy() @@ -60,7 +72,16 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog when (progress.getString("phase")) { "complete" -> complete = true "downloading", "download", "transfer" -> handle.progress(progress.getLong("completedBytes"), progress.optLong("totalBytes")) - "finalizing", "installing" -> handle.stage(DownloadStage.INSTALL) + // Unpacking reports files, not bytes: the frontend hands + // over one container and the backend counts what it has + // written, which is the only measure that moves while a + // single multi-gigabyte member is decrypted. + "installing" -> { + handle.stage(DownloadStage.INSTALL) + val total = progress.optLong("totalBytes") + if (total > 0L) handle.stageProgress(progress.getLong("completedBytes"), total) + } + "finalizing" -> handle.stage(DownloadStage.INSTALL) else -> handle.stage(DownloadStage.MANIFEST) } } @@ -69,7 +90,14 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog diagnostics.join(2000) if (cancelled.get()) return null check(!rejected.get()) { app.getString(com.droiddeck.launcher.R.string.stores_xbox_sign_in_again) } - check(process.process.exitValue() == 0 && complete) { "Xbox download did not complete. Resume to retry with fresh licenses." } + val exit = process.process.exitValue() + if (exit != 0 || !complete) { + val tail = errors.toList().takeLast(MAX_ERROR_LINES) + report(command, source, market, exit, tail) + licenseRefusal(tail)?.let { error(app.getString(it)) } + error("Xbox download did not complete. Resume to retry with fresh licenses." + + tail.takeLast(3).joinToString("") { "\n$it" }) + } } if (content) { XboxContent.complete(app, item, folder) @@ -87,6 +115,21 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog } } + /** Writes the backend's words beside the app, where adb can read them. */ + private fun report(command: String, source: String, market: String, exit: Int, tail: List) { + val text = buildString { + appendLine("command: $command $source --market $market") + appendLine("legacy: $legacy") + appendLine("exit: $exit") + appendLine("--- stderr (last ${tail.size} lines) ---") + tail.forEach { appendLine(it) } + } + runCatching { + app.getExternalFilesDir(null)?.let { File(it, "xbox-install.log").writeText(text) } + } + StoresState.logLine("Xbox install failed (exit $exit): ${tail.lastOrNull().orEmpty()}") + } + override fun cancel(deleteFiles: Boolean) { cancelled.set(true) delete = deleteFiles @@ -98,14 +141,25 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog } Thread({ runCatching { - process.send(JSONObject().put("schema", 1).put("command", "pause")) - paused.await(3, TimeUnit.SECONDS) + if (!legacy) { + process.send(JSONObject().put("schema", 1).put("command", "pause")) + paused.await(3, TimeUnit.SECONDS) + } + process.close() } - process.close() }, "xbox-download-stop").start() } companion object { + private const val MAX_ERROR_LINES = 40 + const val DEVICES_URL = "https://account.microsoft.com/devices/content" + private const val LICENSE_DIAGNOSTIC = "NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 " + internal fun licenseRefusal(tail: List): Int? = when (tail.lastOrNull { it.startsWith(LICENSE_DIAGNOSTIC) } + ?.removePrefix(LICENSE_DIAGNOSTIC)?.substringBefore(' ')) { + "content-device-limit" -> com.droiddeck.launcher.R.string.stores_xbox_device_group_full + "content-device-name" -> com.droiddeck.launcher.R.string.stores_xbox_license_refused + else -> null + } internal fun executable(folder: File): String = XboxManifest.executable(folder) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt index 5de1abcac8..074e1e9025 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt @@ -29,7 +29,10 @@ internal object XboxLibraryCache { .put("image", game.imageUrl).put("poster", game.tallImageUrl).put("description", game.description) .put("developer", game.developer).put("publisher", game.publisher).put("size", game.sizeBytes) .put("access", if (game.subscription) "gamepass" else if (game.owned) "owned" else "none") - .put("pc", game.xboxPc).put("cloud", game.xboxCloud).put("cloudId", game.extra["cloudId"].orEmpty())) + .put("pc", game.xboxPc).put("cloud", game.xboxCloud).put("cloudId", game.extra["cloudId"].orEmpty()) + // The installer picks its subcommand from this; without it a + // cached legacy game would fall back to streaming. + .put("format", game.extra["format"].orEmpty())) }).toString() internal fun decode(text: String?, account: String, market: String, now: Long = System.currentTimeMillis()): Snapshot? = runCatching { @@ -46,13 +49,18 @@ internal object XboxLibraryCache { val title = row.getString("title") val access = row.getString("access") val cloudId = row.optString("cloudId").takeIf { it.matches(Regex("[A-Z0-9]{12}")) }.orEmpty() + val format = row.optString("format").takeIf { XboxCatalog.installableFormat(it) }.orEmpty() require(id.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && access in setOf("owned", "gamepass")) + // A title with no legacy format keeps the plain shape a cache written + // before formats existed has, so a restart round-trips unchanged. + val extra = linkedMapOf("market" to market, "access" to access, + "pc" to XboxCatalog.flag(row.getBoolean("pc")), "cloud" to XboxCatalog.flag(row.getBoolean("cloud")), "cloudId" to cloudId) + if (format.isNotEmpty()) extra["format"] = format CatalogItem(Store.XBOX, id, title, row.optString("image").takeIf { it.isNotEmpty() }, tallImageUrl = row.optString("poster").takeIf { it.isNotEmpty() }, description = row.optString("description"), developer = row.optString("developer"), publisher = row.optString("publisher"), sizeBytes = row.optLong("size"), owned = access == "owned", subscription = access == "gamepass", - storeUrl = "https://www.xbox.com/games/store/$id", extra = mapOf("market" to market, "access" to access, - "pc" to XboxCatalog.flag(row.getBoolean("pc")), "cloud" to XboxCatalog.flag(row.getBoolean("cloud")), "cloudId" to cloudId)) + storeUrl = "https://www.xbox.com/games/store/$id", extra = extra) } require(games.map { it.id }.distinct().size == games.size) Snapshot(games, savedAt) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt index d738193ed7..bb8bc0408d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt @@ -5,12 +5,25 @@ import org.xmlpull.v1.XmlPullParser internal object XboxManifest { data class Info(val storeId: String, val name: String, val publisher: String, val version: String, - val dependency: String, val related: List, val executables: List) + val dependency: String, val related: List, val executables: List, val entryPoint: String, + val runtimeBehavior: String = "") + + /** A GameCore title describes itself with the config; a legacy package does not. */ + private const val GAME_CONFIG = "MicrosoftGame.config" + private const val APPX_MANIFEST = "AppxManifest.xml" + private const val FULL_TRUST = "Windows.FullTrustApplication" + private const val APP_MODEL = "windowsApp" + private val directBehaviors = setOf("packagedClassicApp", "win32App") fun read(folder: File): Info { - val manifests = folder.listFiles().orEmpty().filter { it.name.equals("MicrosoftGame.config", true) && it.isFile } - require(manifests.size == 1) { "Missing or ambiguous MicrosoftGame.config." } - val manifest = manifests.single() + // Both manifests are read the same way: an identity, an executable path and, + // for a Store package, related content. + val files = folder.listFiles().orEmpty() + val config = files.filter { it.name.equals(GAME_CONFIG, true) && it.isFile } + val legacy = files.filter { it.name.equals(APPX_MANIFEST, true) && it.isFile } + require(config.size + legacy.size == 1) { "Missing or ambiguous game manifest." } + val manifest = (config + legacy).single() + val rootTag = if (config.isEmpty()) "Package" else "Game" require(manifest.length() <= 1_048_576) val parser = android.util.Xml.newPullParser().apply { setFeature(XmlPullParser.FEATURE_PROCESS_DOCDECL, false) } val identities = ArrayList>() @@ -18,7 +31,11 @@ internal object XboxManifest { val dependencies = ArrayList() val related = ArrayList() val entries = ArrayList() + val entryPoints = ArrayList() + val behaviors = ArrayList() fun attribute(name: String) = parser.getAttributeValue(null, name).orEmpty() + fun localAttribute(name: String) = (0 until parser.attributeCount) + .firstOrNull { parser.getAttributeName(it).substringAfterLast(':') == name }?.let(parser::getAttributeValue).orEmpty() var root = false var elements = 0 manifest.inputStream().use { input -> @@ -29,16 +46,22 @@ internal object XboxManifest { XmlPullParser.DOCDECL -> error("Xbox game manifests cannot contain a DTD.") XmlPullParser.START_TAG -> { require(++elements <= 10_000 && parser.depth <= 64) { "Xbox game manifest is too complex." } - if (parser.depth == 1) { require(!root && parser.name == "Game"); root = true } + if (parser.depth == 1) { require(!root && parser.name == rootTag); root = true } when (parser.name) { "Identity" -> identities.add(listOf(attribute("Name"), attribute("Publisher"), attribute("Version"))) "StoreId" -> storeIds.add(parser.nextText().trim()) "MainPackageDependency" -> dependencies.add(attribute("Name")) "RelatedProduct" -> related.add(parser.nextText().trim()) - "Executable" -> { - val path = attribute("Name").replace('\\', '/') + // Both carry the launch path: an attribute on the config's + // Executable, or on the AppxManifest's Application. + "Executable", "Application" -> { + val path = attribute("Name").ifEmpty { attribute("Executable") }.replace('\\', '/') if (path.endsWith(".exe", true) && attribute("TargetDeviceFamily") in listOf("", "PC", "Windows.Desktop") && !attribute("IsDevOnly").equals("true", true)) entries.add(path) + if (parser.name == "Application") { + attribute("EntryPoint").takeIf { it.isNotEmpty() }?.let(entryPoints::add) + localAttribute("RuntimeBehavior").takeIf { it.isNotEmpty() }?.let(behaviors::add) + } } } } @@ -48,9 +71,25 @@ internal object XboxManifest { require(root && identities.size <= 1 && storeIds.size <= 1 && dependencies.size <= 1) { "Invalid Xbox game manifest." } val ids = related.distinct() require(ids.size <= 128 && ids.all { it.matches(Regex("[A-Z0-9]{12}")) }) + val entry = entryPoints.distinct() + val behavior = behaviors.distinct() + require(entry.size <= 1 && behavior.size <= 1) { "Invalid Xbox game manifest." } val identity = identities.singleOrNull() return Info(storeIds.singleOrNull().orEmpty(), identity?.get(0).orEmpty(), identity?.get(1).orEmpty(), identity?.get(2).orEmpty(), - dependencies.singleOrNull().orEmpty(), ids, entries) + dependencies.singleOrNull().orEmpty(), ids, entries, entry.singleOrNull().orEmpty(), behavior.singleOrNull().orEmpty()) + } + + /** + * A full trust package starts its executable directly. Anything else is activated + * through the Windows app model, which this runtime has no host for, so starting + * the executable would only crash. + */ + fun needsAppModel(folder: File): Boolean { + val info = runCatching { read(folder) }.getOrNull() ?: return false + val behavior = info.runtimeBehavior + if (behavior.equals(APP_MODEL, true)) return true + if (directBehaviors.any { it.equals(behavior, true) }) return false + return info.entryPoint.isNotEmpty() && !info.entryPoint.equals(FULL_TRUST, true) } fun executable(folder: File): String { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index f27794d1b5..39866fceea 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -155,10 +155,12 @@ internal object Xodus { const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\." + internal val reportable = Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.|NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3}|NEXUS_LEGACY_INSTALL_DIAGNOSTIC_V1 [a-z0-9-]{1,48}( [0-9]{1,6})?|NEXUS_LEGACY_INSTALL_DETAIL_V1 [A-Za-z0-9 .,;-]{1,220}|NEXUS_EXTRACT_DIAGNOSTIC_V1 [a-z-]{1,48}|NEXUS_EXTRACT_DETAIL_V1 [A-Za-z0-9 ._?-]{1,220}|$SIGN_IN_REJECTED") + fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({ runCatching { child.process.errorStream.bufferedReader().useLines { lines -> lines.forEach { line -> - if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.|NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{3}|$SIGN_IN_REJECTED"))) + if (line.matches(reportable)) report(line) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index f12ad81ddb..6d360d7357 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -54,6 +54,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Brush import androidx.compose.ui.focus.focusProperties @@ -112,7 +113,8 @@ internal fun Actions(content: @Composable () -> Unit) = FlowRow( ) { content() } @Composable -internal fun ActionChip(t: String, ok: Boolean) = Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok) } +internal fun ActionChip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) = + Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok, fraction, key) } internal val Shape16 = RoundedCornerShape(16.dp) @@ -139,13 +141,32 @@ internal fun BackLink(label: String, compact: Boolean = false, onClick: () -> Un } @Composable -internal fun Chip(t: String, ok: Boolean) { +internal fun Chip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - Text( - t, fontSize = 12.sp, color = if (ok) pal.good else colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.clip(RoundedCornerShape(99.dp)).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, RoundedCornerShape(99.dp)).padding(horizontal = 9.dp, vertical = 4.dp), - ) + val shape = RoundedCornerShape(99.dp) + val ink = if (ok) pal.good else colors.onSurfaceVariant + Box(Modifier.clip(shape).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, shape)) { + if (fraction != null) ChipFill(fraction, key, pal.signal.copy(alpha = 0.3f)) + Text( + t, fontSize = 12.sp, color = ink, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(horizontal = 9.dp, vertical = 4.dp), + ) + } +} + +@Composable +internal fun androidx.compose.foundation.layout.BoxScope.ChipFill(fraction: Float, key: Any?, color: Color) { + androidx.compose.runtime.key(key) { + val target = fraction.coerceIn(0f, 1f) + val shown = remember { Animatable(target) } + LaunchedEffect(target) { shown.animateTo(target, androidx.compose.animation.core.tween(250, easing = androidx.compose.animation.core.LinearEasing)) } + Box( + Modifier.matchParentSize().drawBehind { + drawRect(color, size = androidx.compose.ui.geometry.Size(size.width * shown.value, size.height)) + }, + ) + } } @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index e50176e09c..b99a4331bb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -458,7 +458,7 @@ internal fun GameActions( if (installed != null && id != null) { LaunchedEffect(id) { BattleNetInstall.checkUpdate(ctx, installed) } if (download != null) { - ActionChip(downloadLabel(download), ok = false) + ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(download.key) } else SecondaryButton(stringResource(R.string.stores_dl_resume)) { DownloadQueue.resume(ctx, download.key) } } else if (BattleNetInstall.updates[id] == true) { @@ -473,7 +473,7 @@ internal fun GameActions( } } download != null -> { - ActionChip(downloadLabel(download), ok = false) + ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { DownloadQueue.pause(download.key) } else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { DownloadQueue.resume(ctx, download.key) } ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { DownloadQueue.cancel(ctx, download.key) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt index 57f6923396..165905ac51 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GogMaintenanceUi.kt @@ -68,7 +68,7 @@ internal fun GogMaintenanceActions(game: InstalledStoreGame) { } } if (active) { - ActionChip(downloadLabel(download!!), ok = false) + ActionChip(downloadLabel(download!!), ok = false, fraction = download!!.stageFraction.takeIf { it >= 0f }, key = download!!.stage) if (download.interruptible) { SecondaryButton(stringResource(if (download.state == DownloadState.PAUSED) R.string.stores_dl_resume else R.string.stores_dl_pause)) { if (download.state == DownloadState.PAUSED) DownloadQueue.resume(ctx, key) else DownloadQueue.pause(key) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index a90aa79ca8..272f42840c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -834,7 +834,9 @@ internal fun ArtCard( }, ) badge?.invoke(this) - if (chip != null) Box(Modifier.align(Alignment.TopEnd).padding(6.dp)) { StateChip(chip, ChipTone.BUSY, small = true) } + if (chip != null) Box(Modifier.align(Alignment.TopEnd).padding(6.dp)) { + StateChip(chip, ChipTone.BUSY, small = true, fraction = download?.stageFraction?.takeIf { it >= 0f }, key = download?.stage) + } val showName = LibraryDisplay.title || hot val showDetail = LibraryDisplay.size || hot if (showName || showDetail) Column( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index 3921df7f32..a822548739 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.ui import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme @@ -73,7 +74,7 @@ internal fun SourceChip(source: String, small: Boolean = false, modifier: Modifi } @Composable -internal fun StateChip(text: String, tone: ChipTone, small: Boolean = false) { +internal fun StateChip(text: String, tone: ChipTone, small: Boolean = false, fraction: Float? = null, key: Any? = null) { val pal = LocalPalette.current val (fill, ink) = when (tone) { ChipTone.OK -> Color(0xFF16321F) to pal.good @@ -82,10 +83,14 @@ internal fun StateChip(text: String, tone: ChipTone, small: Boolean = false) { ChipTone.DEAL -> Color(0xFF1E3A1A) to Color(0xFF9BE27A) ChipTone.PLAIN -> MaterialTheme.colorScheme.surfaceVariant to MaterialTheme.colorScheme.onSurfaceVariant } - Text( - text, fontSize = if (small) 9.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.3.sp, color = ink, maxLines = 1, - modifier = Modifier.clip(RoundedCornerShape(6.dp)).background(fill).padding(horizontal = if (small) 5.dp else 8.dp, vertical = if (small) 1.dp else 2.dp), - ) + val shape = RoundedCornerShape(6.dp) + Box(Modifier.clip(shape).background(fill)) { + if (fraction != null) ChipFill(fraction, key, ink.copy(alpha = 0.26f)) + Text( + text, fontSize = if (small) 9.sp else 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 0.3.sp, color = ink, maxLines = 1, + modifier = Modifier.padding(horizontal = if (small) 5.dp else 8.dp, vertical = if (small) 1.dp else 2.dp), + ) + } } internal enum class ChipTone { OK, BUSY, WARN, DEAL, PLAIN } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index ed382d8d5d..59ae4df3b8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -61,6 +61,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -371,6 +372,11 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) CancelAction { DownloadQueue.cancel(ctx, d.key) } } DownloadState.FAILED -> { + if (d.store == Store.XBOX && d.error == stringResource(R.string.stores_xbox_device_group_full)) { + RoundAction(Icons.AutoMirrored.Filled.OpenInNew, stringResource(R.string.stores_xbox_manage_devices)) { + runCatching { ctx.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(com.droiddeck.launcher.stores.xbox.XboxInstaller.DEVICES_URL)).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } RoundAction(Icons.Filled.Refresh, stringResource(R.string.stores_dl_resume), primary = true) { DownloadQueue.retry(ctx, d.key) } CancelAction { DownloadQueue.clear(ctx, d.key) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 276f82f79f..ebcfcb1ea7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -453,6 +453,20 @@ internal fun AdbTextField( onDoneLatest.value?.invoke() true } + // Search and Go are terminal: leaving them unhandled + // keeps focus in the field, so the keyboard would stay + // up over the results it was used to find. + imeAction in setOf(ImeAction.Search, ImeAction.Go) && + (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_GO || isEnter) -> { + onDoneLatest.value?.invoke() + post { + clearFocus() + (context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) + as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(windowToken, 0) + } + true + } else -> false } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dbad01b39c..6c7f319166 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1771,6 +1771,7 @@ This game is no longer in your DroidDeck library. Stop the current session before launching a Steam game. Could not send the game to Steam. Try launching it again. + %1$s is a UWP app. This runtime has no Windows app-model host to start it. Retry removal Removing Removal incomplete @@ -2992,6 +2993,9 @@ Close Try again Finishing sign-in… + This Microsoft account is at its device limit. Remove an old device under Manage devices, then resume. + Manage devices + Microsoft does not license any available version of this game to this device. Microsoft rejected the Xbox sign-in. Sign out of Xbox in Stores, sign in again, then resume. The sign-in page could not be loaded: %1$s This provider refuses to sign in from an embedded page. Sign in with your store password instead. diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt index a59450e341..c2106a9bf9 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt @@ -184,6 +184,23 @@ class XboxCatalogTest { assertFalse(XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), null)!!.xboxCloud) } + @Test fun trialAndPreorderSkusDoNotMakeAGamePcInstallable() { + fun sku(format: String, vararg flags: String) = JSONObject().put("Sku", JSONObject().put("Properties", JSONObject().apply { + flags.forEach { put(it, true) } + put("Packages", JSONArray().put(JSONObject().put("PackageFormat", format).put("MaxDownloadSizeInBytes", 7L) + .put("PlatformDependencies", JSONArray().put(JSONObject().put("PlatformName", "Windows.Desktop"))))) + })) + fun offer(vararg skus: JSONObject) = JSONObject().put("ProductId", game).put("ProductType", "Game") + .put("LocalizedProperties", JSONArray().put(JSONObject().put("ProductTitle", "A Game"))) + .put("DisplaySkuAvailabilities", JSONArray(skus.toList())) + assertNull(XboxCatalog.product(offer(sku("EAPPX", "IsTrial")), mapOf(game to "owned"))) + assertNull(XboxCatalog.product(offer(sku("MSIXVC", "IsPreOrder")), mapOf(game to "owned"))) + val streamed = XboxCatalog.product(offer(sku("EAPPX", "IsTrial")), mapOf(game to "gamepass"), XboxCloudCatalog(setOf(game), emptySet()))!! + assertFalse(streamed.xboxPc); assertTrue(streamed.xboxCloud); assertEquals("", streamed.extra["format"]); assertEquals(0L, streamed.sizeBytes) + val retail = XboxCatalog.product(offer(sku("MSIXVC", "IsTrial"), sku("EAPPX")), mapOf(game to "owned"))!! + assertTrue(retail.xboxPc); assertEquals("EAPPX", retail.extra["format"]); assertEquals(7L, retail.sizeBytes) + } + @Test fun aCloudOnlyEditionFoldsIntoThePcCardWithTheSameTitle() { val cloud = XboxCloudCatalog(gamePass = setOf(parent), all = emptySet()) val pc = XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), cloud)!! diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxDeviceKeptTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxDeviceKeptTest.kt new file mode 100644 index 0000000000..b2227ae288 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxDeviceKeptTest.kt @@ -0,0 +1,67 @@ +package com.droiddeck.launcher.stores.xbox + +import com.droiddeck.launcher.stores.CredentialCipher +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import org.json.JSONArray +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.security.SecureRandom +import javax.crypto.spec.SecretKeySpec + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = android.app.Application::class) +class XboxDeviceKeptTest { + private val app get() = RuntimeEnvironment.getApplication() + private val key = SecretKeySpec(ByteArray(32).also { SecureRandom().nextBytes(it) }, "AES") + + @Before fun setUp() { StoreAccounts.keys = CredentialCipher.KeyProvider { key }; StoreAccounts.keystoreFailed = false } + @After fun tearDown() { + StoreAccounts.clear(app, Store.XBOX) + StoreAccounts.keys = CredentialCipher.Keystore; StoreAccounts.keystoreFailed = false + } + + @Test fun signingOutKeepsOnlyTheRegisteredDevice() { + val device = JSONArray(listOf(1, 2, 3)) + StoreAccounts.write(app, Store.XBOX, JSONObject().put("username", "player") + .put("slots", JSONObject().put(XboxCredentials.DEVICE_SLOT, device).put("user-tokens", JSONArray(listOf(9))))) + XboxCredentials.invalidate(app) + val record = StoreAccounts.read(app, Store.XBOX)!! + assertNull(StoreAccounts.signedInAs(app, Store.XBOX)) + val slots = record.getJSONObject("slots") + assertEquals(listOf(XboxCredentials.DEVICE_SLOT), slots.keys().asSequence().toList()) + assertEquals(device.toString(), slots.getJSONArray(XboxCredentials.DEVICE_SLOT).toString()) + } + + @Test fun aFailedDeviceRewriteStillSignsOutAndRevokes() { + var sealing = true + StoreAccounts.keys = object : CredentialCipher.KeyProvider { + override fun key() = if (sealing) key else throw java.security.KeyStoreException("sealing refused") + override fun existing() = key + } + StoreAccounts.write(app, Store.XBOX, JSONObject().put("username", "player") + .put("slots", JSONObject().put(XboxCredentials.DEVICE_SLOT, JSONArray(listOf(1))))) + sealing = false + var revoked = false + XboxCredentials.invalidate(app) { revoked = true } + assertTrue(revoked) + assertTrue(StoreAccounts.keystoreFailed) + assertNull(StoreAccounts.read(app, Store.XBOX)) + assertNull(StoreAccounts.signedInAs(app, Store.XBOX)) + } + + @Test fun signingOutWithoutADeviceLeavesNoRecord() { + StoreAccounts.write(app, Store.XBOX, JSONObject().put("username", "player").put("slots", JSONObject())) + XboxCredentials.invalidate(app) + assertNull(StoreAccounts.read(app, Store.XBOX)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxInstallerRefusalTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxInstallerRefusalTest.kt new file mode 100644 index 0000000000..0e717f0c17 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxInstallerRefusalTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.stores.xbox + +import com.droiddeck.launcher.R +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class XboxInstallerRefusalTest { + private val refused = "NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-device-name 400" + private val full = "NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-device-limit 200" + private val granted = "NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-parsed 200" + + @Test fun theLastLicensingAnswerDecidesTheMessage() { + assertEquals(R.string.stores_xbox_license_refused, XboxInstaller.licenseRefusal(listOf(refused, "NEXUS_LEGACY_INSTALL_DIAGNOSTIC_V1 license-failed"))) + assertEquals(R.string.stores_xbox_device_group_full, XboxInstaller.licenseRefusal(listOf(full))) + } + + @Test fun aRefusalAnOlderBuildRecoveredFromIsNotReported() { + assertNull(XboxInstaller.licenseRefusal(listOf(refused, "NEXUS_LEGACY_INSTALL_DETAIL_V1 newest build has no license for this device, trying an older build", granted, "NEXUS_TRANSFER_DIAGNOSTIC_V1 transfer-short 0"))) + assertNull(XboxInstaller.licenseRefusal(listOf("NEXUS_TRANSFER_DIAGNOSTIC_V1 transfer-short 0"))) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt index 99ab0a0eb6..d2396db935 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt @@ -47,6 +47,75 @@ class XboxManifestTest { assertEquals(listOf("Retail.exe"), info.executables) assertEquals("Retail.exe", XboxManifest.executable(root)) } + @Test fun legacyPackageManifestNamesItsExecutableTheSameWay() { + // A legacy EAppx package carries AppxManifest.xml and has no config; the + // launcher must still find the identity and the launch path, or an install + // that completed cannot be registered or started. + val root = temporary.newFolder() + java.io.File(root, "ForzaHorizon4.exe").writeText("encrypted") + java.io.File(root, "AppxManifest.xml").writeText(""" + + + + """) + val info = XboxManifest.read(root) + assertEquals("Microsoft.SunriseBaseGame", info.name) + assertEquals("2023.1122.1704.2", info.version) + assertEquals(listOf("ForzaHorizon4.exe"), info.executables) + assertEquals("Windows.FullTrustApplication", info.entryPoint) + assertEquals("ForzaHorizon4.exe", XboxManifest.executable(root)) + assertFalse(XboxManifest.needsAppModel(root)) + } + @Test fun uwpEntryPointNeedsAnAppModelHost() { + // Forza Horizon 4's Store build declares Forza.App, so its executable is a view + // provider rather than a program: starting it directly only crashes. + val root = temporary.newFolder() + java.io.File(root, "ForzaHorizon4.exe").writeText("encrypted") + java.io.File(root, "AppxManifest.xml").writeText(""" + + + """) + assertEquals("Forza.App", XboxManifest.read(root).entryPoint) + assertTrue(XboxManifest.needsAppModel(root)) + } + private fun legacy(application: String): java.io.File { + val root = temporary.newFolder() + java.io.File(root, "Game.exe").writeText("encrypted") + java.io.File(root, "AppxManifest.xml").writeText(""" + + + $application""") + return root + } + @Test fun windowsAppRuntimeBehaviorNeedsAnAppModelWithoutAnEntryPoint() { + val root = legacy("""""") + assertEquals("windowsApp", XboxManifest.read(root).runtimeBehavior) + assertEquals("", XboxManifest.read(root).entryPoint) + assertTrue(XboxManifest.needsAppModel(root)) + } + @Test fun classicRuntimeBehaviorsStartTheExecutableDirectly() { + for (behavior in listOf("packagedClassicApp", "win32App")) { + val root = legacy("""""") + assertEquals(behavior, XboxManifest.read(root).runtimeBehavior) + assertFalse(behavior, XboxManifest.needsAppModel(root)) + val declared = legacy("""""") + assertFalse(behavior, XboxManifest.needsAppModel(declared)) + } + } + @Test fun anEntryPointStillDecidesWithoutARuntimeBehavior() { + assertTrue(XboxManifest.needsAppModel(legacy(""""""))) + assertFalse(XboxManifest.needsAppModel(legacy(""""""))) + } + @Test fun aTitleWithoutALegacyManifestNeverNeedsAnAppModel() { + val root = temporary.newFolder() + java.io.File(root, "Game.exe").writeText("encrypted") + java.io.File(root, "MicrosoftGame.config").writeText("") + assertEquals("", XboxManifest.read(root).entryPoint) + assertFalse(XboxManifest.needsAppModel(root)) + assertFalse(XboxManifest.needsAppModel(temporary.newFolder())) + } @Test fun signInBridgeRejectsUntrustedAndNonHttpsOrigins() { assertTrue(XboxLoginActivity.trusted("https://login.live.com/ppsecure/InlineLogin.srf")) for (url in listOf("http://login.live.com/", "https://login.live.com.evil.test/", "https://evil.test@login.live.com/", "https://login.live.com:8443/")) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt index c2d723f7b6..3e2310be5c 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher.stores.xbox +import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test @@ -16,4 +18,12 @@ class XodusDiagnosticsTest { assertFalse("Microsoft content licensing rejected sign-in (HTTP 403). Sign in again in Settings.".matches(rejected)) assertFalse("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-http 401".matches(rejected)) } + + @Test fun aLicensingTimeoutAfterARefusalReachesTheTailAndIsReported() { + val stderr = listOf("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-device-name 400", "NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-timeout 0") + val tail = stderr.filter { it.matches(Xodus.reportable) } + assertEquals(stderr, tail) + assertNull(XboxInstaller.licenseRefusal(tail)) + assertFalse("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-timeout 1000".matches(Xodus.reportable)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt index 4f914f0b55..1f214aba0c 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt @@ -64,7 +64,7 @@ class StoreRestorationTest { } compose.mainClock.advanceTimeBy(100) compose.onNodeWithText(ctx.getString(R.string.stores_xbox_content_title)).assertExists() - compose.onNodeWithText("Missing or ambiguous MicrosoftGame.config.").assertExists() + compose.onNodeWithText("Missing or ambiguous game manifest.").assertExists() compose.onNodeWithText(ctx.getString(android.R.string.ok)).performClick() compose.runOnIdle { assertNull(XboxContent.plan) } } diff --git a/docs/development/xbox-store.md b/docs/development/xbox-store.md index bc4aecf661..7133e5c078 100644 --- a/docs/development/xbox-store.md +++ b/docs/development/xbox-store.md @@ -1,7 +1,8 @@ # Xbox / PC Game Pass on Thor -This integrates PC Microsoft Store MSIXVC packages, -not Xbox console emulation or UWP/APPX packages. +This integrates PC Microsoft Store packages, both streamed MSIXVC packages and the legacy +EAppx containers older desktop titles still ship as. It is not Xbox console emulation and +does not run UWP titles in a packaged-app host. ## Testing on Thor @@ -69,14 +70,96 @@ not Xbox console emulation or UWP/APPX packages. cleanup must preserve installed game files reached through view symlinks. 10. Sign out from Xbox. Installed files should remain, account library data should clear, and Play/download licensing should require sign-in again. +11. Install a legacy title that ships an EAppx bundle, such as Forza Horizon 4 + (`9PNQKHFLD2WQ`). The download shows as a percentage rather than a streamed + install, Stop kills it rather than pausing, and a finished install registers + the executable named by `AppxManifest.xml`. Expect tens of gigabytes: check + free space first, since the preflight needs the download plus two copies of + the largest container. Do not uninstall DroidDeck or clear application data to troubleshoot this build. The signed APK is installed in place to retain existing Steam and store data. +## Legacy EAppx packages + +A title that predates MSIXVC ships as an EAppx bundle: an archive of Appx packages, encrypted, +with an `AppxManifest.xml` per package instead of `MicrosoftGame.config`. `streaming` rejects the +format, so the installer reads the format the catalogue recorded and runs `xodus-cli +legacy-install` instead. `MSIXVC`, `EAPPX` and `EAPPXBUNDLE` are the only formats listed for a +`Windows.Desktop` package; the format is carried into the install record so a later update or +resume dispatches the same way. + +The verb resolves, licenses, downloads, extracts, then hoists the manifest to the game root: + +- **Resolution.** The Xbox content service is asked first. Some legacy bundles it answers with no + files at all; Windows Update (`fe3cr.delivery.mp.microsoft.com`, SOAP `GetCookie`, + `SyncUpdates`, `GetExtendedUpdateInfo2`) is asked next through the title's `WuCategoryId` and + returns the full bundle with a time-signed CDN URL. That endpoint is a public Windows Update + service and needs no Xbox credential, but it presents a certificate chained to Microsoft's ECC + Product Root CA 2018, which Android's CA bundle does not carry, so `wu-root.pem` is pinned for + those requests only. A WU result is reduced to its `.eappx`/`.eappxbundle` files: the plain + `.appx` framework packages delivered beside it (VCLibs) and the differential `.cab` metadata are + not containers this path can unpack. +- **Licensing.** The existing `license` verb runs before the first byte is fetched and must return + content keys; no keys means no install. +- **Space.** Free space is checked up front against the download plus two copies of the largest + container, because a bundle is expanded in place. Each container is removed as soon as it is + unpacked, so the peak is the archive plus its contents rather than both plus the earlier + archives. A container a stopped attempt finished is counted as reclaimable, since the retry + truncates it before writing. +- **Pause and resume.** A legacy download has no control channel: Stop kills the downloader, and + the next attempt starts an unfinished container again from byte zero, while a container that + completed is kept and reused. Nothing is checkpointed inside a container. +- **Frameworks.** An installed package gets its `PackageDependency` frameworks from the package + graph; an unpacked folder has none, so the loader fails with `0xc0000135` on + `VCRUNTIME140_APP.dll` and friends. The verb fetches each declared framework from its Windows + Update category and copies its libraries beside the title, which is where the loader looks. A + category lists one package per architecture under identifier-only names, so each is unpacked + until one declares `ProcessorArchitecture="x64"`; taking the first one puts 32-bit DLLs into a + 64-bit folder and every load fails with `0xc000007b`. Only the libraries that copy put there + are withdrawn when a framework is replaced, so a title's own DLL of the same name survives. +- **Updates.** Installing over a folder that already holds a manifest lifts the new package over + the old files; on a first install an existing target is an error rather than a merge. +- **Failure detail.** A release build hides logcat from adb, so a failed install writes the + backend's stderr tail to `files/xbox-install.log` beside the app and repeats the last lines in + the failure message. + ## Evidence and limits Verified during development: +- The catalogue lists a legacy title beside the MSIXVC ones, and its detail page + offers Install with the recorded format. +- Resolution of a real legacy PC bundle on Thor without any Xbox token: Forza + Horizon 4 (`9PNQKHFLD2WQ`) through Windows Update as + `Microsoft.SunriseBaseGame_2023.1122.1704.2_neutral_~_8wekyb3d8bbwe.eappxbundle`, + 85,219,173,025 bytes, with a signed CDN URL. The Xbox content service returns + no files for that product, which is why the WU route exists. +- `AppxManifest.xml` identity and executable extraction, and its rejection rules, + are unit-tested against a manifest of that shape. +- An install of that bundle completed on Thor. The 85,219,173,025-byte container + produced 79.3 GB at the game root with `AppxManifest.xml` and the package DLLs + directly beneath it, which the launcher reports as installed. +- Unpacking that bundle ran at about 40 MB/s on one thread and about 200 MB/s + across four, measured as growth of the destination folder. The container is + deleted once its members are on disk, so the peak footprint is one package at + a time rather than the archive plus everything under it. The install bubble + advances through this stage: each file's declared length is counted as it is + written, and a bundle member is one file, so the folder's growth covers it. +- A launch of this title through Xodus/ARM64 Proton reaches the loader with every declared + framework in place, then fails inside Wine: its manifest names `EntryPoint="Forza.App"`, a UWP + application that expects the app model to activate a view, which Wine has no host for. The + Play action reads that entry point from `AppxManifest.xml` and refuses the launch with a + message, and a launch that does reach the runtime reports `uwp-entry-point` rather than dying + silently. A package naming `Windows.FullTrustApplication` starts as an ordinary Win32 + executable instead. +- Activation itself is not the missing piece. A DLL registered under + `HKLM\Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.ApplicationModel.Core.CoreApplication` + is loaded by `combase.dll`, and its `DllGetActivationFactory` is called for that class. Such a + title still stops earlier: `GetCurrentPackageFullName` and `GetCurrentPackageFamilyName` are + Wine stubs, so a package has no identity, and an activation factory alone cannot supply the + `IFrameworkViewSource`/`CoreWindow` host the view asks for. + - Native AArch64 CLI execution on Thor's existing Linux runtime. - Abstract-socket credential transport with a synthetic account on Thor; this does not establish a real Microsoft sign-in. diff --git a/tools/xbox/README.md b/tools/xbox/README.md index 0f106585bc..fb8705b166 100644 --- a/tools/xbox/README.md +++ b/tools/xbox/README.md @@ -108,11 +108,29 @@ lets ARM64EC Wine load the AMD64 modules through its normal native DLL path. Only each Xbox game's prefix receives these Windows modules. Existing Steam games and other store prefixes retain their selected runtimes. +`droiddeck-legacy-packages.patch` lets the plan, license and extract verbs handle a legacy +package. A bundle is expanded in place, nesting is bounded at three, and each inner EAppx +container is decrypted with the same content keys; inner files without an EAppx header are left +as extracted. `streaming` still serves MSIXVC only. + +`droiddeck-legacy-install.patch` adds `xodus-cli legacy-install`: resolve, license, download, +extract, hoist. Resolution asks the Xbox content service first and Windows Update +(`fe3cr.delivery.mp.microsoft.com`, SOAP) second, because some legacy products return no files +from the content service. The WU endpoint needs no Xbox credential but chains to Microsoft's ECC +Product Root CA 2018, which Android's CA bundle does not carry, so that one public root is +pinned in `wu-root.pem` for these requests. Only `.eappx`/`.eappxbundle` files from a WU result +are kept; the `.appx` framework packages and `.cab` metadata beside them are dropped. Licensing +runs before the first byte and must return content keys. Free space is checked against the +download plus two copies of the largest container, and each container is deleted once unpacked. +The download has no control channel: cancelling kills it and the next attempt starts that +container from zero. + Cloud saves and in-game identity use the reused XGameRuntime/service interfaces; those are game-dependent. Entitlements distinguish purchases from Game Pass access, and the backend performs a fresh license check for downloads and launch. -The store lists PC MSIXVC games only. It does not emulate Xbox consoles or add -support for UWP/APPX packages. Update / verify refreshes an installed package through the normal licensed +The store lists PC packages it can install: streamed MSIXVC, and the legacy EAppx bundles older +desktop titles still ship as. It does not emulate Xbox consoles or host UWP titles in a +packaged-app host. Update / verify refreshes an installed package through the normal licensed streaming path. Manage content resolves manifest-related licensed PC DLC into separate content roots and checks its parent identity after download. These flows still require game/account validation; runtime API presence does not diff --git a/tools/xbox/build-local.sh b/tools/xbox/build-local.sh index c833a403d0..3e61e8eae9 100755 --- a/tools/xbox/build-local.sh +++ b/tools/xbox/build-local.sh @@ -32,7 +32,10 @@ else '"$build" fi mkdir -p "$cache" +threads=() +[[ -n "${RUST_TEST_THREADS:-}" ]] && threads=(-e RUST_TEST_THREADS="$RUST_TEST_THREADS") docker run --rm --platform "$platform" -v "$repo:/src" -v "$cache:/work" -w /src \ - -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build "$image" \ + -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build \ + ${threads[@]+"${threads[@]}"} "$image" \ bash -lc "set -euo pipefail - trap 'chown -R $(id -u):$(id -g) /work /src/app/src/main/assets/linuxfs 2>/dev/null || true' EXIT$build" + trap 'chown -R $(id -u):$(id -g) /work /src/app/src/main/assets/linuxfs /src/app/build 2>/dev/null || true' EXIT$build" diff --git a/tools/xbox/droiddeck-legacy-install.patch b/tools/xbox/droiddeck-legacy-install.patch new file mode 100644 index 0000000000..bf2013fa8e --- /dev/null +++ b/tools/xbox/droiddeck-legacy-install.patch @@ -0,0 +1,2794 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 0b0f1e0..5dfc09a 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -7185,12 +7185,14 @@ dependencies = [ + "console-subscriber", + "ctrlc", + "eappx", ++ "flate2", + "fs2", + "futures-util", + "indicatif", + "inquire", + "msixvc", + "nix", ++ "quick-xml 0.42.0", + "reqwest 0.13.4", + "rustix", + "serde_json", +diff --git a/crates/xodus-cli/Cargo.toml b/crates/xodus-cli/Cargo.toml +index 5894ef9..f49470b 100644 +--- a/crates/xodus-cli/Cargo.toml ++++ b/crates/xodus-cli/Cargo.toml +@@ -5,6 +5,7 @@ edition = "2024" + default-run = "xodus-cli" + + [dependencies] ++quick-xml = "0.42.0" + xodus = { path = "../xodus" } + msixvc = { path = "../msixvc" } + eappx = { git = "https://github.com/tuxuser/eappx-rs" } +@@ -25,6 +26,7 @@ futures-util = "0.3.34" + uuid = "1.25.0" + indicatif = "0.18.6" + fs2 = "0.4.3" ++flate2 = "1.0.28" + tempfile = "3.27.0" + rustix = "1.1.4" + ctrlc = "3.5.2" +diff --git a/crates/xodus-cli/src/commands.rs b/crates/xodus-cli/src/commands.rs +index 088a6d0..825c24e 100644 +--- a/crates/xodus-cli/src/commands.rs ++++ b/crates/xodus-cli/src/commands.rs +@@ -2,11 +2,14 @@ pub mod clep; + pub mod download; + pub mod extract; + pub mod extract_eappx; ++pub mod unzip; + pub mod license; ++pub mod legacy_install; + pub mod login; + pub mod logout; + pub mod offline_pc; + pub mod profile; ++pub mod store_delivery; + pub mod cloud_token; + pub mod social; + pub mod game_activity; +diff --git a/crates/xodus-cli/src/commands/extract_eappx.rs b/crates/xodus-cli/src/commands/extract_eappx.rs +index 5ea43da..0bad98e 100644 +--- a/crates/xodus-cli/src/commands/extract_eappx.rs ++++ b/crates/xodus-cli/src/commands/extract_eappx.rs +@@ -51,6 +51,8 @@ pub struct Meter { + pub banked: std::sync::atomic::AtomicU64, + /// Bytes the package being unpacked now will write in total. + pub total: std::sync::atomic::AtomicU64, ++ /// Bytes that packages not yet opened will write. ++ pub planned: std::sync::atomic::AtomicU64, + turn: std::sync::Mutex<()>, + } + +@@ -61,7 +63,14 @@ impl Meter { + let _turn = self.turn.lock().unwrap_or_else(|poisoned| poisoned.into_inner()); + let banked = self.banked.load(Relaxed); + let total = self.total.load(Relaxed); +- (banked + self.written.load(Relaxed).min(total), banked + total) ++ (banked + self.written.load(Relaxed).min(total), banked + total + self.planned.load(Relaxed)) ++ } ++ ++ /// Announces packages that will be opened later, so the total does not grow when they are. ++ fn expect(&self, bytes: u64) { ++ use std::sync::atomic::Ordering::Relaxed; ++ let _turn = self.turn.lock().unwrap_or_else(|poisoned| poisoned.into_inner()); ++ self.planned.fetch_add(bytes, Relaxed); + } + + pub fn done(&self) -> u64 { +@@ -79,6 +88,8 @@ impl Meter { + self.banked.fetch_add(self.total.load(Relaxed), Relaxed); + self.written.store(0, Relaxed); + self.total.store(total, Relaxed); ++ let planned = self.planned.load(Relaxed); ++ self.planned.store(planned.saturating_sub(total), Relaxed); + } + } + +@@ -260,6 +271,9 @@ fn derive( + return Err(Failure::at("nesting", infile, "bundle nesting exceeds the limit")); + } + ++ if let Some(meter) = meter { ++ meter.expect(nested.iter().map(|child| package_size(child)).sum()); ++ } + for child in nested { + let name = child + .file_stem() +@@ -275,6 +289,14 @@ fn derive( + Ok(()) + } + ++/// What a package's blockmap says it will write, or nothing when its header is unreadable. ++fn package_size(path: &Path) -> u64 { ++ let Ok(file) = std::fs::File::open(path) else { return 0 }; ++ EAppxFile::from_stream(&mut std::io::BufReader::new(file)) ++ .map(|package| package.blockmap.files.iter().map(|entry| entry.size).sum()) ++ .unwrap_or(0) ++} ++ + /// Bytes currently on disk under `dir`. + /// + /// A bundle member is written as one file, so a per-file counter says nothing +@@ -414,3 +436,29 @@ fn unpack( + } + Ok(()) + } ++ ++#[cfg(test)] ++mod meter_tests { ++ use super::Meter; ++ ++ #[test] ++ fn announced_packages_keep_the_total_from_growing() { ++ let meter = Meter::default(); ++ meter.roll(100); ++ meter.expect(300); ++ assert_eq!(meter.snapshot(), (0, 400)); ++ meter.written.store(100, std::sync::atomic::Ordering::Relaxed); ++ meter.roll(300); ++ assert_eq!(meter.snapshot(), (100, 400)); ++ meter.written.store(300, std::sync::atomic::Ordering::Relaxed); ++ assert_eq!(meter.snapshot(), (400, 400)); ++ } ++ ++ #[test] ++ fn written_bytes_never_exceed_the_package_being_unpacked() { ++ let meter = Meter::default(); ++ meter.roll(10); ++ meter.written.store(25, std::sync::atomic::Ordering::Relaxed); ++ assert_eq!(meter.snapshot(), (10, 10)); ++ } ++} +diff --git a/crates/xodus-cli/src/commands/legacy_install.rs b/crates/xodus-cli/src/commands/legacy_install.rs +new file mode 100755 +index 0000000..d43c5fc +--- /dev/null ++++ b/crates/xodus-cli/src/commands/legacy_install.rs +@@ -0,0 +1,1198 @@ ++//! Installs a legacy Store title: resolve, license, download, extract. ++//! ++//! `streaming` only understands MSIXVC, where the container *is* the game and ++//! the bytes arrive in the block layout the runtime reads. A legacy title ships ++//! as an EAppx bundle instead, so its bytes have to be fetched whole, licensed ++//! and decrypted before anything is launchable. ++//! ++//! Two delivery routes exist and both are needed in practice: the Xbox content ++//! service serves MSIXVC and some legacy packages, and Windows Update serves the ++//! legacy desktop bundles it refuses (see `store_delivery`). Each is tried in ++//! turn and whichever names a container is used. ++//! ++//! The three verbs under that (`license`, `download`, `extract-eappx`) are chained ++//! here rather than from the app because each process would restart the progress ++//! sequence, and the installer requires it to increase within one stream. ++ ++use std::path::{Path, PathBuf}; ++use std::process::ExitCode; ++use std::time::{Duration, Instant}; ++ ++use futures_util::StreamExt; ++use tokio::io::AsyncWriteExt; ++use xodus::tokens::TokenManager; ++ ++/// Downloaded containers live here until extraction succeeds. They are large and ++/// useless afterwards, so they are removed on success and kept on failure. ++const CONTAINER_DIR: &str = ".xodus-container"; ++/// Content keys for the containers above, removed alongside them. ++const KEYS_DIR: &str = ".xodus-keys"; ++/// The manifest the launcher resolves executables against, expected at the root. ++const MANIFEST: &str = "MicrosoftGame.config"; ++/// A legacy package carries this instead of the config above. ++const LEGACY_MANIFEST: &str = "AppxManifest.xml"; ++/// Framework packages unpack here, and their libraries are copied up beside the title. ++const FRAMEWORK_DIR: &str = ".droiddeck-frameworks"; ++/// Marks a framework whose libraries are already beside the title. ++const INSTALLED: &str = ".installed"; ++/// The libraries `copy_libraries` put beside the title, one name per line. ++const COPIED: &str = ".droiddeck-copied"; ++ ++fn is_legacy_name(name: &str) -> bool { ++ let name = name.to_ascii_lowercase(); ++ name.ends_with(".eappx") || name.ends_with(".eappxbundle") ++} ++ ++/// Free bytes on the filesystem holding `path`, or `None` when it cannot be read. ++/// ++/// The install runs inside the device's own Linux environment, where `df -P -k` is ++/// the one portable free-space query that needs no extra crate, and a failed read ++/// only skips the check rather than blocking a valid install. ++fn free_bytes(path: &Path) -> Option { ++ let output = std::process::Command::new("df").arg("-kP").arg(path).output().ok()?; ++ if !output.status.success() { ++ return None; ++ } ++ let text = String::from_utf8_lossy(&output.stdout); ++ let available = text.lines().nth(1)?.split_whitespace().nth(3)?; ++ available.parse::().ok().map(|kib| kib.saturating_mul(1024)) ++} ++ ++/// Reports why the install stopped without disclosing anything sensitive. ++/// ++/// The app only forwards stderr lines that are on a known allowlist, so a bare ++/// message is invisible there. Two lines are emitted instead: a stable stage code, ++/// and the message reduced to lowercase words with every token that could carry a ++/// path, URL or identifier dropped. ++fn fail(code: &str, message: &str) -> ExitCode { ++ eprintln!("NEXUS_LEGACY_INSTALL_DIAGNOSTIC_V1 {code}"); ++ let detail = bounded(&plain(message)); ++ if !detail.is_empty() { ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 {detail}"); ++ } ++ eprintln!("{message}"); ++ ExitCode::FAILURE ++} ++ ++/// The message reduced to whatever can be shown over a diagnostic line. ++/// Android keeps a detail line only up to 220 characters, so the whole line is cut, not each part. ++fn bounded(line: &str) -> String { ++ let mut cut = line.len().min(220); ++ while !line.is_char_boundary(cut) { ++ cut -= 1; ++ } ++ line[..cut].trim_end().to_string() ++} ++ ++fn plain(message: &str) -> String { ++ let mut detail = String::new(); ++ for word in message.split_whitespace() { ++ if word.contains('/') || word.contains(':') || word.contains('\\') { ++ continue; ++ } ++ let cleaned: String = word ++ .chars() ++ .filter(|c| c.is_ascii_alphanumeric() || *c == '-' || *c == '.') ++ .collect::() ++ .to_ascii_lowercase(); ++ if cleaned.is_empty() { ++ continue; ++ } ++ if !detail.is_empty() { ++ detail.push(' '); ++ } ++ detail.push_str(&cleaned); ++ if detail.len() >= 200 { ++ break; ++ } ++ } ++ detail ++} ++ ++/// `plain` for callers outside this file. ++pub(crate) fn plain_for_log(message: &str) -> String { ++ bounded(&plain(message)) ++} ++ ++/// The installer parses this and only this, so it must match the streaming ++/// schema exactly; `phase` drives its stage display. ++struct Progress { ++ json: bool, ++ sequence: u64, ++ phase: &'static str, ++ completed: u64, ++ total: Option, ++ previous: u64, ++ last: Instant, ++} ++ ++impl Progress { ++ fn new(json: bool) -> Self { ++ let mut progress = Self { ++ json, ++ sequence: 0, ++ phase: "metadata", ++ completed: 0, ++ total: None, ++ previous: 0, ++ last: Instant::now(), ++ }; ++ progress.emit(); ++ progress ++ } ++ ++ fn total(&mut self, total: u64) { ++ self.total = Some(total); ++ self.emit(); ++ } ++ ++ /// Stage transitions are always reported; byte updates are rate limited so a ++ /// multi-gigabyte download cannot flood the pipe. ++ fn phase(&mut self, phase: &'static str) { ++ self.phase = phase; ++ self.completed = 0; ++ self.previous = 0; ++ self.emit(); ++ } ++ ++ fn advance(&mut self, delta: u64) { ++ self.completed = self.completed.saturating_add(delta); ++ if self.last.elapsed() >= Duration::from_millis(200) { ++ self.emit(); ++ } ++ } ++ ++ /// Reports unpacking, which counts bytes neither the download nor a file list ++ /// can see, so the bar advances while a multi-gigabyte member is decrypted. ++ fn bytes(&mut self, completed: u64, total: u64) { ++ self.phase = "installing"; ++ self.completed = completed; ++ self.total = Some(total); ++ if self.last.elapsed() >= Duration::from_millis(700) { ++ self.emit(); ++ } ++ } ++ ++ fn complete(&mut self, success: bool) { ++ self.phase = if success { "complete" } else { "failed" }; ++ self.emit(); ++ } ++ ++ fn emit(&mut self) { ++ let elapsed = self.last.elapsed(); ++ let rate = (self.completed.saturating_sub(self.previous) as f64 / elapsed.as_secs_f64().max(0.001)) as u64; ++ self.previous = self.completed; ++ self.last = Instant::now(); ++ if self.json { ++ let record = serde_json::json!({ ++ "schema": 1, ++ "event": "progress", ++ "sequence": self.sequence, ++ "phase": self.phase, ++ "paused": false, ++ "canPause": false, ++ "completedBytes": self.completed, ++ "totalBytes": self.total, ++ "bytesPerSecond": rate, ++ }); ++ println!("NEXUS_PROGRESS {record}"); ++ } else { ++ match self.total { ++ Some(total) => println!("{}: {}/{} bytes", self.phase, self.completed, total), ++ None => println!("{}: {} bytes", self.phase, self.completed), ++ } ++ } ++ self.sequence += 1; ++ } ++} ++ ++/// A container to fetch, wherever its location came from. ++struct Container { ++ name: String, ++ url: String, ++ size: u64, ++} ++ ++/// What to install and which content id its keys are licensed under. ++struct Install { ++ content_id: String, ++ containers: Vec, ++ /// Why the other route was not used, for the failure message. ++ note: String, ++ /// A Windows Update build whose download locations are asked for once it is licensed. ++ build: Option, ++} ++ ++/// Resolves the legacy containers the Xbox content service is willing to serve. ++/// ++/// Every legacy-format member of the offer is tried, because a product can carry ++/// more than one content id and only some of them are served files. Measured on ++/// FH4: the desktop EAppxBundle is acknowledged with an empty file list while the ++/// console XVC of the same product is served normally, so the empty answer is ++/// reported as such rather than as a title that is not owned. ++async fn from_xbox_service( ++ client: &reqwest::Client, ++ tokens: &TokenManager, ++ product: &str, ++ market: &str, ++ preferred: Option<&str>, ++) -> Result { ++ let region = market.to_uppercase(); ++ let mut candidates: Vec = Vec::new(); ++ if let Some(preferred) = preferred.filter(|id| uuid::Uuid::try_parse(id).is_ok()) { ++ candidates.push(preferred.to_string()); ++ } else if uuid::Uuid::try_parse(product).is_ok() { ++ candidates.push(product.to_string()); ++ } else { ++ let plan = crate::package_plan::resolve(client, &product.to_uppercase(), ®ion) ++ .await ++ .map_err(|error| format!("resolve {error}"))?; ++ for choice in &plan.choices { ++ let legacy_format = choice.format == "EAPPX" || choice.format == "EAPPXBUNDLE"; ++ if legacy_format && !candidates.contains(&choice.content_id) { ++ candidates.push(choice.content_id.clone()); ++ } ++ } ++ // The catalogue names the package a listing shows, which need not be the ++ // container the content service hands over, so the resolver's own choice ++ // is asked first and the rest of the offer is only a fallback. ++ if let Ok(pick) = plan.without_durable_selection().select(None) { ++ candidates.retain(|candidate| *candidate != pick); ++ candidates.insert(0, pick); ++ } ++ } ++ if candidates.is_empty() { ++ return Err("the Store offer names no legacy package".into()); ++ } ++ ++ let mut probe: Vec = Vec::new(); ++ for (index, candidate) in candidates.iter().take(4).enumerate() { ++ match crate::package::get_packages(client, tokens, candidate.clone()).await { ++ Ok(package) => { ++ let legacy: Vec<_> = package ++ .package_files ++ .iter() ++ .filter(|file| is_legacy_name(&file.file_name)) ++ .collect(); ++ probe.push(format!("c{index} n{} l{}", package.package_files.len(), legacy.len())); ++ if legacy.is_empty() { ++ continue; ++ } ++ let mut containers = Vec::new(); ++ for file in legacy { ++ let Some(root) = file.cdn_root_paths.first() else { ++ return Err("a package file has no download location".into()); ++ }; ++ containers.push(Container { ++ name: file.file_name.clone(), ++ url: format!("{root}{}", file.relative_url), ++ size: file.file_size.max(0) as u64, ++ }); ++ } ++ return Ok(Install { content_id: candidate.clone(), containers, note: probe.join(" "), build: None }); ++ } ++ Err(error) => probe.push(format!("c{index} {error}")), ++ } ++ } ++ Err(format!("{} candidates, {}", candidates.len(), probe.join(" "))) ++} ++ ++pub async fn run( ++ client: &reqwest::Client, ++ tokens: &TokenManager, ++ product: String, ++ destination: String, ++ market: Option, ++ selected_content_id: Option, ++ store_id: Option, ++ progress_json: bool, ++ resolve_only: bool, ++) -> ExitCode { ++ let destination = PathBuf::from(destination); ++ if let Err(error) = tokio::fs::create_dir_all(&destination).await { ++ return fail("destination-failed", &format!("Could not prepare the install folder: {error}")); ++ } ++ let _folder_lock = match std::fs::OpenOptions::new() ++ .write(true) ++ .create(true) ++ .truncate(false) ++ .open(destination.join(".nexus-streaming.lock")) ++ .and_then(|file| fs2::FileExt::try_lock_exclusive(&file).map(|()| file)) ++ { ++ Ok(file) => file, ++ Err(_) => return fail("folder-busy", "Another download is using this folder"), ++ }; ++ let mut progress = Progress::new(progress_json); ++ let region = market.clone().unwrap_or("US".into()).to_uppercase(); ++ ++ // One client covers both routes: a package the content service serves is also ++ // downloaded from a delivery host, so both download and update calls use it. ++ let delivery_client = match crate::commands::store_delivery::client() { ++ Ok(client) => client, ++ Err(error) => return fail("update-client-failed", &error), ++ }; ++ let mut update = None; ++ let mut builds: Vec = match from_xbox_service(client, tokens, &product, ®ion, selected_content_id.as_deref()).await { ++ Ok(install) => vec![install], ++ Err(xbox_error) => { ++ // The content service does not serve legacy desktop bundles, so the ++ // Windows Update route is the one that has to work. Its catalogue is ++ // keyed by the Store product, also for an add-on named by content id. ++ let catalogue = store_id.as_deref().unwrap_or(&product); ++ match crate::commands::store_delivery::resolve_builds(&delivery_client, catalogue, ®ion).await { ++ Ok(list) => { ++ let found = (0..list.len()) ++ .map(|index| Install { ++ content_id: list.content_id(index), ++ containers: Vec::new(), ++ note: "windows-update".into(), ++ build: Some(index), ++ }) ++ .collect(); ++ update = Some(list); ++ found ++ } ++ Err(update_error) => { ++ return fail( ++ "no-container", ++ &format!("{xbox_error}; windows update: {update_error}"), ++ ) ++ } ++ } ++ } ++ }; ++ if resolve_only { ++ // Printing locations is what makes a failure diagnosable without spending ++ // hours on a download, so this stops before any byte is written. ++ for install in &builds { ++ println!("content-id: {} ({})", install.content_id, install.note); ++ for container in &install.containers { ++ println!("{} {} {}", container.size, container.name, container.url); ++ } ++ if let (Some(index), Some(list)) = (install.build, update.as_ref()) { ++ match list.locate(&delivery_client, index).await { ++ Ok(files) => files.iter().for_each(|file| println!("{} {} {}", file.size, file.name, file.url)), ++ Err(error) => println!("unavailable: {error}"), ++ } ++ } ++ } ++ return ExitCode::SUCCESS; ++ } ++ ++ // The license verb already writes the [Keys] text eappx reads, so reuse it ++ // rather than re-deriving the content keys here. ++ let keys = destination.join(KEYS_DIR); ++ if let Err(error) = tokio::fs::create_dir_all(&keys).await { ++ return fail("keys-folder-failed", &format!("Could not prepare the key folder: {error}")); ++ } ++ // The standalone verb defaults to "neutral" and that is the market this path ++ // was proven against, so default the same way rather than forwarding a ++ // region the license service may not accept. ++ let license_market = market.clone().unwrap_or("neutral".into()); ++ let refused = xodus::licensing::content::LicenseContentError::DeviceUnregistrable.to_string(); ++ let install = loop { ++ let mut candidate = builds.remove(0); ++ match crate::commands::license::dump( ++ client, ++ tokens, ++ candidate.content_id.clone(), ++ license_market.clone(), ++ keys.display().to_string(), ++ ) ++ .await ++ { ++ Ok(()) => { ++ let (Some(index), Some(list)) = (candidate.build, update.as_ref()) else { break candidate }; ++ match list.locate(&delivery_client, index).await { ++ Ok(files) => { ++ candidate.containers = files ++ .into_iter() ++ .map(|file| Container { name: file.name, url: file.url, size: file.size }) ++ .collect(); ++ break candidate; ++ } ++ Err(_) if !builds.is_empty() => { ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 a licensed build has no download location, trying an older build"); ++ } ++ Err(error) => return fail("no-container", &error), ++ } ++ } ++ Err(error) if error == refused && !builds.is_empty() => { ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 newest build has no license for this device, trying an older build"); ++ } ++ Err(error) => { ++ eprintln!("{error}"); ++ return fail("license-failed", &format!("No license for content {} ({})", candidate.content_id, candidate.note)); ++ } ++ } ++ }; ++ if install.containers.is_empty() { ++ return fail("no-container", "No package files were listed for this title"); ++ } ++ let total: u64 = install.containers.iter().map(|container| container.size).sum(); ++ let largest = install.containers.iter().map(|container| container.size).max().unwrap_or(0); ++ progress.total(total); ++ let mut names = std::collections::HashSet::new(); ++ for container in &install.containers { ++ let Some(name) = Path::new(&container.name).file_name() else { ++ return fail("unusable-name", "Microsoft returned an unusable package name"); ++ }; ++ if !names.insert(name.to_string_lossy().to_ascii_lowercase()) { ++ return fail("duplicate-container", "Microsoft listed two packages under one name"); ++ } ++ } ++ if let Ok(entries) = std::fs::read_dir(destination.join(CONTAINER_DIR)) { ++ for entry in entries.flatten() { ++ let name = entry.file_name().to_string_lossy().to_ascii_lowercase(); ++ if !names.contains(&name) && entry.file_type().is_ok_and(|kind| kind.is_file()) { ++ let _ = std::fs::remove_file(entry.path()); ++ } ++ } ++ } ++ let mut held = 0u64; ++ for container in &install.containers { ++ let Some(name) = Path::new(&container.name).file_name() else { continue }; ++ let staged = destination.join(CONTAINER_DIR).join(name); ++ let Ok(meta) = std::fs::symlink_metadata(&staged) else { continue }; ++ if meta.is_file() && container.size > 0 && meta.len() == container.size { ++ held = held.saturating_add(meta.len()); ++ continue; ++ } ++ if std::fs::remove_file(&staged).is_err() ++ && !(meta.is_file() && std::fs::OpenOptions::new().write(true).truncate(true).open(&staged).is_ok()) ++ { ++ return fail("staging-failed", "Could not clear an unfinished download from the staging folder"); ++ } ++ } ++ if let Some(free) = free_bytes(&destination) { ++ let needed = total.saturating_add(largest).saturating_add(largest / 10); ++ if free.saturating_add(held) < needed { ++ return fail( ++ "insufficient-space", ++ &format!( ++ "An install this size needs about {} GB free to unpack, and {} GB is available", ++ needed / 1_000_000_000, ++ free.saturating_add(held) / 1_000_000_000 ++ ), ++ ); ++ } ++ } ++ let key_file = keys.join("eappx-keys.txt"); ++ if !key_file.is_file() { ++ return fail("no-keys", "The license contained no content keys for this title"); ++ } ++ ++ let store = destination.join(CONTAINER_DIR); ++ if let Err(error) = tokio::fs::create_dir_all(&store).await { ++ return fail("staging-folder-failed", &format!("Could not prepare the staging folder: {error}")); ++ } ++ progress.phase("downloading"); ++ let mut downloaded: Vec = Vec::new(); ++ for container in &install.containers { ++ // Only the container's own name is used, never a server-provided path. ++ let Some(name) = Path::new(&container.name).file_name() else { ++ return fail("unusable-name", "Microsoft returned an unusable package name"); ++ }; ++ let target = store.join(name); ++ // A container a stopped attempt finished is not fetched again: it is most ++ // of an install this size, and the failure that stopped the run was almost ++ // never in its bytes. ++ if let Ok(meta) = tokio::fs::metadata(&target).await { ++ if container.size > 0 && meta.len() == container.size { ++ progress.advance(meta.len()); ++ downloaded.push(target); ++ continue; ++ } ++ } ++ let response = match delivery_client.get(&container.url).send().await { ++ Ok(response) => response, ++ Err(_) => return fail("download-request-failed", "Could not reach the download server"), ++ }; ++ if !response.status().is_success() { ++ return fail( ++ &format!("download-refused-{}", response.status().as_u16()), ++ "The download server refused this package", ++ ); ++ } ++ let mut file = match tokio::fs::File::create(&target).await { ++ Ok(file) => file, ++ Err(error) => return fail("download-write-failed", &format!("Could not write the package: {error}")), ++ }; ++ let mut stream = response.bytes_stream(); ++ while let Some(chunk) = stream.next().await { ++ let Ok(chunk) = chunk else { ++ return fail("download-interrupted", "The transfer was interrupted; resume to retry"); ++ }; ++ if let Err(error) = file.write_all(&chunk).await { ++ return fail("download-write-failed", &format!("Could not write the package: {error}")); ++ } ++ progress.advance(chunk.len() as u64); ++ } ++ if let Err(error) = file.flush().await { ++ return fail("download-flush-failed", &format!("Could not finish writing the package: {error}")); ++ } ++ downloaded.push(target); ++ } ++ ++ progress.phase("installing"); ++ let key_file_text = key_file.display().to_string(); ++ let meter = std::sync::Arc::new(crate::commands::extract_eappx::Meter::default()); ++ // Taken before the first byte is written, so growth of the folder is the ++ // progress of the unpack and not the container that was already downloaded. ++ let baseline = crate::commands::extract_eappx::tree_size(&destination); ++ let mut high = 0u64; ++ for container in &downloaded { ++ let source = container.display().to_string(); ++ // Unpacking never yields, so it runs on a blocking thread and this task ++ // reports the counter while it works. Without that, the phase would only ++ // be visible once it had finished. ++ let unpacking = tokio::task::spawn_blocking({ ++ let destination = destination.clone(); ++ let key_file_text = key_file_text.clone(); ++ let meter = meter.clone(); ++ move || { ++ crate::commands::extract_eappx::run_blocking( ++ source, ++ destination.display().to_string(), ++ Some(key_file_text), ++ Some(&meter), ++ // A full title is tens of gigabytes. Holding the container ++ // while its members are decrypted can fill the device. ++ true, ++ ) ++ } ++ }); ++ let extracted = loop { ++ if unpacking.is_finished() { ++ break unpacking.await.unwrap_or(ExitCode::FAILURE); ++ } ++ tokio::time::sleep(Duration::from_millis(700)).await; ++ let (mut done, total) = meter.snapshot(); ++ if total == 0 { ++ continue; ++ } ++ // A bundle member is one file, so its bytes are only visible on disk. ++ if meter.written.load(std::sync::atomic::Ordering::Relaxed) == 0 { ++ let on_disk = crate::commands::extract_eappx::tree_size(&destination).saturating_sub(baseline); ++ done = done.max(on_disk); ++ } ++ // Deleting the container takes bytes off the disk, so the reported ++ // figure only ever moves forward. ++ high = high.max(done.min(total)); ++ progress.bytes(high, total); ++ }; ++ if extracted != ExitCode::SUCCESS { ++ return fail("extract-failed", "Could not unpack the package; the download is kept for a retry"); ++ } ++ // Drop each container as soon as it is unpacked: a full title is tens of ++ // gigabytes, and holding the archive and its contents at once can fill ++ // the device mid-install. ++ tokio::fs::remove_file(container).await.ok(); ++ } ++ ++ // A bundle extracts each member into its own directory, so the manifest ends ++ // up one level down. The launcher resolves executables relative to the game ++ // folder and requires the manifest at its root, so lift a lone member up. ++ if let Err(error) = hoist(&destination) { ++ return fail("hoist-failed", &error); ++ } ++ ++ tokio::fs::remove_dir_all(&store).await.ok(); ++ ++ // An installed package gets its frameworks from the package graph. Nothing ++ // puts them there for an unpacked folder, and a title that needs one refuses ++ // to load without it, so they are fetched and unpacked beside the title. ++ progress.phase("frameworks"); ++ if let Err(error) = ensure_frameworks(&delivery_client, &destination, ®ion).await { ++ progress.phase("frameworks"); ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 {}", bounded(&format!("dependency skipped; {}", plain(&error)))); ++ } ++ ++ tokio::fs::remove_dir_all(&keys).await.ok(); ++ progress.complete(true); ++ ExitCode::SUCCESS ++} ++ ++/// Installs every framework the title declares that is not there yet. ++/// ++/// Reports the first failure rather than stopping: a title whose framework is ++/// missing still installs, and the launch tries again. ++pub(crate) async fn ensure_frameworks( ++ delivery: &reqwest::Client, ++ destination: &Path, ++ region: &str, ++) -> Result<(), String> { ++ let mut failure = None; ++ for dependency in dependencies(destination) { ++ let marker = destination.join(FRAMEWORK_DIR).join(&dependency).join(INSTALLED); ++ if marker.is_file() { ++ continue; ++ } ++ match install_framework(delivery, destination, &dependency, region).await { ++ Ok(()) => eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 {}", bounded(&format!("framework {} installed", plain(&dependency)))), ++ Err(error) => { ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 {}", bounded(&format!("framework {} skipped {}", plain(&dependency), plain(&error)))); ++ failure.get_or_insert(format!("{dependency}: {error}")); ++ } ++ } ++ } ++ match failure { ++ Some(error) => Err(error), ++ None => Ok(()), ++ } ++} ++/// Framework packages the manifest asks for, in declaration order. ++/// ++/// Reading the attribute rather than parsing XML keeps this off a new dependency; ++/// the manifest is small and the element has one shape. ++pub(crate) fn dependencies(destination: &Path) -> Vec { ++ let Some(manifest) = [LEGACY_MANIFEST, MANIFEST] ++ .iter() ++ .map(|name| destination.join(name)) ++ .find(|path| path.is_file()) ++ else { ++ return Vec::new(); ++ }; ++ let Ok(text) = std::fs::read_to_string(manifest) else { ++ return Vec::new(); ++ }; ++ let mut names: Vec = Vec::new(); ++ for chunk in text.split("').next() else { continue }; ++ let Some(start) = tag.find("Name=\"") else { continue }; ++ let rest = &tag[start + "Name=\"".len()..]; ++ let Some(end) = rest.find('"') else { continue }; ++ let name = rest[..end].trim(); ++ if !name.is_empty() && !names.iter().any(|seen| seen == name) { ++ names.push(name.to_string()); ++ } ++ } ++ names ++} ++ ++/// The COM class the manifest names as the application's entry point. ++/// ++/// A packaged Win32 program names `Windows.FullTrustApplication` and starts like ++/// any other executable. A UWP application names its own class instead and expects ++/// the app model to create it, which no Win32 loader does. ++pub(crate) fn entry_point(destination: &Path) -> Option { ++ let manifest = [LEGACY_MANIFEST, MANIFEST] ++ .iter() ++ .map(|name| destination.join(name)) ++ .find(|path| path.is_file())?; ++ application_entry(&std::fs::read_to_string(manifest).ok()?) ++} ++ ++/// The activation of a manifest's first application: its `EntryPoint`, or `windowsApp` ++/// when it declares that runtime behaviour instead of an entry point. ++fn application_entry(text: &str) -> Option { ++ use quick_xml::events::Event; ++ let mut reader = quick_xml::Reader::from_str(text); ++ loop { ++ match reader.read_event().ok()? { ++ Event::Start(tag) | Event::Empty(tag) if tag.local_name().into_inner() == "Application" => { ++ let mut entry = None; ++ let mut behavior = None; ++ for attribute in tag.attributes().flatten() { ++ let value = attribute.unescape_value().ok()?.trim().to_string(); ++ match attribute.key.local_name().into_inner() { ++ "EntryPoint" => entry = Some(value), ++ "RuntimeBehavior" => behavior = Some(value), ++ _ => {} ++ } ++ } ++ return match behavior.as_deref() { ++ Some(value) if value.eq_ignore_ascii_case("windowsApp") => Some("windowsApp".to_string()), ++ Some(value) if value.eq_ignore_ascii_case("packagedClassicApp") || value.eq_ignore_ascii_case("win32App") => None, ++ _ => entry.filter(|entry| !entry.is_empty()), ++ }; ++ } ++ Event::Eof => return None, ++ _ => {} ++ } ++ } ++} ++ ++/// Downloads one framework package and lays its DLLs beside the title. ++/// ++/// Windows resolves a packaged title's frameworks through the package graph. An ++/// unpacked folder has no graph, and the loader searches the executable's own ++/// directory, so the framework's libraries go there. ++/// ++/// The catalogue names the product but not a package the Xbox Live content ++/// service serves, so the bytes come from the same Windows Update category the ++/// Store client would use, and they arrive as a plain zip rather than EAppx. ++async fn install_framework( ++ delivery: &reqwest::Client, ++ destination: &Path, ++ name: &str, ++ region: &str, ++) -> Result<(), String> { ++ // Framework products from Microsoft publish under this publisher hash; any ++ // other publisher cannot be located by family name alone. ++ let family = format!("{name}_8wekyb3d8bbwe"); ++ let lookup = format!( ++ "https://displaycatalog.mp.microsoft.com/v7.0/products/lookup?alternateId=PackageFamilyName&value={family}&market={region}&languages=en-US&fieldsTemplate=Details" ++ ); ++ let response = delivery ++ .get(lookup) ++ .timeout(Duration::from_secs(20)) ++ .send() ++ .await ++ .map_err(|_| "catalogue unreachable".to_string())?; ++ if !response.status().is_success() { ++ return Err(format!("catalogue answered {}", response.status().as_u16())); ++ } ++ let document: serde_json::Value = response.json().await.map_err(|_| "catalogue answer unreadable".to_string())?; ++ let category = framework_category(&document).ok_or_else(|| "no update category was listed".to_string())?; ++ ++ let published = crate::commands::store_delivery::resolve_frameworks(delivery, &category).await?; ++ if published.files.is_empty() { ++ return Err("the category listed no files".to_string()); ++ } ++ ++ let staging = destination.join(CONTAINER_DIR); ++ tokio::fs::create_dir_all(&staging).await.map_err(|error| format!("staging folder failed: {error}"))?; ++ let unpacked = destination.join(FRAMEWORK_DIR).join(name); ++ if let Some(parent) = unpacked.parent() { ++ tokio::fs::create_dir_all(parent).await.map_err(|error| format!("framework folder failed: {error}"))?; ++ } ++ let trial = staging.join("framework-trial"); ++ // The category lists one package per architecture under names that are only ++ // identifiers, so each is unpacked until one declares x64 in its manifest. ++ if unpacked.is_dir() { ++ withdraw_libraries(&unpacked, destination); ++ } ++ let mut reasons: Vec = Vec::new(); ++ for file in published.files.iter().take(8) { ++ let Some(file_name) = Path::new(&file.name).file_name() else { continue }; ++ let container = staging.join(file_name); ++ let response = match delivery.get(&file.url).send().await { ++ Ok(response) if response.status().is_success() => response, ++ Ok(response) => { ++ reasons.push(format!("file refused with {}", response.status().as_u16())); ++ continue; ++ } ++ Err(_) => { ++ reasons.push("file unreachable".to_string()); ++ continue; ++ } ++ }; ++ let written = tokio::fs::File::create(&container) ++ .await ++ .map_err(|error| format!("download write failed: {error}"))?; ++ let mut written = written; ++ let mut stream = response.bytes_stream(); ++ let mut failed = None; ++ while let Some(chunk) = stream.next().await { ++ match chunk { ++ Ok(chunk) => { ++ if let Err(error) = written.write_all(&chunk).await { ++ failed = Some(format!("download write failed: {error}")); ++ break; ++ } ++ } ++ Err(_) => { ++ failed = Some("download interrupted".to_string()); ++ break; ++ } ++ } ++ } ++ written.flush().await.ok(); ++ drop(written); ++ if let Some(error) = failed { ++ tokio::fs::remove_file(&container).await.ok(); ++ reasons.push(error); ++ continue; ++ } ++ ++ let attempt = trial.join("a"); ++ tokio::fs::remove_dir_all(&attempt).await.ok(); ++ let unpacked_ok = crate::commands::unzip::extract(&container, &attempt); ++ tokio::fs::remove_file(&container).await.ok(); ++ if let Err(error) = unpacked_ok { ++ reasons.push(plain(&error)); ++ continue; ++ } ++ let Some(chosen) = x64_package(&attempt) else { ++ reasons.push("not x64".to_string()); ++ continue; ++ }; ++ tokio::fs::remove_dir_all(&unpacked).await.ok(); ++ tokio::fs::rename(&chosen, &unpacked).await.map_err(|error| format!("framework move failed: {error}"))?; ++ copy_libraries(&unpacked, destination)?; ++ std::fs::write(unpacked.join(INSTALLED), name.as_bytes()).map_err(|error| format!("framework mark failed: {error}"))?; ++ tokio::fs::remove_dir_all(&trial).await.ok(); ++ return Ok(()); ++ } ++ tokio::fs::remove_dir_all(&trial).await.ok(); ++ Err(plain(&format!("no x64 package among {} listed {}", published.files.len(), reasons.join(" ")))) ++} ++ ++/// The folder holding the package that declares x64, however deep a bundle wraps it. ++fn x64_package(root: &Path) -> Option { ++ let mut level = vec![root.to_path_buf()]; ++ for _ in 0..3 { ++ let mut next = Vec::new(); ++ for folder in level { ++ let manifest = folder.join(LEGACY_MANIFEST); ++ if manifest.is_file() { ++ let text = std::fs::read_to_string(&manifest).unwrap_or_default().to_ascii_lowercase(); ++ if text.contains("processorarchitecture=\"x64\"") { ++ return Some(folder); ++ } ++ } ++ if let Ok(entries) = std::fs::read_dir(&folder) { ++ next.extend(entries.filter_map(Result::ok).map(|entry| entry.path()).filter(|path| path.is_dir())); ++ } ++ } ++ if next.is_empty() { ++ break; ++ } ++ level = next; ++ } ++ None ++} ++ ++/// The Windows Update category of the framework's x64 package, or of whichever ++/// package the product lists first when no package names an architecture. ++fn framework_category(document: &serde_json::Value) -> Option { ++ let mut fallback: Option = None; ++ for product in document["Products"].as_array()? { ++ for sku in product["DisplaySkuAvailabilities"].as_array().into_iter().flatten() { ++ for package in sku["Sku"]["Properties"]["Packages"].as_array().into_iter().flatten() { ++ let Some(category) = package["FulfillmentData"]["WuCategoryId"].as_str() else { continue }; ++ if category.is_empty() { ++ continue; ++ } ++ let x64 = package["Architectures"] ++ .as_array() ++ .into_iter() ++ .flatten() ++ .any(|arch| arch.as_str() == Some("x64")); ++ if x64 { ++ return Some(category.to_string()); ++ } ++ fallback.get_or_insert_with(|| category.to_string()); ++ } ++ } ++ } ++ fallback ++} ++ ++/// Removes the libraries an earlier attempt copied, so a replaced framework does ++/// not leave the old architecture's files beside the title. ++/// ++/// Only names this code recorded as copied are removed. A title can ship a DLL of ++/// the same name, and `copy_libraries` leaves such a file alone; deleting by ++/// basename would then remove the title's own library. ++fn withdraw_libraries(from: &Path, to: &Path) { ++ let Ok(list) = std::fs::read_to_string(from.join(COPIED)) else { return }; ++ for name in list.lines().filter(|line| !line.trim().is_empty()) { ++ if Path::new(name).components().count() != 1 { ++ continue; ++ } ++ let _ = std::fs::remove_file(to.join(name)); ++ } ++} ++ ++/// Copies the framework's libraries next to the title, never over its own files, ++/// and records what it copied so a later attempt can take exactly that back. ++fn copy_libraries(from: &Path, to: &Path) -> Result<(), String> { ++ let mut copied: Vec = Vec::new(); ++ copy_libraries_into(from, to, &mut copied)?; ++ std::fs::write(from.join(COPIED), copied.join("\n")).map_err(|error| format!("framework copy list failed: {error}"))?; ++ Ok(()) ++} ++ ++fn copy_libraries_into(from: &Path, to: &Path, copied: &mut Vec) -> Result<(), String> { ++ let entries = std::fs::read_dir(from).map_err(|error| format!("framework read failed: {error}"))?; ++ for entry in entries.filter_map(Result::ok) { ++ let path = entry.path(); ++ if path.is_dir() { ++ copy_libraries_into(&path, to, copied)?; ++ continue; ++ } ++ let named = path.extension().is_some_and(|extension| extension.eq_ignore_ascii_case("dll")); ++ if !named { ++ continue; ++ } ++ let Some(file_name) = path.file_name() else { continue }; ++ let target = to.join(file_name); ++ if target.exists() { ++ continue; ++ } ++ std::fs::copy(&path, &target).map_err(|error| format!("framework copy failed: {error}"))?; ++ copied.push(file_name.to_string_lossy().into_owned()); ++ } ++ Ok(()) ++} ++ ++fn has_manifest(folder: &Path) -> bool { std::fs::read_dir(folder).is_ok_and(|entries| { ++ entries.filter_map(Result::ok).any(|entry| { ++ let name = entry.file_name(); ++ let named = name.eq_ignore_ascii_case(MANIFEST) || name.eq_ignore_ascii_case(LEGACY_MANIFEST); ++ named && entry.file_type().is_ok_and(|kind| kind.is_file()) ++ }) ++ }) ++} ++ ++/// Lifts the contents of a single nested package directory to the game folder. ++/// Add-on content is stored without a manifest, so nothing to lift is not an ++/// error; anything other than exactly one candidate is, because a wrong guess ++/// here would move game files. ++/// ++/// An install over a folder that already holds a manifest is an update: the new ++/// package is lifted over the old one file by file, since leaving it nested would ++/// report success while the previous version stayed in place. ++fn hoist(destination: &Path) -> Result<(), String> { ++ let updating = has_manifest(destination); ++ let mut candidates = nested_packages(destination); ++ if candidates.is_empty() { ++ return Ok(()); ++ } ++ if candidates.len() != 1 { ++ return Err(format!( ++ "Extraction left {} package folders; expected exactly one", ++ candidates.len() ++ )); ++ } ++ let inner = candidates.remove(0); ++ for entry in std::fs::read_dir(&inner) ++ .map_err(|error| format!("Could not list the package folder: {error}"))? ++ .filter_map(Result::ok) ++ { ++ let target = destination.join(entry.file_name()); ++ if target.exists() { ++ if !updating { ++ return Err(format!("Extraction would overwrite {}", target.display())); ++ } ++ let replaced = if target.is_dir() { ++ std::fs::remove_dir_all(&target) ++ } else { ++ std::fs::remove_file(&target) ++ }; ++ replaced.map_err(|error| format!("Could not replace an installed file: {error}"))?; ++ } ++ std::fs::rename(entry.path(), &target) ++ .map_err(|error| format!("Could not move an extracted file: {error}"))?; ++ } ++ std::fs::remove_dir(&inner).map_err(|error| format!("Could not remove the package folder: {error}"))?; ++ Ok(()) ++} ++ ++/// Folders below [root] that carry a manifest, at the depth a nested bundle can ++/// write one. A bundle of a bundle is the deepest the extractor produces. ++fn nested_packages(root: &Path) -> Vec { ++ let mut found = Vec::new(); ++ let mut level = vec![root.to_path_buf()]; ++ for _ in 0..3 { ++ let mut next = Vec::new(); ++ for folder in level { ++ let Ok(entries) = std::fs::read_dir(&folder) else { continue }; ++ for entry in entries.filter_map(Result::ok) { ++ let path = entry.path(); ++ if !path.is_dir() || path.ends_with(CONTAINER_DIR) || path.ends_with(KEYS_DIR) || path.ends_with(FRAMEWORK_DIR) { ++ continue; ++ } ++ if has_manifest(&path) { ++ found.push(path); ++ } else { ++ next.push(path); ++ } ++ } ++ } ++ if next.is_empty() { ++ break; ++ } ++ level = next; ++ } ++ found ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ fn scratch(name: &str) -> PathBuf { ++ let path = std::env::temp_dir().join(format!("xodus-legacy-{name}-{}", std::process::id())); ++ let _ = std::fs::remove_dir_all(&path); ++ std::fs::create_dir_all(&path).unwrap(); ++ path ++ } ++ ++ #[test] ++ fn only_eappx_containers_are_treated_as_legacy() { ++ for name in ["a.eappx", "A.EAPPX", "game.eappxbundle", "Game.EAppxBundle"] { ++ assert!(is_legacy_name(name), "{name} should be legacy"); ++ } ++ for name in ["game.msixvc", "game.appx", "game.zip", "eappx", "notes.txt"] { ++ assert!(!is_legacy_name(name), "{name} should not be legacy"); ++ } ++ } ++ ++ #[test] ++ fn free_bytes_reads_the_available_column() { ++ let root = scratch("free"); ++ let free = free_bytes(&root).expect("df should answer for an existing folder"); ++ assert!(free > 0, "a writable filesystem reports some free space"); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_lifts_a_lone_bundle_member_to_the_game_folder() { ++ let root = scratch("hoist"); ++ let inner = root.join("Microsoft.SunriseBaseGame"); ++ std::fs::create_dir_all(&inner).unwrap(); ++ std::fs::write(inner.join(MANIFEST), "").unwrap(); ++ std::fs::write(inner.join("ForzaHorizon4.exe"), b"MZ").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join(MANIFEST).is_file()); ++ assert!(root.join("ForzaHorizon4.exe").is_file()); ++ assert!(!inner.exists()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_lifts_a_legacy_package_folder_too() { ++ let root = scratch("legacy-hoist"); ++ let inner = root.join("Microsoft.SunriseBaseGame_2023.1122.1704.2_x64__8wekyb3d8bbwe"); ++ std::fs::create_dir_all(&inner).unwrap(); ++ std::fs::write(inner.join(LEGACY_MANIFEST), "").unwrap(); ++ std::fs::write(inner.join("ForzaHorizon4.exe"), b"MZ").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join(LEGACY_MANIFEST).is_file()); ++ assert!(root.join("ForzaHorizon4.exe").is_file()); ++ assert!(!inner.exists()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_leaves_a_folder_that_already_has_the_manifest_alone() { ++ let root = scratch("flat"); ++ std::fs::write(root.join(MANIFEST), "").unwrap(); ++ std::fs::create_dir_all(root.join("Content")).unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join("Content").is_dir()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_replaces_the_previous_install_when_the_manifest_is_already_there() { ++ let root = scratch("update"); ++ std::fs::write(root.join(LEGACY_MANIFEST), "").unwrap(); ++ std::fs::write(root.join("ForzaHorizon4.exe"), b"old").unwrap(); ++ let inner = root.join("Microsoft.SunriseBaseGame"); ++ std::fs::create_dir_all(root.join("Content")).unwrap(); ++ std::fs::create_dir_all(inner.join("Content")).unwrap(); ++ std::fs::write(inner.join(LEGACY_MANIFEST), "").unwrap(); ++ std::fs::write(inner.join("ForzaHorizon4.exe"), b"new").unwrap(); ++ std::fs::write(inner.join("Content").join("pack.bin"), b"data").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert_eq!(std::fs::read(root.join("ForzaHorizon4.exe")).unwrap(), b"new"); ++ assert!(root.join("Content").join("pack.bin").is_file()); ++ assert!(!inner.exists()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_finds_a_manifest_inside_a_nested_bundle() { ++ let root = scratch("deep"); ++ let inner = root.join("bundle").join("Microsoft.SunriseBaseGame"); ++ std::fs::create_dir_all(&inner).unwrap(); ++ std::fs::write(inner.join(LEGACY_MANIFEST), "").unwrap(); ++ std::fs::write(inner.join("ForzaHorizon4.exe"), b"MZ").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join(LEGACY_MANIFEST).is_file()); ++ assert!(root.join("ForzaHorizon4.exe").is_file()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn withdrawing_a_framework_keeps_a_dll_it_never_copied() { ++ let root = scratch("withdraw"); ++ let framework = root.join("framework"); ++ std::fs::create_dir_all(&framework).unwrap(); ++ std::fs::write(framework.join("vcruntime140.dll"), b"framework").unwrap(); ++ std::fs::write(framework.join("title-only.dll"), b"framework").unwrap(); ++ std::fs::write(root.join("title-only.dll"), b"title").unwrap(); ++ ++ std::fs::write(framework.join(COPIED), "vcruntime140.dll").unwrap(); ++ withdraw_libraries(&framework, &root); ++ ++ assert!(!root.join("vcruntime140.dll").exists()); ++ assert_eq!(std::fs::read(root.join("title-only.dll")).unwrap(), b"title"); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn hoist_refuses_to_guess_between_two_package_folders() { ++ let root = scratch("ambiguous"); ++ for name in ["one", "two"] { ++ let inner = root.join(name); ++ std::fs::create_dir_all(&inner).unwrap(); ++ std::fs::write(inner.join(MANIFEST), "").unwrap(); ++ } ++ ++ assert!(hoist(&root).is_err()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn entry_point_separates_a_uwp_application_from_a_packaged_desktop_one() { ++ let root = scratch("entry"); ++ std::fs::write( ++ root.join(LEGACY_MANIFEST), ++ r#""#, ++ ) ++ .unwrap(); ++ assert_eq!(entry_point(&root).as_deref(), Some("Windows.FullTrustApplication")); ++ ++ std::fs::write( ++ root.join(LEGACY_MANIFEST), ++ r#""#, ++ ) ++ .unwrap(); ++ assert_eq!(entry_point(&root).as_deref(), Some("Forza.App")); ++ assert_eq!(application_entry("").as_deref(), Some("Forza.App")); ++ assert_eq!(application_entry(r#""#).as_deref(), Some("windowsApp")); ++ assert_eq!(application_entry(r#""#), None); ++ assert_eq!(application_entry(r#""#), None); ++ assert_eq!(application_entry(r#""#).as_deref(), Some("windowsApp")); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn download_staging_folders_are_never_hoisted() { ++ let root = scratch("staging"); ++ std::fs::create_dir_all(root.join(CONTAINER_DIR)).unwrap(); ++ std::fs::write(root.join(CONTAINER_DIR).join(MANIFEST), "").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join(CONTAINER_DIR).join(MANIFEST).is_file()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++ ++ #[test] ++ fn add_on_content_without_a_manifest_is_left_in_place() { ++ let root = scratch("content"); ++ std::fs::create_dir_all(root.join("Content")).unwrap(); ++ std::fs::write(root.join("Content").join("pack.bin"), b"data").unwrap(); ++ ++ hoist(&root).unwrap(); ++ ++ assert!(root.join("Content").join("pack.bin").is_file()); ++ std::fs::remove_dir_all(&root).ok(); ++ } ++} +diff --git a/crates/xodus-cli/src/commands/license.rs b/crates/xodus-cli/src/commands/license.rs +index b9fd91c..fbae301 100644 +--- a/crates/xodus-cli/src/commands/license.rs ++++ b/crates/xodus-cli/src/commands/license.rs +@@ -1,8 +1,6 @@ + use std::process::ExitCode; + + use base64::{Engine, engine::general_purpose::STANDARD}; +-use tokio::fs::OpenOptions; +-use tokio::io::AsyncWriteExt; + use xodus::tokens::TokenManager; + + use crate::license::get_license; +@@ -14,45 +12,47 @@ pub async fn run( + market: String, + ciks: String, + ) -> ExitCode { +- let license = get_license(client, tokens, content_id, market, None, false).await; +- if let Err(err) = license { +- eprintln!("{}", err); +- return ExitCode::FAILURE; ++ match dump(client, tokens, content_id, market, ciks).await { ++ Ok(()) => ExitCode::SUCCESS, ++ Err(err) => { ++ eprintln!("{}", err); ++ ExitCode::FAILURE ++ } + } ++} + +- let (key, game_splicense) = license.unwrap(); +- tokio::fs::create_dir_all(&ciks).await.unwrap(); ++/// Writes the content keys of `content_id` to `ciks`, or returns why Microsoft refused them. ++pub async fn dump( ++ client: &reqwest::Client, ++ tokens: &TokenManager, ++ content_id: String, ++ market: String, ++ ciks: String, ++) -> Result<(), String> { ++ let (key, game_splicense) = get_license(client, tokens, content_id, market, None, false).await?; ++ let unwritten = |error: std::io::Error| format!("The license was granted, but its content keys could not be written: {error}"); ++ tokio::fs::create_dir_all(&ciks).await.map_err(unwritten)?; + // eappx-rs reads a text [Keys] file with base64 Key IDs, while the .cik + // format below is the binary form other tools expect. Write both so the + // same license dump serves either extractor. +- let mut eappx_keys = String::from("[Keys]\n"); ++ let mut eappx_keys = String::from("[Keys] ++"); + for (uuid, content_key) in game_splicense.content_keys { +- let unpacked = content_key.unpack(&key).expect("failed to unpack"); +- let mut file = OpenOptions::new() +- .create(true) +- .write(true) +- .open(format!("{ciks}/{uuid}.cik")) +- .await +- .unwrap(); ++ let unpacked = content_key ++ .unpack(&key) ++ .map_err(|_| "The content key could not be authenticated. Retry the installation or sign in again.".to_string())?; + let uuid_buf = uuid.to_bytes_le(); +- file.write_all(&uuid_buf).await.unwrap(); +- file.write_all(&*unpacked).await.unwrap(); +- file.flush().await.unwrap(); ++ let mut cik = uuid_buf.to_vec(); ++ cik.extend_from_slice(&*unpacked); ++ tokio::fs::write(format!("{ciks}/{uuid}.cik"), cik).await.map_err(unwritten)?; + eappx_keys.push_str(&format!( +- "\"{}\" \"{}\"\n", ++ "\"{}\" \"{}\" ++", + STANDARD.encode(uuid_buf), + STANDARD.encode(&*unpacked), + )); + } +- let mut keys_file = OpenOptions::new() +- .create(true) +- .write(true) +- .truncate(true) +- .open(format!("{ciks}/eappx-keys.txt")) +- .await +- .unwrap(); +- keys_file.write_all(eappx_keys.as_bytes()).await.unwrap(); +- keys_file.flush().await.unwrap(); ++ tokio::fs::write(format!("{ciks}/eappx-keys.txt"), eappx_keys).await.map_err(unwritten)?; + +- ExitCode::SUCCESS ++ Ok(()) + } +diff --git a/crates/xodus-cli/src/commands/store_delivery.rs b/crates/xodus-cli/src/commands/store_delivery.rs +new file mode 100644 +index 0000000..7fec6e5 +--- /dev/null ++++ b/crates/xodus-cli/src/commands/store_delivery.rs +@@ -0,0 +1,577 @@ ++//! Windows Update delivery for Store packages. ++//! ++//! The Xbox content service (`GetBasePackage`) serves MSIXVC titles but answers a ++//! legacy desktop bundle with `PackageFound: true` and an empty file list, on every ++//! request shape. Measured on Forza Horizon 4: its EAppxBundle (85.2 GB) is never ++//! served that way, while the same product's console XVC is served normally as ++//! `.xsp` chunks. ++//! ++//! Those bytes are delivered through Windows Update instead, which is what the ++//! Store client itself uses for legacy packages and which needs no Xbox Live auth. ++//! Three SOAP calls do it: an anonymous cookie, a sync scoped to the product's ++//! `WuCategoryId`, then a signed URL for each file whose digest matches. ++//! ++//! Two details cost time to learn and are relied on below: ++//! * the update fragments inside `` are escaped twice, so they have to be ++//! decoded twice before they contain any tags; ++//! * a file's content digest, not its id, is what ties it to a return URL. ++ ++use std::time::Duration; ++ ++/// The service the Store client talks to. `fe3cr` and `fe3` are both live. ++const BASE: &str = "https://fe3cr.delivery.mp.microsoft.com/ClientWebService/client.asmx"; ++const SECURED: &str = "https://fe3cr.delivery.mp.microsoft.com/ClientWebService/client.asmx/secured"; ++const NAMESPACE: &str = "http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService"; ++const AGENT: &str = "Windows-Update-Agent/10.0.10011.16384 Client-Protocol/2.1"; ++ ++/// The update service is issued from Microsoft's Windows Update PKI, whose root is ++/// distributed by Windows Update itself rather than by Mozilla, so neither this ++/// device's bundle nor a normal Linux install trusts it and every handshake ends ++/// with "unable to get local issuer certificate". Only the roots those hosts chain ++/// to are added, on a client used for this path alone. ++/// ++/// `wu-root.pem` is Microsoft ECC Product Root Certificate Authority 2018, fetched ++/// from the issuer URL in the server's own authority-information extension ++/// (`www.microsoft.com/pkiops/certs/...`). Its serial 14982666DC7CCD8F4053677BB999EC85 ++/// and SHA-1 06F1AA330B927B753A40E68CDF22E34BCBEF3352 match the copy Windows ships ++/// in its own root store, and 2043-02-27 20:50:46 GMT is its expiry. ++const UPDATE_ROOT: &str = include_str!("wu-root.pem"); ++ ++/// A client for the update service and its download hosts: the system trust store ++/// plus the one root above. ++pub fn client() -> Result { ++ let root = reqwest::Certificate::from_pem(UPDATE_ROOT.as_bytes()) ++ .map_err(|error| format!("the pinned update root could not be read: {error}"))?; ++ reqwest::Client::builder() ++ .user_agent(AGENT) ++ .add_root_certificate(root) ++ .build() ++ .map_err(|error| format!("the update client could not be created: {error}")) ++} ++ ++/// Timestamps are not validated by the service, so fixed values keep this free of ++/// a date dependency, as the working reference implementations do. ++const CREATED: &str = "2017-08-05T02:03:05.038Z"; ++const EXPIRES: &str = "2044-08-02T20:09:03Z"; ++ ++/// The device reports itself as a retail Windows desktop: the catalogue serves the ++/// desktop package for this shape, and `App=WU_STORE` is what exposes app categories. ++const ATTRIBUTES: &str = concat!( ++ "BranchReadinessLevel=CB;CurrentBranch=;OEMModel=Virtual Machine;FlightRing=Retail;", ++ "AttrDataVer=21;SystemManufacturer=Microsoft Corporation;InstallLanguage=en-US;", ++ "OSUILocale=en-US;InstallationType=Client;FlightingBranchName=;", ++ "FirmwareVersion=Hyper-V UEFI Release v2.5;SystemProductName=Virtual Machine;OSSkuId=48;", ++ "FlightContent=Mainline;App=WU_STORE;OEMName_Uncleaned=Microsoft Corporation;", ++ "AppVer=0.0.0.0;OSArchitecture=AMD64;SystemSKU=None;UpdateManagementGroup=2;", ++ "IsFlightingEnabled=0;IsDeviceRetailDemo=0;TelemetryLevel=3;OSVersion=10.0.22621.1;", ++ "DeviceFamily=Windows.Desktop;" ++); ++ ++/// Baseline category ids a Windows client always claims to have installed. The ++/// service silently expects them; without them the sync returns no metadata. ++const BASELINE: &[u32] = &[ ++ 1, 2, 3, 10, 11, 17, 19, 2359974, 2359977, 5143990, 5169043, 5169044, 5169047, 8788830, 8806526, ++ 9125350, 9154769, 10809856, 23110993, 23110994, 23110995, 23110996, 23110999, 23111000, ++ 23111001, 23111002, 23111003, 23111004, 24513870, 28880263, 30077688, 30486944, 59830006, ++ 59830007, 59830008, 60484010, 62450018, 62450019, 62450020, 98959022, 98959023, 98959024, ++ 98959025, 98959026, 105939029, 105995585, 106017178, 107825194, 117765322, 129905029, ++ 130040030, 130040031, 130040032, 130040033, 133399034, 138372035, 138372036, 139536037, ++ 139536038, 139536039, 139536040, 142045136, 158941041, 158941042, 158941043, 158941044, ++ 159776047, 160733048, 160733049, 160733050, 160733051, 160733055, 160733056, 161870057, ++ 161870058, 161870059, ++]; ++ ++/// One downloadable package file. ++pub struct DeliveryFile { ++ pub name: String, ++ pub url: String, ++ pub size: u64, ++} ++ ++/// A product's installable files, plus the content id its keys are licensed under. ++pub struct Delivery { ++ pub content_id: String, ++ pub files: Vec, ++} ++ ++fn unescape(text: &str) -> String { ++ // Fragments are escaped twice, so a single pass leaves `<Files>` behind. ++ let mut current = text.to_string(); ++ for _ in 0..3 { ++ let next = current ++ .replace("<", "<") ++ .replace(">", ">") ++ .replace(""", "\"") ++ .replace("'", "'") ++ .replace("&", "&"); ++ if next == current { ++ break; ++ } ++ current = next; ++ } ++ current ++} ++ ++fn element(text: &str, tag: &str) -> Option { ++ let open = format!("<{tag}>"); ++ let close = format!(""); ++ let start = text.find(&open)? + open.len(); ++ let end = start + text[start..].find(&close)?; ++ Some(text[start..end].to_string()) ++} ++ ++fn blocks(text: &str, tag: &str) -> Vec { ++ let open = format!("<{tag}>"); ++ let close = format!(""); ++ let mut found = Vec::new(); ++ let mut rest = text; ++ while let Some(start) = rest.find(&open) { ++ let after = start + open.len(); ++ let Some(length) = rest[after..].find(&close) else { break }; ++ found.push(rest[after..after + length].to_string()); ++ rest = &rest[after + length + close.len()..]; ++ } ++ found ++} ++ ++fn attribute(text: &str, name: &str) -> Option { ++ let needle = format!("{name}=\""); ++ let start = text.find(&needle)? + needle.len(); ++ let end = start + text[start..].find('"')?; ++ Some(text[start..end].to_string()) ++} ++ ++async fn soap(client: &reqwest::Client, url: &str, body: &str) -> Result { ++ let response = client ++ .post(url) ++ .header("Content-Type", "application/soap+xml; charset=utf-8") ++ .header("User-Agent", AGENT) ++ .timeout(Duration::from_secs(60)) ++ .body(body.to_string()) ++ .send() ++ .await ++ .map_err(|error| format!("update service unreachable: {error}"))?; ++ if !response.status().is_success() { ++ return Err(format!("update service returned HTTP {}", response.status().as_u16())); ++ } ++ let text = response.text().await.map_err(|_| "update service reply unreadable".to_string())?; ++ Ok(unescape(&text)) ++} ++ ++fn envelope(action: &str, to: &str, body: &str) -> String { ++ format!( ++ r#"http://www.microsoft.com/SoftwareDistribution/Server/ClientWebService/{action}urn:uuid:{message}{to}{CREATED}{EXPIRES}{body}"#, ++ action = action, ++ to = to, ++ message = uuid::Uuid::new_v4(), ++ body = body, ++ ) ++} ++ ++/// Reads the `WuCategoryId` the catalogue carries for the product's packages. ++async fn category(client: &reqwest::Client, product: &str, market: &str) -> Result { ++ let url = format!( ++ "https://displaycatalog.mp.microsoft.com/v7.0/products/{product}?market={market}&languages=en,neutral" ++ ); ++ let text = client ++ .get(url) ++ .timeout(Duration::from_secs(30)) ++ .send() ++ .await ++ .map_err(|_| "Store metadata request failed".to_string())? ++ .text() ++ .await ++ .map_err(|_| "Store metadata reply unreadable".to_string())?; ++ let start = text ++ .find("\"WuCategoryId\":\"") ++ .ok_or("This product has no Windows Update category, so it has no legacy package")?; ++ let rest = &text[start + "\"WuCategoryId\":\"".len()..]; ++ let end = rest.find('"').ok_or("Unreadable Windows Update category")?; ++ Ok(rest[..end].to_string()) ++} ++ ++async fn cookie(client: &reqwest::Client) -> Result<(String, String), String> { ++ let body = format!( ++ r#"2016-07-27T07:18:09Z2015-10-21T17:01:07.1472913Z{CREATED}2.50"# ++ ); ++ let reply = soap(client, BASE, &envelope("GetCookie", BASE, &body)).await?; ++ let encrypted = element(&reply, "EncryptedData").ok_or("Update service issued no session cookie")?; ++ let expiration = element(&reply, "Expiration").unwrap_or_else(|| EXPIRES.to_string()); ++ Ok((encrypted, expiration)) ++} ++ ++struct Revision { ++ update_id: String, ++ revision: String, ++ digest: String, ++ name: String, ++ size: u64, ++ moniker: String, ++ content_id: String, ++} ++ ++fn package_identity(moniker: &str) -> Option<((String, String), Vec)> { ++ let mut parts = moniker.split('_'); ++ let name = parts.next()?.to_ascii_lowercase(); ++ let version = parts.next()?.split('.').map(|part| part.parse::().ok()).collect::>>()?; ++ let arch = parts.next()?.to_ascii_lowercase(); ++ if name.is_empty() { ++ return None; ++ } ++ Some(((name, arch), version)) ++} ++ ++fn newest_builds(revisions: Vec) -> Vec { ++ let desktop: std::collections::HashSet = revisions ++ .iter() ++ .filter_map(|revision| package_identity(&revision.moniker)) ++ .filter(|((_, arch), _)| arch == "x64" || arch == "neutral") ++ .map(|((name, _), _)| name) ++ .collect(); ++ let mut newest: std::collections::HashMap<(String, String), Vec> = std::collections::HashMap::new(); ++ for revision in &revisions { ++ if let Some((key, version)) = package_identity(&revision.moniker) { ++ let entry = newest.entry(key).or_default(); ++ if version > *entry { ++ *entry = version; ++ } ++ } ++ } ++ let mut seen = std::collections::HashSet::new(); ++ revisions ++ .into_iter() ++ .filter(|revision| match package_identity(&revision.moniker) { ++ Some((key, version)) => { ++ newest.get(&key) == Some(&version) ++ && (!desktop.contains(&key.0) || key.1 == "x64" || key.1 == "neutral") ++ } ++ None => true, ++ }) ++ .filter(|revision| seen.insert(revision.name.to_ascii_lowercase())) ++ .collect() ++} ++ ++/// One packager per file: the revision identity and the digest are what the ++/// download URL is issued against. ++async fn revisions( ++ client: &reqwest::Client, ++ cookie: &str, ++ expiration: &str, ++ content_id: &str, ++ wanted: fn(&str) -> bool, ++) -> Result<(Vec, String), String> { ++ let baseline: String = BASELINE.iter().map(|id| format!("{id}")).collect(); ++ let body = format!( ++ r#"{expiration}{cookie}false{baseline}falsetrue{content_id}truefalseExtendeden-USenen-USfalse{ATTRIBUTES}Interactive=1;IsSeeker=0;"# ++ ); ++ let reply = soap(client, BASE, &envelope("SyncUpdates", BASE, &body)).await?; ++ ++ let core = blocks(&reply, "UpdateInfo"); ++ let extended = blocks(&reply, "ExtendedUpdateInfo"); ++ let Some(extended) = extended.first() else { ++ return Err("Update service returned no package metadata for this category".into()); ++ }; ++ let mut core_by_id: Vec<(String, String)> = Vec::new(); ++ for entries in &core { ++ if let (Some(id), Some(xml)) = (element(entries, "ID"), element(entries, "Xml")) { ++ core_by_id.push((id, xml)); ++ } ++ } ++ ++ let mut found = Vec::new(); ++ let mut package_content_id = String::new(); ++ for entries in blocks(extended, "Update") { ++ let (Some(id), Some(xml)) = (element(&entries, "ID"), element(&entries, "Xml")) else { continue }; ++ // The file list lives in one fragment and the identity the URL is issued ++ // against in the other, so both are needed for the same revision. ++ let Some((_, core_xml)) = core_by_id.iter().find(|(key, _)| *key == id) else { continue }; ++ let combined = format!("{xml}{core_xml}"); ++ if !combined.contains("` node. ++fn file_attributes(text: &str) -> Vec { ++ let mut found = Vec::new(); ++ let mut rest = text; ++ while let Some(start) = rest.find("') else { break }; ++ found.push(after[..end].trim_end_matches('/').to_string()); ++ rest = &after[end..]; ++ } ++ found ++} ++ ++async fn download_url( ++ client: &reqwest::Client, ++ cookie: &str, ++ expiration: &str, ++ revision: &Revision, ++) -> Result { ++ let body = format!( ++ r#"{expiration}{cookie}{update}{number}FileUrlFileDecryption{ATTRIBUTES}"#, ++ update = revision.update_id, ++ number = revision.revision ++ ); ++ let reply = soap(client, SECURED, &envelope("GetExtendedUpdateInfo2", SECURED, &body)).await?; ++ for location in blocks(&reply, "FileLocation") { ++ if element(&location, "FileDigest").as_deref() != Some(revision.digest.as_str()) { ++ continue; ++ } ++ if let Some(url) = element(&location, "Url") { ++ return Ok(url); ++ } ++ } ++ Err(format!("No download location was issued for {}", revision.name)) ++} ++ ++/// Resolves the legacy packages of a Store product through Windows Update. ++pub async fn resolve( ++ client: &reqwest::Client, ++ product: &str, ++ market: &str, ++) -> Result { ++ let category = category(client, product, market).await?; ++ resolve_category(client, &category).await ++} ++ ++/// Every build of a Store product Windows Update lists, newest first. Each build ++/// has its own content id, and Microsoft can refuse keys for one but not another. ++pub struct Builds { ++ cookie: String, ++ expiration: String, ++ category: String, ++ groups: Vec>, ++} ++ ++impl Builds { ++ pub fn len(&self) -> usize { ++ self.groups.len() ++ } ++ ++ pub fn content_id(&self, index: usize) -> String { ++ self.groups[index] ++ .first() ++ .map(|revision| revision.content_id.clone()) ++ .filter(|id| !id.is_empty()) ++ .unwrap_or_else(|| self.category.clone()) ++ } ++ ++ /// Download locations for one build, asked for only when that build is used. ++ pub async fn locate(&self, client: &reqwest::Client, index: usize) -> Result, String> { ++ let mut files = Vec::new(); ++ for revision in &self.groups[index] { ++ let url = download_url(client, &self.cookie, &self.expiration, revision).await?; ++ files.push(DeliveryFile { name: revision.name.clone(), url, size: revision.size }); ++ } ++ Ok(files) ++ } ++} ++ ++pub async fn resolve_builds(client: &reqwest::Client, product: &str, market: &str) -> Result { ++ let category = category(client, product, market).await?; ++ let (cookie, expiration) = cookie(client).await?; ++ let (found, _) = revisions(client, &cookie, &expiration, &category, title_container).await?; ++ let groups = builds_newest_first(found); ++ if groups.is_empty() { ++ return Err("Windows Update lists no package files for this product".into()); ++ } ++ Ok(Builds { cookie, expiration, category, groups }) ++} ++ ++fn title_container(name: &str) -> bool { ++ let lower = name.to_ascii_lowercase(); ++ lower.ends_with(".eappx") || lower.ends_with(".eappxbundle") ++} ++ ++fn builds_newest_first(revisions: Vec) -> Vec> { ++ let mut groups: Vec<(String, Vec)> = Vec::new(); ++ for revision in revisions { ++ match groups.iter_mut().find(|(id, _)| *id == revision.content_id) { ++ Some((_, group)) => group.push(revision), ++ None => groups.push((revision.content_id.clone(), vec![revision])), ++ } ++ } ++ let mut groups: Vec> = groups.into_iter().map(|(_, group)| newest_builds(group)).collect(); ++ let newest = |group: &Vec| { ++ group.iter().filter_map(|revision| package_identity(&revision.moniker)).map(|(_, version)| version).max() ++ }; ++ groups.sort_by(|a, b| newest(b).cmp(&newest(a))); ++ groups.into_iter().filter(|group| !group.is_empty()).collect() ++} ++ ++/// The packages a Windows Update category lists, in the containers a title is ++/// packed in. ++pub async fn resolve_category(client: &reqwest::Client, category: &str) -> Result { ++ resolve_wanted(client, category, true, |name| { ++ let lower = name.to_ascii_lowercase(); ++ lower.ends_with(".eappx") || lower.ends_with(".eappxbundle") ++ }) ++ .await ++} ++ ++/// The plain `.appx` packages a category lists, which is how a framework ships. ++pub async fn resolve_frameworks(client: &reqwest::Client, category: &str) -> Result { ++ resolve_wanted(client, category, false, |name| name.to_ascii_lowercase().ends_with(".appx")).await ++} ++ ++async fn resolve_wanted( ++ client: &reqwest::Client, ++ category: &str, ++ newest_only: bool, ++ wanted: fn(&str) -> bool, ++) -> Result { ++ let (cookie, expiration) = cookie(client).await?; ++ let (revisions, package_content_id) = revisions(client, &cookie, &expiration, category, wanted).await?; ++ let revisions = if newest_only { newest_builds(revisions) } else { revisions }; ++ if revisions.is_empty() { ++ return Err("Windows Update lists no package files for this product".into()); ++ } ++ let mut files = Vec::new(); ++ for revision in &revisions { ++ let url = download_url(client, &cookie, &expiration, revision).await?; ++ files.push(DeliveryFile { name: revision.name.clone(), url, size: revision.size }); ++ } ++ Ok(Delivery { ++ // A framework's revision carries no package content id, and only a title's ++ // keys are licensed, so the category stands in when none was named. ++ content_id: if package_content_id.is_empty() { ++ category.to_string() ++ } else { ++ package_content_id ++ }, ++ files, ++ }) ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ ++ #[test] ++ fn the_pinned_root_is_the_expected_microsoft_update_authority() { ++ // The PEM travels with the patch, so a swapped or truncated file must fail ++ // here rather than silently widening what the update client trusts. ++ assert_eq!(UPDATE_ROOT.matches("BEGIN CERTIFICATE").count(), 1); ++ let der = UPDATE_ROOT ++ .lines() ++ .filter(|line| !line.starts_with("-----")) ++ .collect::(); ++ use base64::{Engine, engine::general_purpose::STANDARD}; ++ let der = STANDARD.decode(der).expect("the pinned root is not valid base64"); ++ assert!(der.len() > 500 && der[0] == 0x30, "the pinned root is not a DER SEQUENCE"); ++ // Serial number and subject live verbatim in the DER for this certificate. ++ assert!(der.windows(4).any(|w| w == [0x14, 0x98, 0x26, 0x66]), "unexpected serial"); ++ let subject = b"Microsoft ECC Product Root Certificate Authority 2018"; ++ assert!( ++ der.windows(subject.len()).any(|window| window == subject), ++ "unexpected subject" ++ ); ++ assert!(client().is_ok()); ++ } ++ ++ fn build(name: &str, moniker: &str) -> Revision { ++ Revision { update_id: String::new(), revision: "1".into(), digest: String::new(), name: name.into(), size: 1, moniker: moniker.into(), content_id: String::new() } ++ } ++ ++ fn licensed(name: &str, moniker: &str, content_id: &str) -> Revision { ++ Revision { content_id: content_id.into(), ..build(name, moniker) } ++ } ++ ++ #[test] ++ fn each_build_is_offered_under_its_own_content_id_newest_first() { ++ let builds = builds_newest_first(vec![ ++ licensed("old.eappx", "Microsoft.MSEsper_1.3.25854.2_x64__8wekyb3d8bbwe", "old-id"), ++ licensed("new.eappx", "Microsoft.MSEsper_1.3.25854.70_x64__8wekyb3d8bbwe", "new-id"), ++ licensed("new-arm.eappx", "Microsoft.MSEsper_1.3.25854.70_arm64__8wekyb3d8bbwe", "new-id"), ++ ]); ++ let shape: Vec<(String, Vec)> = builds ++ .iter() ++ .map(|group| (group[0].content_id.clone(), group.iter().map(|r| r.name.clone()).collect())) ++ .collect(); ++ assert_eq!(shape, [("new-id".to_string(), vec!["new.eappx".to_string()]), ("old-id".to_string(), vec!["old.eappx".to_string()])]); ++ } ++ ++ #[test] ++ fn only_the_newest_desktop_build_of_each_package_is_kept() { ++ let kept = newest_builds(vec![ ++ build("old.eappx", "Microsoft.MSEsper_1.3.25854.2_x64__8wekyb3d8bbwe"), ++ build("new.eappx", "Microsoft.MSEsper_1.3.25854.70_x64__8wekyb3d8bbwe"), ++ build("arm.eappx", "Microsoft.MSEsper_1.3.25854.70_arm64__8wekyb3d8bbwe"), ++ build("bare.eappxbundle", ""), ++ build("NEW.eappx", "Microsoft.MSEsper_1.3.25854.70_x64__8wekyb3d8bbwe"), ++ ]); ++ let names: Vec<_> = kept.iter().map(|r| r.name.as_str()).collect(); ++ assert_eq!(names, ["new.eappx", "bare.eappxbundle"]); ++ assert_eq!(newest_builds(vec![build("x86.eappx", "Game_1.0.0.0_x86__p")]).len(), 1); ++ } ++ ++ #[test] ++ fn fragments_escaped_twice_are_decoded_until_stable() { ++ assert_eq!(unescape("&lt;Files&gt;"), ""); ++ assert_eq!(unescape("<File FileName="a.eappxbundle"/>"), ""); ++ assert_eq!(unescape("plain text"), "plain text"); ++ } ++ ++ #[test] ++ fn self_closing_file_nodes_yield_their_attributes() { ++ let text = r#""#; ++ let attributes = file_attributes(text); ++ assert_eq!(attributes.len(), 2); ++ assert_eq!(attribute(&attributes[0], "FileName").as_deref(), Some("x.eappxbundle")); ++ assert_eq!(attribute(&attributes[0], "Size").as_deref(), Some("99")); ++ assert_eq!(attribute(&attributes[1], "FileName").as_deref(), Some("Abm_1.cab")); ++ } ++ ++ #[test] ++ fn blocks_stop_at_the_matching_close_tag() { ++ let text = "12"; ++ let updates = blocks(text, "Update"); ++ assert_eq!(updates.len(), 2); ++ assert_eq!(element(&updates[1], "ID").as_deref(), Some("2")); ++ } ++ ++ #[test] ++ fn element_returns_none_when_absent() { ++ assert!(element("1", "B").is_none()); ++ assert_eq!(element("", "A").as_deref(), Some("")); ++ } ++} +diff --git a/crates/xodus-cli/src/commands/streaming.rs b/crates/xodus-cli/src/commands/streaming.rs +index a0136f8..8637cab 100644 +--- a/crates/xodus-cli/src/commands/streaming.rs ++++ b/crates/xodus-cli/src/commands/streaming.rs +@@ -9,7 +9,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; + use msixvc::streaming; + use msixvc::xvd::{SegmentFile, XvdFile}; + use tokio::fs::{File, OpenOptions}; +-use tokio::io::AsyncRead; ++use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt}; + use tokio::sync::mpsc::{Receiver, Sender}; + use uuid::Uuid; + use xodus::tokens::TokenManager; +@@ -354,6 +354,15 @@ where + Ok(file) => file, + Err(error) => { failure::report(&error); return ExitCode::FAILURE; } + }; ++ let mut magic = [0u8; 4]; ++ let plain = remote_file.read_exact(&mut magic).await.is_ok() && magic == [0x50, 0x4b, 0x03, 0x04]; ++ if let Err(error) = remote_file.seek(std::io::SeekFrom::Start(0)).await { ++ failure::report(&error); ++ return ExitCode::FAILURE; ++ } ++ if plain { ++ return plain_package(remote_file, l, out).await; ++ } + let remote_xvd = match XvdFile::parse(&mut remote_file).await { + Ok(xvd) => xvd, + Err(error) => { failure::report_metadata(error.as_ref()); return ExitCode::FAILURE; } +@@ -692,3 +701,337 @@ where + } + ExitCode::SUCCESS + } ++ ++const PLAIN_LIMIT: u64 = 1 << 30; ++ ++const PENDING: &str = ".pending"; ++ ++fn publish(staging: &Path, out: &Path) -> Result<(), String> { ++ let previous = out.join(".xodus-plain-previous"); ++ if previous.join(PENDING).exists() { ++ restore(&previous, out).map_err(|error| format!("an earlier replacement could not be undone: {error}"))?; ++ } else if previous.exists() && std::fs::remove_dir_all(&previous).is_err() { ++ let stale = out.join(format!(".xodus-plain-stale-{}", std::process::id())); ++ std::fs::rename(&previous, &stale).map_err(|error| format!("an earlier replacement left files behind: {error}"))?; ++ } ++ std::fs::create_dir_all(&previous).map_err(|error| format!("could not prepare the replacement: {error}"))?; ++ std::fs::write(previous.join(PENDING), b"").map_err(|error| format!("could not prepare the replacement: {error}"))?; ++ let mut names: Vec = std::fs::read_dir(staging) ++ .map_err(|error| format!("staged package unreadable: {error}"))? ++ .map(|entry| entry.map(|entry| entry.file_name())) ++ .collect::>() ++ .map_err(|error| format!("staged package unreadable: {error}"))?; ++ names.retain(|name| name != PENDING); ++ names.sort(); ++ let mut placed = Vec::new(); ++ let result = (|| { ++ for name in &names { ++ let target = out.join(name); ++ if std::fs::symlink_metadata(&target).is_ok() { ++ std::fs::rename(&target, previous.join(name)) ++ .map_err(|error| format!("could not replace {}: {error}", target.display()))?; ++ } ++ std::fs::rename(staging.join(name), &target) ++ .map_err(|error| format!("could not place {}: {error}", target.display()))?; ++ placed.push(name.clone()); ++ } ++ Ok::<(), String>(()) ++ })(); ++ match result { ++ Ok(()) => { ++ std::fs::remove_file(previous.join(PENDING)).ok(); ++ std::fs::remove_dir_all(&previous).ok(); ++ Ok(()) ++ } ++ Err(error) => { ++ let stuck: Vec = placed ++ .iter() ++ .filter(|name| remove(&out.join(name)).is_err()) ++ .map(|name| name.to_string_lossy().into_owned()) ++ .collect(); ++ if !stuck.is_empty() { ++ let listed = std::fs::write(previous.join(PENDING), stuck.join(" ++")); ++ let names = stuck.join(", "); ++ return Err(match listed { ++ Ok(()) => format!("{error}; {names} could not be removed, the previous files are kept in {}", previous.display()), ++ Err(write) => format!("{error}; {names} could not be removed and could not be recorded ({write})"), ++ }); ++ } ++ match restore(&previous, out) { ++ Ok(()) => Err(error), ++ Err(undo) => Err(format!("{error}; the previous files are kept in {} ({undo})", previous.display())), ++ } ++ } ++ } ++} ++ ++/// Moves every entry kept in `previous` back into `out`, then removes `previous`. ++/// On any failure `previous` stays, holding what has not been put back. ++fn restore(previous: &Path, out: &Path) -> Result<(), String> { ++ let placed = std::fs::read_to_string(previous.join(PENDING)).map_err(|error| error.to_string())?; ++ for name in placed.lines().filter(|name| !name.is_empty() && !name.contains(['/', '\\']) && *name != "." && *name != "..") { ++ let target = out.join(name); ++ if std::fs::symlink_metadata(&target).is_ok() { ++ remove(&target).map_err(|error| format!("could not clear {}: {error}", target.display()))?; ++ } ++ } ++ if !placed.is_empty() { ++ std::fs::write(previous.join(PENDING), b"").map_err(|error| error.to_string())?; ++ } ++ let entries = std::fs::read_dir(previous).map_err(|error| error.to_string())?; ++ for entry in entries { ++ let entry = entry.map_err(|error| error.to_string())?; ++ if entry.file_name() == PENDING { ++ continue; ++ } ++ let target = out.join(entry.file_name()); ++ if std::fs::symlink_metadata(&target).is_ok() { ++ remove(&target).map_err(|error| format!("could not clear {}: {error}", target.display()))?; ++ } ++ std::fs::rename(entry.path(), &target).map_err(|error| format!("could not restore {}: {error}", target.display()))?; ++ } ++ std::fs::remove_file(previous.join(PENDING)).map_err(|error| error.to_string())?; ++ std::fs::remove_dir(previous).map_err(|error| error.to_string()) ++} ++ ++fn remove(path: &Path) -> std::io::Result<()> { ++ if std::fs::symlink_metadata(path)?.is_dir() { std::fs::remove_dir_all(path) } else { std::fs::remove_file(path) } ++} ++ ++async fn plain_package(mut remote: R, length: u64, out: &Path) -> ExitCode { ++ if length > PLAIN_LIMIT { ++ eprintln!("NEXUS_TRANSFER_DIAGNOSTIC_V1 plain-package-too-large 0"); ++ eprintln!("This package is a plain archive larger than this installer unpacks."); ++ return ExitCode::FAILURE; ++ } ++ let archive = out.join(".xodus-plain-package.zip"); ++ let written = async { ++ let mut file = File::create(&archive).await?; ++ let copied = tokio::io::copy(&mut remote, &mut file).await?; ++ tokio::io::AsyncWriteExt::flush(&mut file).await?; ++ Ok::(copied) ++ } ++ .await; ++ match written { ++ Ok(copied) if copied == length => {} ++ Ok(_) => { ++ std::fs::remove_file(&archive).ok(); ++ eprintln!("NEXUS_TRANSFER_DIAGNOSTIC_V1 transfer-short 0"); ++ eprintln!("The package ended early. Retry this installation to obtain a fresh package link."); ++ return ExitCode::FAILURE; ++ } ++ Err(error) => { ++ std::fs::remove_file(&archive).ok(); ++ failure::report(&error); ++ return ExitCode::FAILURE; ++ } ++ } ++ let staging = out.join(".xodus-plain-staging"); ++ std::fs::remove_dir_all(&staging).ok(); ++ let unpacked = crate::commands::unzip::extract(&archive, &staging).and_then(|()| publish(&staging, out)); ++ std::fs::remove_file(&archive).ok(); ++ std::fs::remove_dir_all(&staging).ok(); ++ match unpacked { ++ Ok(()) => ExitCode::SUCCESS, ++ Err(error) => { ++ eprintln!("NEXUS_TRANSFER_DIAGNOSTIC_V1 plain-package-invalid 0"); ++ eprintln!("Could not unpack the package: {error}"); ++ ExitCode::FAILURE ++ } ++ } ++} ++ ++#[cfg(test)] ++mod plain_tests { ++ fn stored_zip(name: &str, data: &[u8]) -> Vec { ++ let mut out = Vec::new(); ++ let n = name.len() as u16; ++ let size = data.len() as u32; ++ out.extend_from_slice(&[0x50, 0x4b, 0x03, 0x04, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); ++ out.extend_from_slice(&size.to_le_bytes()); ++ out.extend_from_slice(&size.to_le_bytes()); ++ out.extend_from_slice(&n.to_le_bytes()); ++ out.extend_from_slice(&0u16.to_le_bytes()); ++ out.extend_from_slice(name.as_bytes()); ++ out.extend_from_slice(data); ++ let central = out.len() as u32; ++ out.extend_from_slice(&[0x50, 0x4b, 0x01, 0x02, 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); ++ out.extend_from_slice(&size.to_le_bytes()); ++ out.extend_from_slice(&size.to_le_bytes()); ++ out.extend_from_slice(&n.to_le_bytes()); ++ out.extend_from_slice(&[0u8; 12]); ++ out.extend_from_slice(&0u32.to_le_bytes()); ++ out.extend_from_slice(name.as_bytes()); ++ let central_size = out.len() as u32 - central; ++ out.extend_from_slice(&[0x50, 0x4b, 0x05, 0x06, 0, 0, 0, 0, 1, 0, 1, 0]); ++ out.extend_from_slice(¢ral_size.to_le_bytes()); ++ out.extend_from_slice(¢ral.to_le_bytes()); ++ out.extend_from_slice(&0u16.to_le_bytes()); ++ out ++ } ++ ++ fn stored_zip_of(entries: &[(&str, &[u8], u32)]) -> Vec { ++ let mut out = Vec::new(); ++ let mut central = Vec::new(); ++ for (name, data, declared) in entries { ++ let offset = out.len() as u32; ++ let n = name.len() as u16; ++ out.extend_from_slice(&[0x50, 0x4b, 0x03, 0x04, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); ++ out.extend_from_slice(&declared.to_le_bytes()); ++ out.extend_from_slice(&declared.to_le_bytes()); ++ out.extend_from_slice(&n.to_le_bytes()); ++ out.extend_from_slice(&0u16.to_le_bytes()); ++ out.extend_from_slice(name.as_bytes()); ++ out.extend_from_slice(data); ++ central.extend_from_slice(&[0x50, 0x4b, 0x01, 0x02, 20, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]); ++ central.extend_from_slice(&declared.to_le_bytes()); ++ central.extend_from_slice(&declared.to_le_bytes()); ++ central.extend_from_slice(&n.to_le_bytes()); ++ central.extend_from_slice(&[0u8; 12]); ++ central.extend_from_slice(&offset.to_le_bytes()); ++ central.extend_from_slice(name.as_bytes()); ++ } ++ let at = out.len() as u32; ++ let size = central.len() as u32; ++ out.extend_from_slice(¢ral); ++ let count = entries.len() as u16; ++ out.extend_from_slice(&[0x50, 0x4b, 0x05, 0x06, 0, 0, 0, 0]); ++ out.extend_from_slice(&count.to_le_bytes()); ++ out.extend_from_slice(&count.to_le_bytes()); ++ out.extend_from_slice(&size.to_le_bytes()); ++ out.extend_from_slice(&at.to_le_bytes()); ++ out.extend_from_slice(&0u16.to_le_bytes()); ++ out ++ } ++ ++ #[tokio::test] ++ async fn an_entry_that_runs_into_the_next_header_is_refused() { ++ let out = std::env::temp_dir().join(format!("xodus-plain-next-{}", std::process::id())); ++ std::fs::create_dir_all(&out).unwrap(); ++ let fine = stored_zip_of(&[("a.txt", b"aaaa", 4), ("b.txt", b"bbbb", 4)]); ++ let code = super::plain_package(std::io::Cursor::new(fine.clone()), fine.len() as u64, &out).await; ++ assert_eq!(code, std::process::ExitCode::SUCCESS); ++ assert_eq!(std::fs::read(out.join("b.txt")).unwrap(), b"bbbb"); ++ let bad = stored_zip_of(&[("a.txt", b"zzzz", 10), ("b.txt", b"yyyy", 4)]); ++ let code = super::plain_package(std::io::Cursor::new(bad.clone()), bad.len() as u64, &out).await; ++ assert_eq!(code, std::process::ExitCode::FAILURE); ++ assert_eq!(std::fs::read(out.join("a.txt")).unwrap(), b"aaaa"); ++ std::fs::remove_dir_all(&out).ok(); ++ } ++ ++ #[test] ++ fn a_failed_swap_puts_every_replaced_entry_back() { ++ let root = tempfile::tempdir().unwrap(); ++ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ std::fs::create_dir_all(staging.join(".xodus-plain-previous")).unwrap(); ++ std::fs::create_dir_all(&out).unwrap(); ++ std::fs::write(staging.join("+a"), b"new").unwrap(); ++ std::fs::write(out.join("+a"), b"old").unwrap(); ++ assert!(super::publish(&staging, &out).is_err()); ++ assert_eq!(std::fs::read(out.join("+a")).unwrap(), b"old"); ++ assert!(!out.join(".xodus-plain-previous").exists()); ++ } ++ ++ #[test] ++ fn entries_a_rollback_could_not_remove_are_cleared_before_the_backup_returns() { ++ let root = tempfile::tempdir().unwrap(); ++ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ let previous = out.join(".xodus-plain-previous"); ++ std::fs::create_dir_all(&staging).unwrap(); ++ std::fs::create_dir_all(previous.join("data")).unwrap(); ++ std::fs::write(previous.join(".pending"), "stray").unwrap(); ++ std::fs::write(previous.join("data").join("old"), b"old").unwrap(); ++ std::fs::create_dir_all(out.join("stray")).unwrap(); ++ std::fs::write(out.join("stray").join("new"), b"new").unwrap(); ++ std::fs::create_dir_all(out.join("data")).unwrap(); ++ std::fs::write(staging.join("fresh"), b"new").unwrap(); ++ super::publish(&staging, &out).unwrap(); ++ assert!(!out.join("stray").exists()); ++ assert_eq!(std::fs::read(out.join("data").join("old")).unwrap(), b"old"); ++ assert!(!previous.exists()); ++ } ++ ++ #[test] ++ fn a_restore_interrupted_after_its_removals_never_deletes_what_it_put_back() { ++ let root = tempfile::tempdir().unwrap(); ++ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ let previous = out.join(".xodus-plain-previous"); ++ std::fs::create_dir_all(&staging).unwrap(); ++ std::fs::create_dir_all(&previous).unwrap(); ++ std::fs::write(previous.join(".pending"), "a").unwrap(); ++ std::fs::write(previous.join("a"), b"old").unwrap(); ++ std::fs::write(out.join("a"), b"stray").unwrap(); ++ super::restore(&previous, &out).unwrap(); ++ assert_eq!(std::fs::read(out.join("a")).unwrap(), b"old"); ++ std::fs::create_dir_all(&previous).unwrap(); ++ std::fs::write(previous.join(".pending"), "").unwrap(); ++ std::fs::write(previous.join("b"), b"old-b").unwrap(); ++ super::publish(&staging, &out).unwrap(); ++ assert_eq!(std::fs::read(out.join("a")).unwrap(), b"old"); ++ assert_eq!(std::fs::read(out.join("b")).unwrap(), b"old-b"); ++ } ++ ++ #[test] ++ fn a_backup_left_by_a_finished_swap_is_discarded_not_restored() { ++ let root = tempfile::tempdir().unwrap(); ++ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ std::fs::create_dir_all(&staging).unwrap(); ++ std::fs::create_dir_all(out.join(".xodus-plain-previous")).unwrap(); ++ std::fs::write(out.join(".xodus-plain-previous").join("kept"), b"old").unwrap(); ++ std::fs::write(out.join("kept"), b"installed").unwrap(); ++ std::fs::write(staging.join("fresh"), b"new").unwrap(); ++ super::publish(&staging, &out).unwrap(); ++ assert_eq!(std::fs::read(out.join("kept")).unwrap(), b"installed"); ++ assert!(!out.join(".xodus-plain-previous").exists()); ++ } ++ ++ #[test] ++ fn a_backup_left_by_an_interrupted_swap_is_restored_first() { ++ let root = tempfile::tempdir().unwrap(); ++ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ std::fs::create_dir_all(&staging).unwrap(); ++ std::fs::create_dir_all(out.join(".xodus-plain-previous")).unwrap(); ++ std::fs::write(out.join(".xodus-plain-previous").join(".pending"), b"").unwrap(); ++ std::fs::write(out.join(".xodus-plain-previous").join("kept"), b"old").unwrap(); ++ std::fs::write(out.join("kept"), b"half").unwrap(); ++ std::fs::write(staging.join("fresh"), b"new").unwrap(); ++ super::publish(&staging, &out).unwrap(); ++ assert_eq!(std::fs::read(out.join("kept")).unwrap(), b"old"); ++ assert_eq!(std::fs::read(out.join("fresh")).unwrap(), b"new"); ++ assert!(!out.join(".xodus-plain-previous").exists()); ++ } ++ ++ #[tokio::test] ++ async fn a_plain_archive_is_downloaded_whole_and_unpacked() { ++ let out = std::env::temp_dir().join(format!("xodus-plain-{}", std::process::id())); ++ std::fs::create_dir_all(&out).unwrap(); ++ let zip = stored_zip("AppxManifest.xml", b""); ++ let code = super::plain_package(std::io::Cursor::new(zip.clone()), zip.len() as u64, &out).await; ++ assert_eq!(code, std::process::ExitCode::SUCCESS); ++ assert_eq!(std::fs::read(out.join("AppxManifest.xml")).unwrap(), b""); ++ assert!(!out.join(".xodus-plain-package.zip").exists()); ++ let short = super::plain_package(std::io::Cursor::new(zip[..10].to_vec()), zip.len() as u64, &out).await; ++ assert_eq!(short, std::process::ExitCode::FAILURE); ++ let mut lying = stored_zip("AppxManifest.xml", b""); ++ lying[18] = 0xff; ++ lying[22] = 0xff; ++ let length = lying.len() as u64; ++ let central = lying.windows(4).position(|w| w == [0x50, 0x4b, 0x01, 0x02]).unwrap(); ++ lying[central + 20] = 0xff; ++ lying[central + 24] = 0xff; ++ let truncated = super::plain_package(std::io::Cursor::new(lying), length, &out).await; ++ assert_eq!(truncated, std::process::ExitCode::FAILURE); ++ let mut overrun = stored_zip("AppxManifest.xml", b""); ++ let central = overrun.windows(4).position(|w| w == [0x50, 0x4b, 0x01, 0x02]).unwrap(); ++ for at in [18, 22, central + 20, central + 24] { ++ overrun[at] = 11; ++ } ++ let length = overrun.len() as u64; ++ let overran = super::plain_package(std::io::Cursor::new(overrun), length, &out).await; ++ assert_eq!(overran, std::process::ExitCode::FAILURE); ++ assert_eq!(std::fs::read(out.join("AppxManifest.xml")).unwrap(), b""); ++ assert!(!out.join(".xodus-plain-staging").exists()); ++ std::fs::remove_dir_all(&out).ok(); ++ } ++} +diff --git a/crates/xodus-cli/src/commands/unzip.rs b/crates/xodus-cli/src/commands/unzip.rs +new file mode 100644 +index 0000000..10e92fb +--- /dev/null ++++ b/crates/xodus-cli/src/commands/unzip.rs +@@ -0,0 +1,219 @@ ++//! Plain ZIP packages, which is what the store serves for a framework. ++//! ++//! Framework packages (`Microsoft.VCLibs.140.00` and its siblings) arrive from the ++//! delivery service as ordinary `.appx` zips, not the EAppx containers a title is ++//! packed in: there is nothing to decrypt and no header to parse. The packager ++//! writes them in the ZIP64 form, so the central directory and each entry may name ++//! its sizes and offset in an extra field instead of the fixed header. ++ ++use std::io::{Read, Seek, SeekFrom, Write}; ++use std::path::Path; ++ ++/// The end record is 22 bytes and its comment field can push it back 64 KiB. ++const TAIL: u64 = 65_557; ++const END: &[u8; 4] = b"PK\x05\x06"; ++const ZIP64_END: &[u8; 4] = b"PK\x06\x06"; ++const ZIP64_LOCATOR: &[u8; 4] = b"PK\x06\x07"; ++const CENTRAL: &[u8; 4] = b"PK\x01\x02"; ++const SATURATED: u32 = 0xFFFF_FFFF; ++ ++pub fn extract(archive: &Path, destination: &Path) -> Result<(), String> { ++ let mut file = std::fs::File::open(archive).map_err(|error| format!("package open failed: {error}"))?; ++ let length = file.metadata().map_err(|error| format!("package size failed: {error}"))?.len(); ++ if length < 22 { ++ return Err("the package is too small to be an archive".into()); ++ } ++ let tail = length.min(TAIL); ++ file.seek(SeekFrom::Start(length - tail)).map_err(|error| format!("package seek failed: {error}"))?; ++ let mut buffer = vec![0u8; tail as usize]; ++ file.read_exact(&mut buffer).map_err(|error| format!("package read failed: {error}"))?; ++ let end = buffer ++ .windows(END.len()) ++ .rposition(|window| window == END) ++ .ok_or("the package is not a zip archive")?; ++ if end + 22 > buffer.len() { ++ return Err("the package end record is truncated".into()); ++ } ++ let mut entries = u16::from_le_bytes([buffer[end + 10], buffer[end + 11]]) as u64; ++ let mut offset = u32::from_le_bytes([buffer[end + 16], buffer[end + 17], buffer[end + 18], buffer[end + 19]]) as u64; ++ if entries == 0xFFFF || offset == u64::from(SATURATED) || offset > length { ++ let (zip64_entries, zip64_offset) = zip64(&mut file, length, &buffer, end)?; ++ entries = zip64_entries; ++ offset = zip64_offset; ++ } ++ if offset >= length { ++ return Err(format!("the package directory starts past the archive at {offset} of {length}")); ++ } ++ std::fs::create_dir_all(destination).map_err(|error| format!("package folder failed: {error}"))?; ++ let directory = offset; ++ let mut listed = Vec::new(); ++ for _ in 0..entries { ++ file.seek(SeekFrom::Start(offset)).map_err(|error| format!("package seek failed: {error}"))?; ++ let mut header = [0u8; 46]; ++ file.read_exact(&mut header).map_err(|error| format!("package header failed at {offset} of the directory, {error}"))?; ++ if &header[0..4] != CENTRAL { ++ return Err(format!("the package directory is malformed at {offset}")); ++ } ++ let method = u16::from_le_bytes([header[10], header[11]]); ++ let uncompressed = u32::from_le_bytes([header[24], header[25], header[26], header[27]]); ++ let mut compressed = u64::from(u32::from_le_bytes([header[20], header[21], header[22], header[23]])); ++ let name_length = u16::from_le_bytes([header[28], header[29]]) as usize; ++ let extra_length = u16::from_le_bytes([header[30], header[31]]) as usize; ++ let comment_length = u16::from_le_bytes([header[32], header[33]]) as usize; ++ let mut local = u64::from(u32::from_le_bytes([header[42], header[43], header[44], header[45]])); ++ let mut size = u64::from(uncompressed); ++ let mut name = vec![0u8; name_length]; ++ file.read_exact(&mut name).map_err(|error| format!("package name failed: {error}"))?; ++ let mut extra = vec![0u8; extra_length]; ++ file.read_exact(&mut extra).map_err(|error| format!("package extra failed: {error}"))?; ++ offset += 46 + name_length as u64 + extra_length as u64 + comment_length as u64; ++ if compressed == u64::from(SATURATED) || local == u64::from(SATURATED) || uncompressed == SATURATED { ++ let wide = zip64_entry(&extra, uncompressed == SATURATED, compressed == u64::from(SATURATED), local == u64::from(SATURATED)); ++ if compressed == u64::from(SATURATED) { ++ compressed = wide.compressed.ok_or("a package entry has no wide size")?; ++ } ++ if local == u64::from(SATURATED) { ++ local = wide.local.ok_or("a package entry has no wide offset")?; ++ } ++ if uncompressed == SATURATED { ++ size = wide.size.ok_or("a package entry has no wide uncompressed size")?; ++ } ++ } ++ let name = String::from_utf8(name).map_err(|_| "a package entry has an unreadable name".to_string())?; ++ listed.push(Listed { name, method, compressed, size, local }); ++ } ++ let mut starts: Vec = listed.iter().map(|entry| entry.local).collect(); ++ starts.sort_unstable(); ++ starts.dedup(); ++ for Listed { name, method, compressed, size, local } in listed { ++ let limit = starts.get(starts.partition_point(|start| *start <= local)).copied().unwrap_or(directory).min(directory); ++ if name.ends_with('/') { ++ continue; ++ } ++ let Some(relative) = safe(&name) else { continue }; ++ let target = destination.join(relative); ++ if let Some(parent) = target.parent() { ++ std::fs::create_dir_all(parent).map_err(|error| format!("package folder failed: {error}"))?; ++ } ++ file.seek(SeekFrom::Start(local)).map_err(|error| format!("package seek failed: {error}"))?; ++ let mut local_header = [0u8; 30]; ++ file.read_exact(&mut local_header).map_err(|error| format!("package header failed: {error}"))?; ++ let local_name = u16::from_le_bytes([local_header[26], local_header[27]]) as usize; ++ let local_extra = u16::from_le_bytes([local_header[28], local_header[29]]) as usize; ++ let data = local + 30 + local_name as u64 + local_extra as u64; ++ if data.checked_add(compressed).is_none_or(|end| end > limit) { ++ return Err(format!("the package entry {name} runs past its data")); ++ } ++ if method == 0 && compressed != size { ++ return Err(format!("the package entry {name} has inconsistent sizes")); ++ } ++ file.seek(SeekFrom::Start(data)).map_err(|error| format!("package seek failed: {error}"))?; ++ let mut body = (&mut file).take(compressed); ++ let mut written = std::fs::File::create(&target).map_err(|error| format!("package write failed: {error}"))?; ++ match method { ++ 0 => { ++ let copied = std::io::copy(&mut body, &mut written).map_err(|error| format!("package copy failed: {error}"))?; ++ if copied != compressed { ++ return Err(format!("the package entry {name} is truncated")); ++ } ++ } ++ 8 => { ++ let mut inflate = flate2::read::DeflateDecoder::new(body); ++ let copied = std::io::copy(&mut inflate, &mut written).map_err(|error| format!("package inflate failed: {error}"))?; ++ if copied != size { ++ return Err(format!("the package entry {name} is truncated")); ++ } ++ } ++ _ => return Err(format!("a package entry uses compression {method}, which is not supported")), ++ } ++ written.flush().ok(); ++ } ++ Ok(()) ++} ++ ++/// The end record of the ZIP64 archive that precedes the ordinary one. ++fn zip64(file: &mut std::fs::File, length: u64, buffer: &[u8], end: usize) -> Result<(u64, u64), String> { ++ let locator = buffer[..end] ++ .windows(ZIP64_LOCATOR.len()) ++ .rposition(|window| window == ZIP64_LOCATOR) ++ .ok_or("the package names a wide directory with no locator")?; ++ if locator + 20 > buffer.len() { ++ return Err("the package locator is truncated".into()); ++ } ++ let at = u64::from_le_bytes(buffer[locator + 8..locator + 16].try_into().map_err(|_| "unreadable locator")?); ++ if at + 56 > length { ++ return Err(format!("the package names a wide end record past the archive at {at} of {length}")); ++ } ++ file.seek(SeekFrom::Start(at)).map_err(|error| format!("package seek failed: {error}"))?; ++ let mut record = [0u8; 56]; ++ file.read_exact(&mut record).map_err(|error| format!("package end record failed: {error}"))?; ++ if &record[0..4] != ZIP64_END { ++ return Err("the package wide end record is malformed".into()); ++ } ++ let entries = u64::from_le_bytes(record[32..40].try_into().map_err(|_| "unreadable entry count")?); ++ let offset = u64::from_le_bytes(record[48..56].try_into().map_err(|_| "unreadable directory offset")?); ++ Ok((entries, offset)) ++} ++ ++/// The compressed size and local header offset a ZIP64 entry keeps in its extra, ++/// in the order the format wrote them: only the fields that were saturated. ++fn zip64_entry(extra: &[u8], has_size: bool, has_compressed: bool, has_local: bool) -> Wide { ++ let mut wide = Wide::default(); ++ let mut at = 0; ++ while at + 4 <= extra.len() { ++ let id = u16::from_le_bytes([extra[at], extra[at + 1]]); ++ let size = u16::from_le_bytes([extra[at + 2], extra[at + 3]]) as usize; ++ let body = at + 4; ++ if body + size > extra.len() { ++ break; ++ } ++ if id == 0x0001 { ++ let fields = &extra[body..body + size]; ++ let mut cursor = 0usize; ++ let mut take = |present: bool| -> Option { ++ if !present || cursor + 8 > fields.len() { ++ return None; ++ } ++ let value = u64::from_le_bytes(fields[cursor..cursor + 8].try_into().ok()?); ++ cursor += 8; ++ Some(value) ++ }; ++ wide.size = take(has_size); ++ wide.compressed = take(has_compressed); ++ wide.local = take(has_local); ++ return wide; ++ } ++ at = body + size; ++ } ++ wide ++} ++ ++struct Listed { ++ name: String, ++ method: u16, ++ compressed: u64, ++ size: u64, ++ local: u64, ++} ++ ++#[derive(Default)] ++struct Wide { ++ size: Option, ++ compressed: Option, ++ local: Option, ++} ++ ++/// The entry's relative path, or nothing when it would land outside the folder. ++fn safe(name: &str) -> Option { ++ let mut parts = Vec::new(); ++ for part in name.split('/') { ++ if part.is_empty() || part == "." { ++ continue; ++ } ++ if part == ".." || part.contains('\\') || part.contains(':') { ++ return None; ++ } ++ parts.push(part); ++ } ++ if parts.is_empty() { None } else { Some(parts.iter().collect()) } ++} +diff --git a/crates/xodus-cli/src/commands/wu-root.pem b/crates/xodus-cli/src/commands/wu-root.pem +new file mode 100644 +index 0000000..63467d7 +--- /dev/null ++++ b/crates/xodus-cli/src/commands/wu-root.pem +@@ -0,0 +1,19 @@ ++-----BEGIN CERTIFICATE----- ++MIIDIzCCAqigAwIBAgIQFJgmZtx8zY9AU2d7uZnshTAKBggqhkjOPQQDAzCBlDEL ++MAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1v ++bmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjE+MDwGA1UEAxM1TWlj ++cm9zb2Z0IEVDQyBQcm9kdWN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw ++MTgwHhcNMTgwMjI3MjA0MjA4WhcNNDMwMjI3MjA1MDQ2WjCBlDELMAkGA1UEBhMC ++VVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNV ++BAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjE+MDwGA1UEAxM1TWljcm9zb2Z0IEVD ++QyBQcm9kdWN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTgwdjAQBgcq ++hkjOPQIBBgUrgQQAIgNiAATHERYqdh1Wjr65YmXUw8608MMw7I9t1245vMhJq6u4 ++40N41YEGXe/HfZ/O1rOQdd4MsJDeI7rI0T5n4BmpG4YxHl80Le4X/RX7fieKMqHq ++yY/JfhjLLzssSHp9pvQBB6yjgbwwgbkwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB ++/wQFMAMBAf8wHQYDVR0OBBYEFEPvcIe4nb/siBncxsRrdQ11NDMIMBAGCSsGAQQB ++gjcVAQQDAgEAMGUGA1UdIAReMFwwBgYEVR0gADBSBgwrBgEEAYI3TIN9AQEwQjBA ++BggrBgEFBQcCARY0aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2Nz ++L1JlcG9zaXRvcnkuaHRtADAKBggqhkjOPQQDAwNpADBmAjEAocBJRF0yVSfMPpBu ++JSKdJFubUTXHkUlJKqP5b08czd2c4bVXyZ7CIkWbBhVwHEW/AjEAxdMo63LHPrCs ++Jwl/Yj1geeWS8UUquaUC5GC7/nornGCntZkU8rC+8LsFllZWj8Fo ++-----END CERTIFICATE----- +diff --git a/crates/xodus-cli/src/main.rs b/crates/xodus-cli/src/main.rs +index b2a3383..855f667 100644 +--- a/crates/xodus-cli/src/main.rs ++++ b/crates/xodus-cli/src/main.rs +@@ -166,6 +166,29 @@ enum SubCommand { + #[arg(short, long)] + market: Option, + }, ++ #[command( ++ about = "Install a legacy EAppx/EAppxBundle title: license, download, extract" ++ )] ++ LegacyInstall { ++ product: String, ++ destination: String, ++ #[arg(short, long)] ++ market: Option, ++ #[arg(long, help = "Content ID explicitly selected from resolve-package for this Store product")] ++ selected_content_id: Option, ++ #[arg(long, help = "Store product ID for the Windows Update catalogue when PRODUCT is a content ID")] ++ store_id: Option, ++ #[arg( ++ long, ++ help = "Emit Nexus progress protocol v1 as newline-delimited JSON" ++ )] ++ progress_json: bool, ++ #[arg( ++ long, ++ help = "Resolve the download locations and stop without downloading" ++ )] ++ resolve_only: bool, ++ }, + #[cfg(unix)] + #[command(about = "Run a Game with xodus wine")] + Run { +@@ -435,6 +458,28 @@ async fn main() -> ExitCode { + ) + .await + } ++ SubCommand::LegacyInstall { ++ product, ++ destination, ++ market, ++ selected_content_id, ++ store_id, ++ progress_json, ++ resolve_only, ++ } => { ++ commands::legacy_install::run( ++ &client, ++ &tokens, ++ product, ++ destination, ++ market, ++ selected_content_id, ++ store_id, ++ progress_json, ++ resolve_only, ++ ) ++ .await ++ } + #[cfg(unix)] + SubCommand::Run { + source, +diff --git a/crates/xodus/src/licensing/content_response.rs b/crates/xodus/src/licensing/content_response.rs +index e87421d..8b5b570 100644 +--- a/crates/xodus/src/licensing/content_response.rs ++++ b/crates/xodus/src/licensing/content_response.rs +@@ -53,6 +53,10 @@ pub enum LicenseContentError { + "Microsoft Store device limit reached. Open https://account.microsoft.com/devices/content, unlink an old device you no longer use, then try again. You do not need to sign out or reset the wallet." + )] + DeviceLimit, ++ #[error( ++ "Microsoft refused a license for this version of the package on this device." ++ )] ++ DeviceUnregistrable, + #[error( + "Microsoft returned a content license without a key. Share the backend diagnostic log." + )] +@@ -87,6 +91,7 @@ impl LicenseContentError { + Self::Schema => "content-schema", + Self::NotEntitled => "content-not-entitled", + Self::DeviceLimit => "content-device-limit", ++ Self::DeviceUnregistrable => "content-device-name", + Self::EmptyKeys => "content-empty-keys", + Self::Base64 => "content-base64", + Self::Utf8 => "content-utf8", +@@ -133,6 +138,12 @@ async fn receive( + let result = async { + // A valid-looking license inside a refused HTTP response is not permission. + if !response.status().is_success() { ++ if status == 400 ++ && let Some(body) = bounded_body(&mut response, REFUSAL_BODY).await ++ && unregistrable(&body) ++ { ++ return Err(LicenseContentError::DeviceUnregistrable); ++ } + return Err(LicenseContentError::http(status)); + } + if response +@@ -167,6 +178,27 @@ async fn receive( + result + } + ++const REFUSAL_BODY: usize = 64 * 1024; ++ ++async fn bounded_body(response: &mut reqwest::Response, limit: usize) -> Option> { ++ if response.content_length().is_some_and(|length| length > limit as u64) { ++ return None; ++ } ++ let mut body = Vec::new(); ++ while let Some(chunk) = response.chunk().await.ok()? { ++ if chunk.len() > limit - body.len() { ++ return None; ++ } ++ body.extend_from_slice(&chunk); ++ } ++ Some(body) ++} ++ ++fn unregistrable(body: &[u8]) -> bool { ++ serde_json::from_slice::(body) ++ .is_ok_and(|value| value["innererror"]["code"] == "DeviceNameNotHexBinary") ++} ++ + fn parse(bytes: &[u8]) -> Result<(LicenseContent, License), LicenseContentError> { + if bytes.len() > MAX_BODY { + return Err(LicenseContentError::Size); +diff --git a/crates/xodus/src/licensing/content_response_tests.rs b/crates/xodus/src/licensing/content_response_tests.rs +index 205aab3..93c138b 100644 +--- a/crates/xodus/src/licensing/content_response_tests.rs ++++ b/crates/xodus/src/licensing/content_response_tests.rs +@@ -373,3 +373,18 @@ async fn content_license_transport_timeout_and_cancellation_have_no_background_r + ); + server.await.unwrap(); + } ++ ++#[tokio::test] ++async fn a_refused_device_name_claim_has_its_own_stage() { ++ let refused = serde_json::to_vec(&json!({"code":"BadRequest","innererror":{"faultcode":3043,"code":"DeviceNameNotHexBinary","message":"private"}})).unwrap(); ++ let other = serde_json::to_vec(&json!({"code":"BadRequest","innererror":{"code":"Other"}})).unwrap(); ++ let mut oversized = refused.clone(); ++ oversized.splice(1..1, std::iter::repeat_n(b' ', 70 * 1024)); ++ for (body, expected) in [(refused, "content-device-name"), (other, "content-http"), (b"not json".to_vec(), "content-http"), (oversized, "content-http")] { ++ let (url, server) = server(format!("HTTP/1.1 400 Fixture\r\nContent-Length: {}\r\nConnection: close\r\n\r\n", body.len()), body).await; ++ let error = fetch(reqwest::Client::new().get(url)).await.err().unwrap(); ++ assert_eq!(error.stage(), expected); ++ assert!(!error.to_string().contains("private")); ++ server.await.unwrap(); ++ } ++} diff --git a/tools/xbox/droiddeck-legacy-packages.patch b/tools/xbox/droiddeck-legacy-packages.patch new file mode 100644 index 0000000000..daec856e54 --- /dev/null +++ b/tools/xbox/droiddeck-legacy-packages.patch @@ -0,0 +1,570 @@ +diff --git a/crates/xodus-cli/src/commands/extract_eappx.rs b/crates/xodus-cli/src/commands/extract_eappx.rs +index c8d5ebf..5ea43da 100644 +--- a/crates/xodus-cli/src/commands/extract_eappx.rs ++++ b/crates/xodus-cli/src/commands/extract_eappx.rs +@@ -1,80 +1,416 @@ +-use std::path::PathBuf; ++use std::path::{Path, PathBuf}; + use std::process::ExitCode; + + use eappx::EAppxFile; +-use eappx::keys::KeyCollection; ++use eappx::keys::{KeyCollection, KeyId}; ++ ++/// A bundle header names each content key as a pair of GUIDs, `(content id, ++/// package id)`, while the licence names the same key by its 16-byte content id ++/// alone. The crate reads a 16-byte id as `(static prefix, content id)`, so the ++/// two never compare equal and a complete key file looks incomplete. Pair every ++/// key the header asks for with the licence entry that carries its content id. ++const SHORT_KEY_PREFIX: uuid::Uuid = uuid::uuid!("BB1755DB-5052-4B10-B2AB-F3ABF5CA5B41"); ++ ++fn align_keys(keys: &mut KeyCollection, needed: &[KeyId]) { ++ for id in needed { ++ if keys.keys.contains_key(id) { ++ continue; ++ } ++ let KeyId::Guid((content, _)) = id else { continue }; ++ let carried = keys.keys.get(&KeyId::Guid((SHORT_KEY_PREFIX, *content))).cloned(); ++ if let Some(data) = carried { ++ keys.add(id.clone(), data); ++ } ++ } ++} ++ ++/// A bundle can hold another bundle, but nesting is bounded so a malformed ++/// archive cannot drive unbounded recursion. ++const MAX_BUNDLE_DEPTH: usize = 3; + + /// Extracts a locally-stored EAppx/EMSIX package. + /// +-/// This is intentionally local-only for now: no store lookup or download. +-/// See issue #91 - the initial goal is understanding/unpacking the format, +-/// not full download integration, which can build on this once it lands. ++/// A bundle is extracted in place, then each inner package that is itself an ++/// EAppx container is decrypted with the same content keys. Inner files that ++/// are plain ZIP-based packages are left as extracted: they carry no EAppx ++/// header, so there is nothing to decrypt. + pub async fn run(path: String, destination: String, key_file: Option) -> ExitCode { +- let infile = PathBuf::from(&path); +- let outdir = PathBuf::from(&destination); +- +- let file = match std::fs::File::open(&infile) { +- Ok(f) => f, +- Err(e) => { +- eprintln!("Failed to open {:?}: {e}", infile); +- return ExitCode::FAILURE; +- } +- }; +- let mut reader = std::io::BufReader::new(file); ++ run_metered(path, destination, key_file, None).await ++} + +- let mut eappx = match EAppxFile::from_stream(&mut reader) { +- Ok(e) => e, +- Err(e) => { +- eprintln!("Failed to parse EAppx header: {e}"); +- return ExitCode::FAILURE; +- } +- }; ++/// Where the extraction of the current package begins and how much it will write. ++/// ++/// A bundle's inner package is one enormous member, so counting finished files ++/// leaves the bar frozen for the whole of it. The counter is exact: it advances by ++/// each file's declared length as that file is written. ++#[derive(Default)] ++pub struct Meter { ++ /// Bytes written by the package being unpacked now. ++ pub written: std::sync::atomic::AtomicU64, ++ /// Bytes written by packages that already finished. ++ pub banked: std::sync::atomic::AtomicU64, ++ /// Bytes the package being unpacked now will write in total. ++ pub total: std::sync::atomic::AtomicU64, ++ turn: std::sync::Mutex<()>, ++} + +- println!("{eappx}"); ++impl Meter { ++ /// Bytes written and bytes to write, read as one consistent pair. ++ pub fn snapshot(&self) -> (u64, u64) { ++ use std::sync::atomic::Ordering::Relaxed; ++ let _turn = self.turn.lock().unwrap_or_else(|poisoned| poisoned.into_inner()); ++ let banked = self.banked.load(Relaxed); ++ let total = self.total.load(Relaxed); ++ (banked + self.written.load(Relaxed).min(total), banked + total) ++ } + ++ pub fn done(&self) -> u64 { ++ self.snapshot().0 ++ } ++ ++ pub fn all(&self) -> u64 { ++ self.snapshot().1 ++ } ++ ++ /// Closes the package being unpacked and opens the next one. ++ fn roll(&self, total: u64) { ++ use std::sync::atomic::Ordering::Relaxed; ++ let _turn = self.turn.lock().unwrap_or_else(|poisoned| poisoned.into_inner()); ++ self.banked.fetch_add(self.total.load(Relaxed), Relaxed); ++ self.written.store(0, Relaxed); ++ self.total.store(total, Relaxed); ++ } ++} ++ ++/// Extracts a package, publishing the size of the work in progress to `meter`. ++/// ++/// `release` deletes the container once its members are on disk. A bundle of a ++/// full title is tens of gigabytes, and holding it while the members are ++/// decrypted can fill the device partway through. ++pub async fn run_metered( ++ path: String, ++ destination: String, ++ key_file: Option, ++ meter: Option<&Meter>, ++) -> ExitCode { ++ run_blocking(path, destination, key_file, meter, false) ++} ++ ++/// The extraction itself, without the async wrapper. ++/// ++/// Callers that keep reporting while it works run this on a blocking thread, ++/// because it never yields: decryption and inflation are plain synchronous work. ++pub fn run_blocking( ++ path: String, ++ destination: String, ++ key_file: Option, ++ meter: Option<&Meter>, ++ release: bool, ++) -> ExitCode { + let mut key_collection = KeyCollection::default(); + if let Some(key_file) = key_file { + let mut keyfile = match std::fs::File::open(&key_file) { + Ok(f) => f, + Err(e) => { +- eprintln!("Failed to open key file {:?}: {e}", key_file); +- return ExitCode::FAILURE; ++ return report_failure( ++ &Failure::new("key-file-open", &key_file, &e.to_string()), ++ ExitCode::FAILURE, ++ ); + } + }; + match KeyCollection::from_reader(&mut keyfile) { + Ok(loaded) => key_collection.extend(loaded.keys), + Err(e) => { +- eprintln!("Failed to parse key file: {e}"); +- return ExitCode::FAILURE; ++ return report_failure( ++ &Failure::new("key-file-parse", &key_file, &e.to_string()), ++ ExitCode::FAILURE, ++ ); + } + } + } + +- if !key_collection.has_required_keys(&eappx.header.key_ids) { +- eprintln!("Missing one or more required content keys for this package"); +- return ExitCode::FAILURE; ++ match derive( ++ Path::new(&path), ++ Path::new(&destination), ++ &key_collection, ++ 0, ++ meter, ++ release, ++ ) { ++ Ok(()) => ExitCode::SUCCESS, ++ Err(failure) => report_failure(&failure, ExitCode::FAILURE), + } ++} ++ ++/// A failure the launcher can name without printing a device path. ++/// ++/// The app only forwards stderr lines that are on a known allowlist, so the two ++/// lines below are what make a stopped install say why it stopped. The reason is ++/// reduced to letters, digits and a few punctuation marks, which keeps a path or ++/// a key out of the log while still naming the cause. ++struct Failure { ++ code: &'static str, ++ name: String, ++ reason: String, ++} + +- if let Err(e) = eappx.load_keys(&key_collection) { +- eprintln!("Failed to load keys: {e}"); +- return ExitCode::FAILURE; ++impl Failure { ++ fn new(code: &'static str, name: &str, reason: &str) -> Self { ++ Self { ++ code, ++ name: sanitize(name, 60), ++ reason: sanitize(reason, 120), ++ } + } + +- if !outdir.exists() { +- if let Err(e) = std::fs::create_dir_all(&outdir) { +- eprintln!("Failed to create output directory {:?}: {e}", outdir); +- return ExitCode::FAILURE; ++ fn at(code: &'static str, path: &Path, reason: &str) -> Self { ++ let name = path.file_name().map(|name| name.to_string_lossy().into_owned()); ++ Self::new(code, &name.unwrap_or_default(), reason) ++ } ++} ++ ++fn sanitize(text: &str, limit: usize) -> String { ++ text.chars() ++ .map(|c| if c.is_ascii_alphanumeric() || matches!(c, ' ' | '.' | '_' | '-') { c } else { '?' }) ++ .take(limit) ++ .collect::() ++ .trim() ++ .to_string() ++} ++ ++fn report_failure(failure: &Failure, code: ExitCode) -> ExitCode { ++ eprintln!("NEXUS_EXTRACT_DIAGNOSTIC_V1 {}", failure.code); ++ eprintln!("NEXUS_EXTRACT_DETAIL_V1 {} {}", failure.name, failure.reason); ++ eprintln!("Extraction failed: {}: {}: {}", failure.code, failure.name, failure.reason); ++ code ++} ++ ++// EAppxMagic is EXPH (single), EXSH and EXBH (bundle). Anything else is not an ++// EAppx container, so a bundle's plain ZIP members are not recursed into. ++fn is_eappx(path: &Path) -> bool { ++ use std::io::Read; ++ let Ok(mut file) = std::fs::File::open(path) else { return false }; ++ let mut magic = [0u8; 4]; ++ if file.read_exact(&mut magic).is_err() { ++ return false; ++ } ++ matches!(&magic, b"EXPH" | b"EXSH" | b"EXBH") ++} ++ ++fn derive( ++ infile: &Path, ++ outdir: &Path, ++ keys: &KeyCollection, ++ depth: usize, ++ meter: Option<&Meter>, ++ release: bool, ++) -> Result<(), Failure> { ++ let file = std::fs::File::open(infile) ++ .map_err(|e| Failure::at("open", infile, &e.to_string()))?; ++ let mut reader = std::io::BufReader::new(file); ++ ++ let mut eappx = EAppxFile::from_stream(&mut reader) ++ .map_err(|e| Failure::at("header", infile, &e.to_string()))?; ++ ++ println!("{eappx}"); ++ ++ // The licence and the header name the same key differently, so the set is ++ // rebuilt per package and reconciled before the header is judged. ++ let mut required = KeyCollection::new(&keys.keys); ++ align_keys(&mut required, &eappx.header.key_ids); ++ ++ if !required.has_required_keys(&eappx.header.key_ids) { ++ // The count is the useful part: a license that carries one key cannot ++ // open a bundle whose members each declare their own. ++ return Err(Failure::new( ++ "missing-keys", ++ &infile.file_name().map(|name| name.to_string_lossy().into_owned()).unwrap_or_default(), ++ &format!("{} of {} content keys present", required.keys.len(), eappx.header.key_ids.len()), ++ )); ++ } ++ ++ eappx ++ .load_keys(&required) ++ .map_err(|e| Failure::at("load-keys", infile, &e.to_string()))?; ++ ++ std::fs::create_dir_all(outdir) ++ .map_err(|e| Failure::at("create-dir", outdir, &e.to_string()))?; ++ ++ unpack(infile, &eappx, &mut reader, outdir, meter, release)?; ++ // The handle must close before a released container gives its space back. ++ drop(reader); ++ ++ println!("Extracted {}", infile.file_name().unwrap_or_default().to_string_lossy()); ++ ++ let mut nested: Vec = std::fs::read_dir(outdir) ++ .map_err(|e| Failure::at("list", outdir, &e.to_string()))? ++ .filter_map(|entry| entry.ok().map(|entry| entry.path())) ++ // The container being unpacked may itself sit in the destination, which is ++ // what `extract-eappx ./title.eappx .` asks for. Re-entering it would ++ // recurse into the same bytes and then delete the caller's file. ++ .filter(|path| std::fs::canonicalize(path).ok() != std::fs::canonicalize(infile).ok()) ++ .filter(|path| path.is_file() && is_eappx(path)) ++ .collect(); ++ nested.sort(); ++ ++ if nested.is_empty() { ++ return Ok(()); ++ } ++ if depth >= MAX_BUNDLE_DEPTH { ++ return Err(Failure::at("nesting", infile, "bundle nesting exceeds the limit")); ++ } ++ ++ for child in nested { ++ let name = child ++ .file_stem() ++ .map(|name| name.to_string_lossy().into_owned()) ++ .ok_or_else(|| Failure::at("no-name", &child, "package without a usable name"))?; ++ derive(&child, &outdir.join(&name), keys, depth + 1, meter, release)?; ++ // The member's bytes are no longer needed once its contents are on disk. ++ // A bundle of a full title holds tens of gigabytes, and keeping every ++ // member beside the decrypted copy doubles what the install occupies. ++ std::fs::remove_file(&child).ok(); ++ } ++ ++ Ok(()) ++} ++ ++/// Bytes currently on disk under `dir`. ++/// ++/// A bundle member is written as one file, so a per-file counter says nothing ++/// until it is finished. Measuring the destination catches the bytes as they ++/// land, whatever is writing them. ++pub fn tree_size(dir: &Path) -> u64 { ++ let mut total = 0; ++ let Ok(entries) = std::fs::read_dir(dir) else { return 0 }; ++ for entry in entries.flatten() { ++ let Ok(kind) = entry.file_type() else { continue }; ++ if kind.is_dir() { ++ total += tree_size(&entry.path()); ++ } else if let Ok(meta) = entry.metadata() { ++ total += meta.len(); + } + } ++ total ++} ++ ++/// Buffer sizes for each worker's own handle on the container. ++/// ++/// The crate's default 8 KiB reader turns one 64 KiB block into eight system ++/// calls, and a full title is millions of blocks. ++const READ_BUFFER: usize = 1 << 20; ++ ++/// Workers used to unpack one package. ++/// ++/// Files sit at independent offsets, so each worker opens its own handle and ++/// takes every Nth file. Decryption and inflation are both CPU-bound and one ++/// core was saturated, so this is where the headroom is. The limit is the ++/// device's write speed, which is reached a few workers in. ++fn workers() -> usize { ++ std::thread::available_parallelism() ++ .map(|count| count.get()) ++ .unwrap_or(1) ++ .clamp(1, 4) ++} + +- match eappx.extract(&mut reader, &outdir) { +- Ok(_) => { +- println!("Extracted {:?} to {:?}", infile, outdir); +- ExitCode::SUCCESS ++/// Writes a package's files, publishing what is left to write. ++/// ++/// This is the crate's own `extract`, split across workers and reported as it ++/// goes. The blockmap already totals every file's uncompressed length, so the ++/// end point is known before the first byte is written. ++fn unpack( ++ infile: &Path, ++ eappx: &EAppxFile, ++ reader: &mut std::io::BufReader, ++ outdir: &Path, ++ meter: Option<&Meter>, ++ release: bool, ++) -> Result<(), Failure> { ++ let total: u64 = eappx.blockmap.files.iter().map(|package| package.size).sum(); ++ if let Some(meter) = meter { ++ meter.roll(total); ++ } ++ ++ eappx ++ .extract_footprint_files(reader, outdir) ++ .map_err(|e| Failure::at("extract", infile, &e.to_string()))?; ++ ++ if eappx.header.is_bundle() { ++ eappx ++ .extract_blockmap_files(reader, outdir) ++ .map_err(|e| Failure::at("extract", infile, &e.to_string()))?; ++ eappx ++ .extract_bundle_files(reader, outdir) ++ .map_err(|e| Failure::at("extract", infile, &e.to_string()))?; ++ if release { ++ std::fs::remove_file(infile).ok(); + } +- Err(e) => { +- eprintln!("Extraction failed: {e}"); +- ExitCode::FAILURE ++ return Ok(()); ++ } ++ ++ let count = workers().min(eappx.blockmap.files.len().max(1)); ++ let failure = std::sync::Mutex::new(None::); ++ std::thread::scope(|scope| { ++ for shard in 0..count { ++ let failure = &failure; ++ scope.spawn(move || { ++ let Ok(handle) = std::fs::File::open(infile) else { ++ if let Ok(mut slot) = failure.lock() { ++ *slot = Some("a worker could not reopen the package".to_string()); ++ } ++ return; ++ }; ++ let mut stream = std::io::BufReader::with_capacity(READ_BUFFER, handle); ++ for (index, package) in eappx.blockmap.files.iter().enumerate() { ++ if index % count != shard { ++ continue; ++ } ++ if failure.lock().map(|slot| slot.is_some()).unwrap_or(true) { ++ return; ++ } ++ let Some(footer) = eappx.find_footer_for_file(package.id()) else { ++ if let Ok(mut slot) = failure.lock() { ++ *slot = Some("the blockmap names a file the package does not hold".to_string()); ++ } ++ return; ++ }; ++ let mut info = eappx::FileInfo::from(footer); ++ // The crate checks these only when asked, but filling them ++ // keeps the per-file path identical to its own extraction. ++ info.filehash = package.filehash_bytes(); ++ info.block_hashes = Some(package.block_hashes()); ++ // The blockmap's length and the footer's must agree, or the ++ // file written would be silently short. ++ if info.uncompressed_length != package.size { ++ if let Ok(mut slot) = failure.lock() { ++ *slot = Some("a package entry disagrees with its blockmap about its size".to_string()); ++ } ++ return; ++ } ++ if let Err(error) = eappx.save_file_to_fs(&mut stream, info, outdir, &package.name) { ++ if let Ok(mut slot) = failure.lock() { ++ *slot = Some(error.to_string()); ++ } ++ return; ++ } ++ if let Some(meter) = meter { ++ meter ++ .written ++ .fetch_add(package.size, std::sync::atomic::Ordering::Relaxed); ++ } ++ } ++ }); + } ++ }); ++ ++ if let Some(reason) = failure.into_inner().unwrap_or(None) { ++ return Err(Failure::at("extract", infile, &reason)); ++ } ++ ++ if release { ++ // The files are on disk; the container is not read again unless the ++ // install is retried from scratch. ++ std::fs::remove_file(infile).ok(); + } ++ Ok(()) + } +diff --git a/crates/xodus-cli/src/commands/license.rs b/crates/xodus-cli/src/commands/license.rs +index 4540549..b9fd91c 100644 +--- a/crates/xodus-cli/src/commands/license.rs ++++ b/crates/xodus-cli/src/commands/license.rs +@@ -1,5 +1,6 @@ + use std::process::ExitCode; + ++use base64::{Engine, engine::general_purpose::STANDARD}; + use tokio::fs::OpenOptions; + use tokio::io::AsyncWriteExt; + use xodus::tokens::TokenManager; +@@ -21,6 +22,10 @@ pub async fn run( + + let (key, game_splicense) = license.unwrap(); + tokio::fs::create_dir_all(&ciks).await.unwrap(); ++ // eappx-rs reads a text [Keys] file with base64 Key IDs, while the .cik ++ // format below is the binary form other tools expect. Write both so the ++ // same license dump serves either extractor. ++ let mut eappx_keys = String::from("[Keys]\n"); + for (uuid, content_key) in game_splicense.content_keys { + let unpacked = content_key.unpack(&key).expect("failed to unpack"); + let mut file = OpenOptions::new() +@@ -33,7 +38,21 @@ pub async fn run( + file.write_all(&uuid_buf).await.unwrap(); + file.write_all(&*unpacked).await.unwrap(); + file.flush().await.unwrap(); ++ eappx_keys.push_str(&format!( ++ "\"{}\" \"{}\"\n", ++ STANDARD.encode(uuid_buf), ++ STANDARD.encode(&*unpacked), ++ )); + } ++ let mut keys_file = OpenOptions::new() ++ .create(true) ++ .write(true) ++ .truncate(true) ++ .open(format!("{ciks}/eappx-keys.txt")) ++ .await ++ .unwrap(); ++ keys_file.write_all(eappx_keys.as_bytes()).await.unwrap(); ++ keys_file.flush().await.unwrap(); + + ExitCode::SUCCESS + } +diff --git a/crates/xodus-cli/src/commands/streaming.rs b/crates/xodus-cli/src/commands/streaming.rs +index 66e4135..a0136f8 100644 +--- a/crates/xodus-cli/src/commands/streaming.rs ++++ b/crates/xodus-cli/src/commands/streaming.rs +@@ -160,7 +160,19 @@ pub async fn run( + .iter() + .find(|p| p.file_name.ends_with(".msixvc")) + else { +- eprintln!("No .msixvc file found"); ++ // Legacy EAppx titles carry no .msixvc member: their bytes come ++ // from the download command and are unpacked by extract-eappx. ++ let legacy = package.package_files.iter().any(|p| { ++ let name = p.file_name.to_ascii_lowercase(); ++ name.ends_with(".eappx") || name.ends_with(".eappxbundle") ++ }); ++ if legacy { ++ eprintln!( ++ "This title uses a legacy EAppx package; use download then extract-eappx for this title" ++ ); ++ } else { ++ eprintln!("No .msixvc file found"); ++ } + return ExitCode::FAILURE; + }; + let Some(root) = file.cdn_root_paths.first() else { +diff --git a/crates/xodus-cli/src/package_plan.rs b/crates/xodus-cli/src/package_plan.rs +index 6187d56..f784c07 100644 +--- a/crates/xodus-cli/src/package_plan.rs ++++ b/crates/xodus-cli/src/package_plan.rs +@@ -93,7 +93,11 @@ fn inspect(product: &Value, id: &str) -> Result<(Vec, Vec), Stri + .filter(|name| package_family(name)).map(str::to_string); + let durable = kind == "Durable" && parent_product_id.is_some() && main_package_family_name.is_some() + && list(package, "Architectures").iter().any(|arch| arch.as_str() == Some("x64")); +- let supported = desktop && format == "MSIXVC" ++ // Legacy Store packages are installable on PC too. FH4 and other ++ // pre-MSIXVC titles ship as EAPPXBUNDLE/EAPPX and were refused here, ++ // which made the Store offer look unavailable even when owned. ++ let supported = desktop ++ && matches!(format.as_str(), "MSIXVC" | "EAPPX" | "EAPPXBUNDLE") + && (kind == "Game" || kind == "GameAddOn" || durable) + && properties["IsTrial"].as_bool() != Some(true) + && properties["IsPreOrder"].as_bool() != Some(true); +@@ -326,6 +330,17 @@ mod tests { + assert!(plan.select(None).is_err()); assert!(plan.select(Some(CID)).is_ok()); + assert_eq!(plan.json("9CCCCCCCCCCC","US")["status"],"choice"); + } ++ #[test] fn legacy_desktop_package_formats_are_installable() { ++ for format in ["EAPPX", "EAPPXBUNDLE"] { ++ let plan = from_products(ROOT,&BTreeMap::from([(ROOT.into(),package(ROOT,"Windows.Desktop",format))])).unwrap(); ++ assert_eq!(plan.select(None).unwrap(), CID, "{format}"); ++ assert_eq!(plan.json(ROOT,"US")["status"], "ready", "{format}"); ++ } ++ // A console legacy package is still not installable on PC. ++ let plan = from_products(ROOT,&BTreeMap::from([(ROOT.into(),package(ROOT,"Xbox.One","EAPPXBUNDLE"))])).unwrap(); ++ assert!(plan.select(None).is_err()); ++ assert!(plan.select(Some(CID)).is_err()); ++ } + #[test] fn durable_entitlement_back_references_do_not_form_bundle_cycles() { + const DURABLE: &str = "9DDDDDDDDDDD"; + let durable = json!({"ProductId":DURABLE,"ProductType":"Durable", diff --git a/tools/xbox/droiddeck-legacy-run.patch b/tools/xbox/droiddeck-legacy-run.patch new file mode 100644 index 0000000000..d7fbed5853 --- /dev/null +++ b/tools/xbox/droiddeck-legacy-run.patch @@ -0,0 +1,124 @@ +diff --git a/crates/xodus-cli/src/commands/run.rs b/crates/xodus-cli/src/commands/run.rs +index 44ea870..1d8e218 100644 +--- a/crates/xodus-cli/src/commands/run.rs ++++ b/crates/xodus-cli/src/commands/run.rs +@@ -20,6 +20,7 @@ use tokio::process::Command; + use xodus::models::secrets::Token; + use xodus::tokens::TokenManager; + ++use crate::commands::legacy_install::{dependencies, ensure_frameworks}; + use crate::license::get_license; + + const PLAYFAB_RELYING_PARTY: &str = "http://playfab.xboxlive.com/"; +@@ -135,6 +136,98 @@ fn wine_exit_code(status: std::process::ExitStatus) -> u8 { + status.code().unwrap_or_else(|| 128 + status.signal().unwrap_or(1)) as u8 + } + ++/// Start a title that was unpacked into its install folder. ++/// ++/// There is no container to read a content key for or to build a launch view ++/// from, so the named executable runs as it lies, with the PlayFab header the ++/// game signs in with. ++async fn run_unpacked( ++ client: &reqwest::Client, ++ tokens: &TokenManager, ++ folder: &Path, ++ wine: String, ++ exe: Option<&str>, ++ materialize_chain: bool, ++ market: Option, ++) -> ExitCode { ++ let Some(name) = exe.filter(|name| !name.is_empty()) else { ++ eprintln!("no executable was named for the unpacked folder {}", folder.display()); ++ return ExitCode::FAILURE; ++ }; ++ let image = folder.join(name); ++ if !image.is_file() { ++ eprintln!("{} is not in the unpacked folder {}", name, folder.display()); ++ return ExitCode::FAILURE; ++ } ++ // A packaged Win32 program starts like any executable. A UWP application ++ // expects the app model to activate a view first, and this runtime has none, ++ // so say so when the launch dies instead of leaving a loader failure. ++ if let Some(entry) = crate::commands::legacy_install::entry_point(folder) { ++ if !entry.eq_ignore_ascii_case("Windows.FullTrustApplication") { ++ eprintln!("NEXUS_LEGACY_INSTALL_DIAGNOSTIC_V1 uwp-entry-point"); ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 {name} is activated by {entry}, a UWP app model this runtime has no host for"); ++ } ++ } ++ // An unpacked title gets no package graph, so the frameworks its manifest ++ // declares are fetched here the first time it launches. ++ let declared = dependencies(folder); ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 unpacked launch {name} with {} declared frameworks", declared.len()); ++ if !declared.is_empty() { ++ if let Ok(delivery) = crate::commands::store_delivery::client() { ++ let region = market.unwrap_or_else(|| "US".into()).to_uppercase(); ++ if let Err(error) = ensure_frameworks(&delivery, folder, ®ion).await { ++ eprintln!("NEXUS_LEGACY_INSTALL_DETAIL_V1 framework install failed {}", crate::commands::legacy_install::plain_for_log(&error)); ++ } ++ } ++ } ++ let playfab = playfab_auth_header(client, tokens).await; ++ ++ if wine == "droiddeck:prepare" { ++ use std::io::Write; ++ if !materialize_chain { ++ return ExitCode::FAILURE; ++ } ++ let ready = serde_json::json!({ ++ "exe": image, ++ "playfab": playfab, ++ }); ++ println!("DROIDDECK_LAUNCH_V1 {}", ready); ++ let _ = std::io::stdout().flush(); ++ let mut release = String::new(); ++ let _ = std::io::stdin().read_line(&mut release); ++ return ExitCode::SUCCESS; ++ } ++ ++ let mut command = Command::new(&wine); ++ command.arg(&image); ++ match playfab { ++ Some(header) => { ++ command.env("XODUS_XSTS_PLAYFAB", header); ++ } ++ None => eprintln!("could not authorise a PlayFab token; in-game sign-in may fail"), ++ } ++ ++ let mut wn = match command.spawn() { ++ Ok(child) => child, ++ Err(err) => { ++ eprintln!("failed to start Wine: {}", err); ++ return ExitCode::FAILURE; ++ } ++ }; ++ ++ let pid = wn.id().unwrap_or(0); ++ ++ if pid > 0 { ++ let _ = ctrlc::set_handler(move || { ++ let _ = kill(Pid::from_raw(pid as i32), Signal::SIGINT); ++ }); ++ } ++ ++ let status = wn.wait().await.unwrap(); ++ ++ ExitCode::from(wine_exit_code(status)) ++} ++ + // Real files in a full launch view must not be redirected back into memfds. + // Keep source mappings and encrypted DLL mappings; no title/EAC special case. + fn launch_file_maps( +@@ -542,6 +635,12 @@ pub async fn run( + let out_absolute = std::fs::canonicalize(out).unwrap(); + let final_path = out.join(".xodus-streaming.msixvc"); + ++ // A legacy package unpacks where it was installed and keeps no streaming ++ // container, so the folder itself is what gets launched. ++ if !final_path.is_file() { ++ return run_unpacked(client, tokens, &out_absolute, wine, exe.as_deref(), materialize_chain, market).await; ++ } ++ + let mut file = OpenOptions::new() + .read(true) + .open(final_path.to_owned()) diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 3066d9edda..cb243221b2 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -10,7 +10,8 @@ cache = Path(sys.argv[1]).resolve() lock = json.loads((recipe / 'backend.lock.json').read_text()) local_patches = ['droiddeck-credentials.patch', 'droiddeck-launch-view.patch', 'droiddeck-library-subscriptions.patch', 'droiddeck-credential-fallback.patch', 'droiddeck-credential-diagnostics.patch', 'droiddeck-cloud-token.patch', - 'droiddeck-licensing-device-ticket.patch', 'droiddeck-dlc-mount.patch'] + 'droiddeck-licensing-device-ticket.patch', 'droiddeck-dlc-mount.patch', + 'droiddeck-legacy-packages.patch', 'droiddeck-legacy-install.patch', 'droiddeck-legacy-run.patch'] identity = hashlib.sha256((recipe / 'backend.lock.json').read_bytes() + b''.join((recipe / name).read_bytes() for name in local_patches)).hexdigest() source = cache / ('source-' + identity[:16]) if not (source / '.prepared').is_file(): From e4404fbb92788aa7e9ed00d200d7df5a52c9cc3d Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Wed, 18 Nov 2026 21:09:38 +0100 Subject: [PATCH 36/60] perf(hud): throttle FPS-graph redraws for every HUD size (#2843) Only the Strip size limited graph redraws; Minimal, Pill, Tiles and Mega invalidated on every display frame for the whole session. All sizes now redraw the graph at most once per GRAPH_REDRAW_MS (66 ms). Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> --- .../com/droiddeck/launcher/hud/DroidDeckHudView.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index bd04d149a2..21734186dd 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -290,11 +290,9 @@ class DroidDeckHudView(context: Context) : View(context) { periodDone.trySend(Unit) } if (graphRect == null) return - if (stripRect != null) { - val now = SystemClock.uptimeMillis() - if (now - lastGraphDrawMs < STRIP_GRAPH_REDRAW_MS) return - lastGraphDrawMs = now - } + val now = SystemClock.uptimeMillis() + if (now - lastGraphDrawMs < GRAPH_REDRAW_MS) return + lastGraphDrawMs = now invalidate() } @@ -1267,7 +1265,7 @@ class DroidDeckHudView(context: Context) : View(context) { const val TAB_PAD_X_SP = 7f const val TAB_PAD_Y_SP = 5.5f const val REFRESH_MS = 500L - const val STRIP_GRAPH_REDRAW_MS = 66L + const val GRAPH_REDRAW_MS = 66L private const val HUE_IDLE_MS = 500L const val MIN_SCALE = 0.5f const val MAX_SCALE = 2f From 24f5fa20f8e5cc582093ab757f448265c9fe4a84 Mon Sep 17 00:00:00 2001 From: Tapuuk Date: Wed, 18 Nov 2026 21:10:14 +0100 Subject: [PATCH 37/60] fix(session): show the recorded reason when a session fails to start (#2841) * fix(session): show the recorded reason when a session fails to start The ended screen now shows any recorded start-up failure message except a plain guest exit, not only PROOT_MISSING. The graphics runtime staging and game environment publish failures now record GRAPHICS_RUNTIME_FAILED and GAME_ENVIRONMENT_FAILED with their own messages instead of looking like a guest exit. * i18n(session): translate the start failure messages --------- Co-authored-by: Tapuuk <177422350+Tapuuk@users.noreply.github.com> Co-authored-by: maxjivi05 --- .../com/droiddeck/launcher/SessionActivity.kt | 7 +++--- .../launcher/session/SessionService.kt | 2 ++ app/src/main/res/values-ar/strings.xml | 2 ++ app/src/main/res/values-b+es+419/strings.xml | 2 ++ app/src/main/res/values-bg/strings.xml | 2 ++ app/src/main/res/values-cs/strings.xml | 2 ++ app/src/main/res/values-da/strings.xml | 2 ++ app/src/main/res/values-de/strings.xml | 2 ++ app/src/main/res/values-el/strings.xml | 2 ++ app/src/main/res/values-es/strings.xml | 2 ++ app/src/main/res/values-fi/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values-hi/strings.xml | 2 ++ app/src/main/res/values-hu/strings.xml | 2 ++ app/src/main/res/values-in/strings.xml | 2 ++ app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 2 ++ app/src/main/res/values-ko/strings.xml | 2 ++ app/src/main/res/values-ms/strings.xml | 2 ++ app/src/main/res/values-nb/strings.xml | 2 ++ app/src/main/res/values-nl/strings.xml | 2 ++ app/src/main/res/values-pl/strings.xml | 2 ++ app/src/main/res/values-pt-rPT/strings.xml | 2 ++ app/src/main/res/values-pt/strings.xml | 2 ++ app/src/main/res/values-ro/strings.xml | 2 ++ app/src/main/res/values-ru/strings.xml | 2 ++ app/src/main/res/values-sv/strings.xml | 2 ++ app/src/main/res/values-th/strings.xml | 2 ++ app/src/main/res/values-tr/strings.xml | 2 ++ app/src/main/res/values-uk/strings.xml | 2 ++ app/src/main/res/values-vi/strings.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 2 ++ app/src/main/res/values-zh-rHK/strings.xml | 2 ++ app/src/main/res/values-zh-rTW/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ .../launcher/session/SessionEndHintTest.kt | 24 +++++++++++++++++++ 36 files changed, 96 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 5a95f1de4d..52e9eeccee 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -3304,8 +3304,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } } - private fun prootFailureHint(): EndHint? { - if (SessionState.failureCode != "PROOT_MISSING") return null + private fun startFailureHint(): EndHint? { + val code = SessionState.failureCode ?: return null + if (code == "GUEST_EXIT") return null val message = SessionState.failureMessage ?: return null return EndHint(message) } @@ -3315,7 +3316,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun sessionExitHint(status: Int): EndHint? = if (status == 0) presentationFaultHint() - else runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) ?: prootFailureHint() + else runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) ?: startFailureHint() private fun sessionEndHint(log: File?): EndHint? { presentationFaultHint()?.let { return it } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index f9ea8582d2..9c8e6fe2c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -566,6 +566,7 @@ class SessionService : Service() { SessionFiles.stage(this, root, startsSession = true) } catch (error: Exception) { Log.e(TAG, "Could not prepare the session graphics runtime", error) + failSession(gen, "GRAPHICS_RUNTIME_FAILED", getString(R.string.session_graphics_runtime_failed), -1) stopSession(-1, gen) return } @@ -589,6 +590,7 @@ class SessionService : Service() { SessionEvents.step("game-environment") { GameEnvironmentStore.publish(this) } } catch (e: Exception) { Log.e(TAG, "could not publish the game environment", e) + failSession(gen, "GAME_ENVIRONMENT_FAILED", getString(R.string.session_game_environment_failed), -1) stopSession(-1, gen) abandonStart(gen, sessionDir) return diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 945453d05e..e92f6f47e2 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -203,6 +203,8 @@ هذا البرنامج مبني لأجهزة كمبيوتر %1$s ويعمل عبر FEX، الذي لم يتم إعداده بعد. افتح Steam مرة واحدة أثناء تسجيل الدخول: سيجعله DroidDeck يُنزّل FEX وSteam Linux Runtime اللازمة، ثم يُفتح هذا البرنامج. تعذّر تنزيل proot الخاص بـ DroidDeck. تحقّق من الاتصال وحاول مرة أخرى. لم تبدأ الجلسة لأن proot الاحتياطي أبطأ من أن يصلح للعب. تعذّر تنزيل بيئة رسومات PowerVR. تحقق من الاتصال وحاول مرة أخرى. + تعذّر تجهيز بيئة الرسومات، لذا لم تبدأ الجلسة. + تعذّر إعداد بيئة اللعبة، لذا لم تبدأ الجلسة. تعذّر تنزيل DirectAudio، لذا يستخدم صوت الألعاب المسار الأبطأ في هذه الجلسة. هذا البرنامج لم تتمكن الجلسة من الرسم على الشاشة: %1$s. تعرض هذه الشاشة السبب بدلًا من شاشة سوداء؛ والتفاصيل في سجلات الجلسة. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index a0fc0812bd..c754689975 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -203,6 +203,8 @@ Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá. No se pudo descargar el proot de DroidDeck. Revisa la conexión e inténtalo de nuevo. La sesión no se inició porque el proot alternativo es demasiado lento para jugar. No se pudo descargar el entorno gráfico de PowerVR. Revisa la conexión e inténtalo de nuevo. + No se pudo preparar el entorno gráfico, así que la sesión no se inició. + No se pudo configurar el entorno del juego, así que la sesión no se inició. No se pudo descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión. Este programa La sesión no pudo dibujar en la pantalla: %1$s. En lugar de una pantalla negra, esta pantalla muestra el motivo; los registros de la sesión tienen los detalles. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 821fc8788a..e5c8de89cb 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -203,6 +203,8 @@ Тази програма е компилирана за %1$s компютри и се стартира през FEX, който още не е настроен. Отворете Steam веднъж, докато сте влезли: DroidDeck ще изтегли FEX и необходимата Steam Linux Runtime, след което тя ще се отвори. proot на DroidDeck не можа да бъде изтеглен. Проверете връзката и опитайте пак. Сесията не беше стартирана, защото резервният proot е твърде бавен за игра. Графичната среда за PowerVR не можа да бъде изтеглена. Проверете връзката и опитайте отново. + Графичната среда не можа да бъде подготвена, затова сесията не беше стартирана. + Средата на играта не можа да бъде настроена, затова сесията не беше стартирана. DirectAudio не можа да бъде изтеглен, затова звукът на игрите използва по-бавния път в тази сесия. Тази програма Сесията не успя да изобрази съдържание на екрана: %1$s. Вместо черен екран тук е показана причината; подробностите са в дневниците на сесията. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 285e30109d..370a0eea68 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -203,6 +203,8 @@ Tento program je sestaven pro PC %1$s a běží přes FEX, který ještě není nastaven. Jednou spusťte přihlášený Steam: DroidDeck tím stáhne FEX a Steam Linux Runtime, který potřebuje, a pak se tento program otevře. Proot od DroidDeck se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu. Relace nebyla spuštěna, protože záložní proot je na hraní příliš pomalý. Grafické prostředí PowerVR se nepodařilo stáhnout. Zkontrolujte připojení a zkuste to znovu. + Grafické prostředí se nepodařilo připravit, a proto relace nebyla spuštěna. + Herní prostředí se nepodařilo nastavit, a proto relace nebyla spuštěna. DirectAudio se nepodařilo stáhnout, takže zvuk her v této relaci používá pomalejší cestu. Tento program Relaci se nepodařilo vykreslit na obrazovku: %1$s. Místo černé obrazovky je zde důvod; podrobnosti jsou v protokolech relace. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 55cc16e75b..ea39e14dea 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -203,6 +203,8 @@ Dette program er bygget til %1$s-pc’er og køres via FEX, som ikke er sat op endnu. Åbn Steam én gang, mens du er logget ind: DroidDeck downloader så FEX og den Steam Linux Runtime, det kræver, hvorefter dette åbner. DroidDecks proot kunne ikke downloades. Tjek forbindelsen, og prøv igen. Sessionen blev ikke startet, fordi reserve-proot er for langsom at spille på. PowerVR-grafikmiljøet kunne ikke hentes. Tjek forbindelsen, og prøv igen. + Grafikmiljøet kunne ikke klargøres, så sessionen blev ikke startet. + Spilmiljøet kunne ikke sættes op, så sessionen blev ikke startet. DirectAudio kunne ikke downloades, så spillyd bruger den langsommere vej i denne session. Dette program Sessionen kunne ikke tegne på skærmen: %1$s. Denne skærm viser hvorfor i stedet for en sort skærm; sessionens logfiler indeholder detaljerne. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 82e4fe4a75..e8b4ccd022 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -203,6 +203,8 @@ Dieses Programm ist für %1$s-PCs gebaut und läuft über FEX, das noch nicht eingerichtet ist. Öffne Steam einmal, während du angemeldet bist: DroidDeck lässt es FEX und die nötige Steam Linux Runtime herunterladen, danach lässt sich das Programm öffnen. DroidDecks proot konnte nicht heruntergeladen werden. Prüfe die Verbindung und versuch es erneut. Die Sitzung wurde nicht gestartet, da das Ersatz-proot zum Spielen zu langsam ist. Die PowerVR-Grafikumgebung konnte nicht heruntergeladen werden. Prüfe die Verbindung und versuch es erneut. + Die Grafikumgebung konnte nicht vorbereitet werden, daher wurde die Sitzung nicht gestartet. + Die Spielumgebung konnte nicht eingerichtet werden, daher wurde die Sitzung nicht gestartet. DirectAudio konnte nicht heruntergeladen werden, daher nutzt der Spielton in dieser Sitzung den langsameren Weg. Dieses Programm Die Sitzung konnte nicht auf den Bildschirm zeichnen: %1$s. Auf diesem Bildschirm sehen Sie den Grund statt eines schwarzen Bildschirms; die Details finden Sie in den Sitzungsprotokollen. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 824ee992f2..42baf8965a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -203,6 +203,8 @@ Αυτό το πρόγραμμα είναι χτισμένο για υπολογιστές %1$s και εκτελείται μέσω FEX, το οποίο δεν έχει ρυθμιστεί ακόμα. Ανοίξτε το Steam μία φορά ενώ είστε συνδεδεμένοι: το DroidDeck κάνει λήψη του FEX και του Steam Linux Runtime που χρειάζεται, και μετά αυτό ανοίγει. Δεν ήταν δυνατή η λήψη του proot του DroidDeck. Ελέγξτε τη σύνδεση και δοκιμάστε ξανά. Η συνεδρία δεν ξεκίνησε, επειδή το εναλλακτικό proot είναι πολύ αργό για παιχνίδι. Δεν ήταν δυνατή η λήψη του γραφικού περιβάλλοντος PowerVR. Ελέγξτε τη σύνδεση και δοκιμάστε ξανά. + Δεν ήταν δυνατή η προετοιμασία του γραφικού περιβάλλοντος, οπότε η συνεδρία δεν ξεκίνησε. + Δεν ήταν δυνατή η ρύθμιση του περιβάλλοντος του παιχνιδιού, οπότε η συνεδρία δεν ξεκίνησε. Δεν ήταν δυνατή η λήψη του DirectAudio, οπότε ο ήχος των παιχνιδιών χρησιμοποιεί την πιο αργή διαδρομή σε αυτή τη συνεδρία. Αυτό το πρόγραμμα Η συνεδρία δεν μπόρεσε να σχεδιάσει στην οθόνη: %1$s. Αυτή η οθόνη δείχνει τον λόγο αντί να είναι μαύρη· οι λεπτομέρειες βρίσκονται στα αρχεία καταγραφής της συνεδρίας. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 587809e30e..38ada10bda 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -203,6 +203,8 @@ Este programa está hecho para PC %1$s y se ejecuta con FEX, que aún no está listo. Abre Steam una vez con tu sesión iniciada: DroidDeck hará que descargue FEX y el Steam Linux Runtime que necesita, y después se abrirá. No se ha podido descargar el proot de DroidDeck. Comprueba la conexión y vuelve a intentarlo. La sesión no se ha iniciado porque el proot alternativo es demasiado lento para jugar. No se pudo descargar el entorno gráfico de PowerVR. Comprueba la conexión e inténtalo de nuevo. + No se pudo preparar el entorno gráfico, así que la sesión no se inició. + No se pudo configurar el entorno del juego, así que la sesión no se inició. No se ha podido descargar DirectAudio, así que el audio de los juegos usa la ruta más lenta en esta sesión. Este programa La sesión no pudo dibujar en la pantalla: %1$s. En lugar de mostrarse una pantalla negra, esta pantalla explica el motivo; los registros de la sesión contienen los detalles. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index ed435167da..b912a7cf0b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -203,6 +203,8 @@ Tämä ohjelma on tehty %1$s-tietokoneille ja käynnistyy FEXin kautta, jota ei ole vielä määritetty. Avaa Steam kerran kirjautuneena: DroidDeck lataa sen myötä FEXin ja tarvittavan Steam Linux Runtimen, jonka jälkeen tämä avautuu. DroidDeckin proota ei voitu ladata. Tarkista yhteys ja yritä uudelleen. Istuntoa ei käynnistetty, koska varaproot on liian hidas pelaamiseen. PowerVR-grafiikkaympäristöä ei voitu ladata. Tarkista yhteys ja yritä uudelleen. + Grafiikkaympäristöä ei voitu valmistella, joten istuntoa ei käynnistetty. + Peliympäristöä ei voitu määrittää, joten istuntoa ei käynnistetty. DirectAudiota ei voitu ladata, joten pelin ääni käyttää tässä istunnossa hitaampaa reittiä. Tämä ohjelma Istunto ei pystynyt piirtämään näytölle: %1$s. Mustan ruudun sijaan tämä näyttö kertoo syyn. Tarkemmat tiedot ovat istuntolokeissa. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index df6896bd4f..c889818314 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -203,6 +203,8 @@ Ce programme est conçu pour les PC %1$s et s\'exécute via FEX, qui n\'est pas encore configuré. Ouvrez Steam une fois en étant connecté : DroidDeck lui fait télécharger FEX et le Steam Linux Runtime nécessaires, puis ce programme s\'ouvre. Impossible de télécharger le proot de DroidDeck. Vérifiez la connexion et réessayez. La session n\'a pas été démarrée, car le proot de secours est trop lent pour jouer. L\'environnement graphique PowerVR n\'a pas pu être téléchargé. Vérifiez la connexion et réessayez. + L\'environnement graphique n\'a pas pu être préparé, la session n\'a donc pas été lancée. + L\'environnement de jeu n\'a pas pu être configuré, la session n\'a donc pas été lancée. Impossible de télécharger DirectAudio ; l\'audio des jeux utilise le chemin plus lent pour cette session. Ce programme La session n\'a pas pu dessiner à l\'écran : %1$s. Cet écran affiche la raison au lieu d\'un écran noir ; les journaux de la session contiennent les détails. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 5e9a887d3d..d26bbc324c 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -203,6 +203,8 @@ यह प्रोग्राम %1$s पीसी के लिए बना है और FEX के ज़रिए चलता है, जो अभी सेट नहीं है। साइन इन रहते हुए Steam एक बार खोलें: DroidDeck इससे FEX और ज़रूरी Steam Linux Runtime डाउनलोड करवा लेगा, फिर यह खुल जाएगा। DroidDeck का proot डाउनलोड नहीं हो सका। कनेक्शन जांचें और फिर कोशिश करें। सेशन शुरू नहीं किया गया, क्योंकि बैकअप proot खेलने के लिए बहुत धीमा है। PowerVR ग्राफ़िक्स एनवायरमेंट डाउनलोड नहीं हो सका। कनेक्शन जाँचें और फिर कोशिश करें। + ग्राफ़िक्स एनवायरमेंट तैयार नहीं हो सका, इसलिए सेशन शुरू नहीं हुआ। + गेम एनवायरमेंट सेट अप नहीं हो सका, इसलिए सेशन शुरू नहीं हुआ। DirectAudio डाउनलोड नहीं हो सका, इसलिए इस सेशन में गेम ऑडियो धीमा पाथ इस्तेमाल करता है। यह प्रोग्राम सत्र स्क्रीन पर ड्रॉ नहीं कर सका: %1$s। काली स्क्रीन के बजाय यह स्क्रीन कारण दिखाती है; पूरा विवरण सत्र लॉग में है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a63d2e9c5b..6563b39d2d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -203,6 +203,8 @@ Ez a program %1$s PC-khez készült, és a FEX-en keresztül fut, amely még nincs beállítva. Nyissa meg egyszer a Steamet bejelentkezve: a DroidDeck ekkor letölti a FEX-et és a szükséges Steam Linux Runtime-ot, majd ez megnyílik. A DroidDeck proot nem tölthető le. Ellenőrizze a kapcsolatot, és próbálja újra. A munkamenet nem indult el, mert a tartalék proot túl lassú a játékhoz. A PowerVR grafikus környezetet nem sikerült letölteni. Ellenőrizd a kapcsolatot, és próbáld újra. + A grafikus környezetet nem sikerült előkészíteni, ezért a munkamenet nem indult el. + A játékkörnyezetet nem sikerült beállítani, ezért a munkamenet nem indult el. A DirectAudio nem tölthető le, ezért a játékhang ebben a munkamenetben a lassabb útvonalat használja. Ez a program A munkamenet nem tudta megjeleníteni a képet a képernyőn: %1$s. Fekete képernyő helyett ez a képernyő mutatja az okot; a részletek a munkamenet naplóiban találhatók. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fb83ce5228..1cc8c8a9c1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -203,6 +203,8 @@ Program ini dibuat untuk PC %1$s dan berjalan melalui FEX, yang belum disiapkan. Buka Steam sekali saat masuk: DroidDeck akan mengunduh FEX dan Steam Linux Runtime yang diperlukan, lalu ini akan terbuka. proot DroidDeck tidak dapat diunduh. Periksa koneksi lalu coba lagi. Sesi tidak dimulai karena proot cadangan terlalu lambat untuk bermain. Lingkungan grafis PowerVR tidak dapat diunduh. Periksa koneksi dan coba lagi. + Lingkungan grafis tidak dapat disiapkan, jadi sesi tidak dimulai. + Lingkungan game tidak dapat disiapkan, jadi sesi tidak dimulai. DirectAudio tidak dapat diunduh, jadi audio gim menggunakan jalur yang lebih lambat di sesi ini. Program ini Sesi gagal menampilkan gambar ke layar: %1$s. Layar ini menunjukkan alasannya, bukan layar hitam; rinciannya ada di log sesi. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 88838f1748..296ea93f8d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -203,6 +203,8 @@ Questo programma è compilato per PC %1$s e viene eseguito tramite FEX, che non è ancora configurato. Apri Steam una volta dopo aver eseguito l\'accesso: DroidDeck gli farà scaricare FEX e lo Steam Linux Runtime necessario, poi il programma si aprirà. Impossibile scaricare il proot di DroidDeck. Controlla la connessione e riprova. La sessione non è stata avviata perché il proot di riserva è troppo lento per giocare. Non è stato possibile scaricare l\'ambiente grafico PowerVR. Controlla la connessione e riprova. + Non è stato possibile preparare l\'ambiente grafico, quindi la sessione non è stata avviata. + Non è stato possibile configurare l\'ambiente di gioco, quindi la sessione non è stata avviata. Impossibile scaricare DirectAudio, quindi l\'audio dei giochi usa il percorso più lento in questa sessione. Questo programma La sessione non è riuscita a disegnare sullo schermo: %1$s. Questa schermata mostra il motivo al posto di una schermata nera; i log della sessione contengono i dettagli. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 94d29d8716..3a616a8570 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -203,6 +203,8 @@ このプログラムは%1$s PC向けにビルドされており、FEX経由で実行されますが、FEXはまだセットアップされていません。ログインした状態で一度Steamを開いてください。DroidDeckがFEXと必要なSteam Linux Runtimeをダウンロードした後、このプログラムが開きます。 DroidDeckのprootをダウンロードできませんでした。接続を確認して、もう一度お試しください。代替のprootではプレイするには遅すぎるため、セッションは開始されませんでした。 PowerVRのグラフィックス環境をダウンロードできませんでした。接続を確認して、もう一度お試しください。 + グラフィックス環境を準備できなかったため、セッションを開始しませんでした。 + ゲーム環境を設定できなかったため、セッションを開始しませんでした。 DirectAudioをダウンロードできなかったため、このセッションではゲーム音声に低速な経路を使用します。 このプログラム セッションが画面に描画できませんでした: %1$s。黒い画面の代わりに、この画面で理由を表示しています。詳細はセッションログにあります。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4f8de4c21a..78182d217a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -203,6 +203,8 @@ 이 프로그램은 %1$s PC용으로 빌드되어 FEX를 통해 실행되지만, FEX가 아직 설정되지 않았습니다. 로그인한 상태로 Steam을 한 번 열면 DroidDeck이 FEX와 필요한 Steam Linux Runtime을 다운로드한 후 이 프로그램을 엽니다. DroidDeck의 proot를 다운로드할 수 없습니다. 연결을 확인하고 다시 시도하세요. 대체 proot는 플레이하기에 너무 느리므로 세션을 시작하지 않았습니다. PowerVR 그래픽 환경을 다운로드하지 못했습니다. 연결을 확인하고 다시 시도하세요. + 그래픽 환경을 준비하지 못해 세션을 시작하지 않았습니다. + 게임 환경을 설정하지 못해 세션을 시작하지 않았습니다. DirectAudio를 다운로드할 수 없어 이번 세션에서는 게임 오디오가 더 느린 경로를 사용합니다. 이 프로그램 세션이 화면을 그리지 못했습니다: %1$s. 검은 화면 대신 이 화면에 이유를 표시합니다. 자세한 내용은 세션 로그에 있습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 3a79bb392d..8ac9fe26ef 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -203,6 +203,8 @@ Program ini dibina untuk PC %1$s dan berjalan melalui FEX, yang belum disediakan lagi. Buka Steam sekali semasa anda log masuk: DroidDeck akan memuat turun FEX dan Steam Linux Runtime yang diperlukan, kemudian ini akan dibuka. proot DroidDeck tidak dapat dimuat turun. Semak sambungan dan cuba lagi. Sesi tidak dimulakan kerana proot sandaran terlalu perlahan untuk bermain. Persekitaran grafik PowerVR tidak dapat dimuat turun. Semak sambungan dan cuba lagi. + Persekitaran grafik tidak dapat disediakan, jadi sesi tidak dimulakan. + Persekitaran permainan tidak dapat disediakan, jadi sesi tidak dimulakan. DirectAudio tidak dapat dimuat turun, jadi audio permainan menggunakan laluan yang lebih perlahan untuk sesi ini. Program ini Sesi gagal melukis pada skrin: %1$s. Skrin ini menunjukkan sebabnya, bukannya skrin hitam; butiran ada dalam log sesi. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b7aefa8a96..dc2dc6ec18 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -203,6 +203,8 @@ Dette programmet er bygget for %1$s-PC-er og kjører via FEX, som ikke er satt opp ennå. Åpne Steam én gang mens du er innlogget: DroidDeck lar den laste ned FEX og Steam Linux Runtime den trenger, og så åpnes dette. Kunne ikke laste ned DroidDecks proot. Sjekk tilkoblingen og prøv igjen. Sesjonen ble ikke startet, fordi reserve-proot er for treg til å spille på. PowerVR-grafikkmiljøet kunne ikke lastes ned. Sjekk tilkoblingen og prøv igjen. + Grafikkmiljøet kunne ikke klargjøres, så økten ble ikke startet. + Spillmiljøet kunne ikke settes opp, så økten ble ikke startet. Kunne ikke laste ned DirectAudio, så spillyd bruker den tregere veien i denne sesjonen. Dette programmet Økten kunne ikke tegne på skjermen: %1$s. Denne skjermen viser hvorfor i stedet for en svart skjerm; detaljene finnes i loggene for økten. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 76ff862bef..1ae36c1cad 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -203,6 +203,8 @@ Dit programma is gemaakt voor %1$s-pc’s en draait via FEX, dat nog niet is ingesteld. Open Steam één keer terwijl je bent ingelogd: DroidDeck laat het dan FEX en de benodigde Steam Linux Runtime downloaden. Daarna opent dit. De proot van DroidDeck kon niet worden gedownload. Controleer de verbinding en probeer het opnieuw. De sessie is niet gestart, omdat de reserve-proot te traag is om op te spelen. De PowerVR-grafische omgeving kon niet worden gedownload. Controleer de verbinding en probeer het opnieuw. + De grafische omgeving kon niet worden voorbereid, dus de sessie is niet gestart. + De spelomgeving kon niet worden ingesteld, dus de sessie is niet gestart. DirectAudio kon niet worden gedownload, dus gamegeluid gebruikt deze sessie de tragere route. Dit programma De sessie kon niet op het scherm tekenen: %1$s. Dit scherm laat zien waarom, in plaats van een zwart scherm; de details staan in de sessielogboeken. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c39caf2a40..dd47a73b5d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -203,6 +203,8 @@ Ten program jest zbudowany dla komputerów %1$s i działa przez FEX, który nie jest jeszcze skonfigurowany. Otwórz raz Steam po zalogowaniu: DroidDeck pobierze wtedy FEX i potrzebne Steam Linux Runtime, a potem program się otworzy. Nie udało się pobrać proot DroidDeck. Sprawdź połączenie i spróbuj ponownie. Sesja nie została uruchomiona, bo zapasowy proot jest zbyt wolny do grania. Nie udało się pobrać środowiska graficznego PowerVR. Sprawdź połączenie i spróbuj ponownie. + Nie udało się przygotować środowiska graficznego, więc sesja nie została uruchomiona. + Nie udało się skonfigurować środowiska gry, więc sesja nie została uruchomiona. Nie udało się pobrać DirectAudio, więc w tej sesji dźwięk gier używa wolniejszej ścieżki. Ten program Sesja nie mogła wyświetlić obrazu na ekranie: %1$s. Ten ekran pokazuje przyczynę zamiast czarnego obrazu; szczegóły znajdują się w logach sesji. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3956a1e206..fdb7974b59 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -203,6 +203,8 @@ Este programa foi compilado para PCs %1$s e é executado através do FEX, que ainda não está configurado. Abra o Steam uma vez com a sessão iniciada: o DroidDeck transfere o FEX e o Steam Linux Runtime necessários e, depois, este programa abre. Não foi possível transferir o proot do DroidDeck. Verifique a ligação e tente novamente. A sessão não foi iniciada, porque o proot alternativo é demasiado lento para jogar. Não foi possível transferir o ambiente gráfico PowerVR. Verifique a ligação e tente novamente. + Não foi possível preparar o ambiente gráfico, pelo que a sessão não foi iniciada. + Não foi possível configurar o ambiente do jogo, pelo que a sessão não foi iniciada. Não foi possível transferir o DirectAudio, por isso o áudio dos jogos utiliza o caminho mais lento nesta sessão. Este programa A sessão não conseguiu desenhar no ecrã: %1$s. Este ecrã mostra o motivo em vez de um ecrã preto; os registos da sessão têm os detalhes. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 405ad5bd06..d29261a8a7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -203,6 +203,8 @@ Este programa é feito para PCs %1$s e roda pelo FEX, que ainda não está configurado. Abra a Steam uma vez com a sessão iniciada: o DroidDeck faz com que ela baixe o FEX e o Steam Linux Runtime necessários, e então isto abre. Não foi possível baixar o proot do DroidDeck. Verifique a conexão e tente novamente. A sessão não foi iniciada, porque o proot alternativo é lento demais para jogar. Não foi possível baixar o ambiente gráfico PowerVR. Verifique a conexão e tente novamente. + Não foi possível preparar o ambiente gráfico, então a sessão não foi iniciada. + Não foi possível configurar o ambiente do jogo, então a sessão não foi iniciada. Não foi possível baixar o DirectAudio, então o áudio dos jogos usa o caminho mais lento nesta sessão. Este programa A sessão não conseguiu desenhar na tela: %1$s. Esta tela mostra o motivo no lugar de uma tela preta; os logs da sessão trazem os detalhes. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 29500e74e0..fff6f62692 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -203,6 +203,8 @@ Acest program este compilat pentru PC-uri %1$s și rulează prin FEX, care nu este încă configurat. Deschide Steam o dată, fiind autentificat: DroidDeck îl pune să descarce FEX și Steam Linux Runtime de care are nevoie, apoi acesta se deschide. Proot-ul DroidDeck nu a putut fi descărcat. Verifică conexiunea și încearcă din nou. Sesiunea nu a fost pornită, deoarece proot-ul de rezervă este prea lent pentru jocuri. Mediul grafic PowerVR nu a putut fi descărcat. Verifică conexiunea și încearcă din nou. + Mediul grafic nu a putut fi pregătit, așa că sesiunea nu a pornit. + Mediul jocului nu a putut fi configurat, așa că sesiunea nu a pornit. DirectAudio nu a putut fi descărcat, așa că sunetul jocurilor folosește calea mai lentă în această sesiune. Acest program Sesiunea nu a putut reda pe ecran: %1$s. Acest ecran arată motivul în locul unui ecran negru; detaliile sunt în jurnalele sesiunii. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1f3786b96a..c1e27d2a5a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -203,6 +203,8 @@ Эта программа собрана для ПК на %1$s и работает через FEX, который еще не настроен. Откройте Steam один раз, войдя в аккаунт: DroidDeck скачает через него FEX и нужную Steam Linux Runtime, после чего программа откроется. Не удалось скачать proot DroidDeck. Проверьте подключение и повторите попытку. Сессия не запущена, так как резервный proot слишком медленный для игры. Не удалось скачать графическую среду PowerVR. Проверьте подключение и повторите попытку. + Не удалось подготовить графическую среду, поэтому сеанс не запущен. + Не удалось настроить игровую среду, поэтому сеанс не запущен. Не удалось скачать DirectAudio, поэтому в этой сессии звук игр идёт по более медленному пути. Эта программа Сеансу не удалось вывести изображение на экран: %1$s. Вместо чёрного экрана здесь показана причина; подробности в журналах сеанса. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ec494e1952..f2732a0c90 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -203,6 +203,8 @@ Programmet är byggt för %1$s-datorer och körs via FEX, som inte har konfigurerats än. Öppna Steam en gång medan du är inloggad: DroidDeck låter Steam ladda ned FEX och den Steam Linux Runtime som behövs, sedan öppnas detta. Det gick inte att ladda ned DroidDecks proot. Kontrollera anslutningen och försök igen. Sessionen startades inte eftersom reserv-proot är för långsam att spela på. PowerVR-grafikmiljön kunde inte laddas ned. Kontrollera anslutningen och försök igen. + Grafikmiljön kunde inte förberedas, så sessionen startades inte. + Spelmiljön kunde inte konfigureras, så sessionen startades inte. Det gick inte att ladda ned DirectAudio, så spelljudet använder den långsammare vägen den här sessionen. Det här programmet Sessionen kunde inte rita på skärmen: %1$s. Den här skärmen visar orsaken i stället för att vara svart; detaljerna finns i sessionsloggarna. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9172d0931c..89147a62cf 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -203,6 +203,8 @@ โปรแกรมนี้สร้างมาสำหรับพีซี %1$s และรันผ่าน FEX ซึ่งยังไม่ได้ตั้งค่า เปิด Steam สักครั้งขณะลงชื่อเข้าใช้: DroidDeck จะดาวน์โหลด FEX และ Steam Linux Runtime ที่จำเป็น จากนั้นโปรแกรมนี้จะเปิดขึ้น ดาวน์โหลด proot ของ DroidDeck ไม่ได้ ตรวจสอบการเชื่อมต่อแล้วลองใหม่ เซสชันไม่ได้เริ่มเพราะ proot สำรองช้าเกินกว่าจะเล่นได้ ดาวน์โหลดสภาพแวดล้อมกราฟิก PowerVR ไม่สำเร็จ ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง + เตรียมสภาพแวดล้อมกราฟิกไม่สำเร็จ จึงไม่ได้เริ่มเซสชัน + ตั้งค่าสภาพแวดล้อมของเกมไม่สำเร็จ จึงไม่ได้เริ่มเซสชัน ดาวน์โหลด DirectAudio ไม่ได้ เสียงเกมในเซสชันนี้จึงใช้เส้นทางที่ช้ากว่า โปรแกรมนี้ เซสชันไม่สามารถแสดงผลบนหน้าจอได้: %1$s หน้าจอนี้แสดงสาเหตุแทนที่จะเป็นหน้าจอสีดำ รายละเอียดอยู่ในบันทึกของเซสชัน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 29153e59f3..84ccc32c35 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -203,6 +203,8 @@ Bu program %1$s PC\'ler için derlenmiş ve FEX ile çalışır, ancak FEX henüz kurulmadı. Oturum açmışken Steam\'i bir kez açın: DroidDeck, FEX\'i ve gereken Steam Linux Runtime\'ı indirtir, ardından bu program açılır. DroidDeck\'in proot\'u indirilemedi. Bağlantıyı kontrol edip tekrar deneyin. Yedek proot oynamak için fazla yavaş olduğundan oturum başlatılmadı. PowerVR grafik ortamı indirilemedi. Bağlantıyı kontrol edip tekrar deneyin. + Grafik ortamı hazırlanamadı, bu yüzden oturum başlatılmadı. + Oyun ortamı ayarlanamadı, bu yüzden oturum başlatılmadı. DirectAudio indirilemedi, bu yüzden oyun sesi bu oturumda daha yavaş yolu kullanıyor. Bu program Oturum ekrana görüntü çizemedi: %1$s. Bu ekran, siyah bir ekran yerine nedenini gösteriyor; ayrıntılar oturum günlüklerinde. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3af14ceaf0..17d3a83830 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -203,6 +203,8 @@ Цю програму зібрано для ПК з архітектурою %1$s, і вона працює через FEX, який ще не налаштовано. Один раз відкрийте Steam, увійшовши в обліковий запис: DroidDeck завантажить FEX і потрібний йому Steam Linux Runtime, після чого програма відкриється. Не вдалося завантажити proot DroidDeck. Перевірте зʼєднання та спробуйте ще раз. Сеанс не запущено, бо резервний proot занадто повільний для гри. Не вдалося завантажити графічне середовище PowerVR. Перевірте підключення й повторіть спробу. + Не вдалося підготувати графічне середовище, тому сеанс не запущено. + Не вдалося налаштувати ігрове середовище, тому сеанс не запущено. Не вдалося завантажити DirectAudio, тому в цьому сеансі звук ігор іде повільнішим шляхом. Ця програма Сеанс не зміг вивести зображення на екран: %1$s. Замість чорного екрана тут показано причину; подробиці — у журналах сеансу. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ed29d93e42..34ec1d90bc 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -203,6 +203,8 @@ Chương trình này được build cho PC %1$s và chạy qua FEX, hiện chưa được thiết lập. Mở Steam một lần khi đã đăng nhập: DroidDeck sẽ tải FEX và Steam Linux Runtime cần thiết, sau đó ứng dụng này sẽ mở. Không thể tải proot của DroidDeck. Hãy kiểm tra kết nối rồi thử lại. Phiên chưa được khởi động vì proot dự phòng quá chậm để chơi. Không thể tải môi trường đồ họa PowerVR. Hãy kiểm tra kết nối rồi thử lại. + Không thể chuẩn bị môi trường đồ họa nên phiên chưa được khởi động. + Không thể thiết lập môi trường trò chơi nên phiên chưa được khởi động. Không thể tải DirectAudio, nên âm thanh game dùng đường chậm hơn trong phiên này. Chương trình này Phiên không thể vẽ lên màn hình: %1$s. Màn hình này cho biết lý do thay vì màn hình đen; chi tiết nằm trong nhật ký phiên. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2daf99deba..aa10c5ccf6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -203,6 +203,8 @@ 此程序面向 %1$s PC 构建,需经由 FEX 运行,而 FEX 尚未配置。请在登录状态下打开一次 Steam:DroidDeck 会让其下载 FEX 及所需的 Steam Linux Runtime,之后即可打开。 无法下载 DroidDeck 的 proot。请检查网络连接后重试。由于备用 proot 太慢无法流畅游玩,会话未启动。 无法下载 PowerVR 图形环境。请检查网络连接后重试。 + 无法准备图形环境,因此未启动会话。 + 无法设置游戏环境,因此未启动会话。 无法下载 DirectAudio,本次会话的游戏音频将使用较慢的路径。 此程序 会话无法向屏幕绘制画面:%1$s。此界面显示原因而非黑屏;详情见会话日志。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 21abd5d128..d86325fe04 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -203,6 +203,8 @@ 此程式是為 %1$s 電腦而設,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 及所需的 Steam Linux Runtime,之後便會開啟此程式。 無法下載 DroidDeck 的 proot。請檢查連線後再試一次。會話未啟動,因為備用 proot 太慢,無法用來玩遊戲。 無法下載 PowerVR 圖形環境。請檢查網絡連線後再試。 + 無法準備圖形環境,因此未有啟動工作階段。 + 無法設定遊戲環境,因此未有啟動工作階段。 無法下載 DirectAudio,因此本次會話的遊戲音訊會使用較慢的路徑。 此程式 工作階段無法把畫面繪製到螢幕:%1$s。這個畫面會顯示原因,而不是黑畫面;詳情載於工作階段記錄。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5716d8859c..cb8df3aec8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -203,6 +203,8 @@ 此程式是為 %1$s 電腦組建的,需透過 FEX 執行,但 FEX 尚未設定。請在登入狀態下開啟一次 Steam:DroidDeck 會讓它下載 FEX 和所需的 Steam Linux Runtime,之後就能開啟此程式。 無法下載 DroidDeck 的 proot。請檢查連線後再試一次。工作階段未啟動,因為備用 proot 太慢,無法用來玩遊戲。 無法下載 PowerVR 圖形環境。請檢查網路連線後再試。 + 無法準備圖形環境,因此未啟動工作階段。 + 無法設定遊戲環境,因此未啟動工作階段。 無法下載 DirectAudio,因此本次工作階段的遊戲音訊會使用較慢的路徑。 此程式 工作階段無法在螢幕上繪製畫面:%1$s。此畫面會顯示原因,而不是黑畫面;詳細資訊請見工作階段記錄。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c7f319166..da2cf23085 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -231,6 +231,8 @@ This program is built for %1$s PCs and runs through FEX, which is not set up yet. Open Steam once while signed in: DroidDeck has it download FEX and the Steam Linux Runtime it needs, then this opens. DroidDeck\'s proot could not be downloaded. Check the connection and try again. The session was not started, because the fallback proot is too slow to play on. The PowerVR graphics runtime could not be downloaded. Check the connection and try again. + The graphics runtime could not be prepared, so the session was not started. + The game environment could not be set up, so the session was not started. DirectAudio could not be downloaded, so game audio uses the slower path this session. This program The session could not draw to the screen: %1$s. This screen shows why instead of a black one; the session logs have the details. diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt index 4bc4aef334..56a8ad1ce5 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionEndHintTest.kt @@ -34,14 +34,20 @@ class SessionEndHintTest { private var previousArchitecture: String? = null private var previousLog: File? = null private var previousDirectory: File? = null + private var previousFailureCode: String? = null + private var previousFailureMessage: String? = null @Before fun setUp() { previousArchitecture = SessionState.steamClientArch previousLog = SessionState.logFile previousDirectory = SessionState.logDirectory + previousFailureCode = SessionState.failureCode + previousFailureMessage = SessionState.failureMessage SessionState.logFile = null SessionState.logDirectory = null + SessionState.failureCode = null + SessionState.failureMessage = null DetectedGpu.family = GpuInfo.Family.NOT_ADRENO DetectedGpu.name = "test GPU" activity = Robolectric.buildActivity(SessionActivity::class.java).get() @@ -53,6 +59,8 @@ class SessionEndHintTest { SessionState.steamClientArch = previousArchitecture SessionState.logFile = previousLog SessionState.logDirectory = previousDirectory + SessionState.failureCode = previousFailureCode + SessionState.failureMessage = previousFailureMessage DetectedGpu.family = GpuInfo.Family.NOT_ADRENO DetectedGpu.name = "test GPU" } @@ -122,6 +130,22 @@ class SessionEndHintTest { assertNull(exitHint(0)) } + @Test + fun startFailureShowsTheRecordedMessage() { + SessionState.failureCode = "POWERVR_MISSING" + SessionState.failureMessage = "x" + val hint = exitHint(-1) + assertNotNull(hint) + assertEquals("x", ReflectionHelpers.getField(hint, "text")) + } + + @Test + fun guestExitMessageIsNotShownAsAStartFailure() { + SessionState.failureCode = "GUEST_EXIT" + SessionState.failureMessage = "Session guest exited with status 1" + assertNull(exitHint(1)) + } + @Test fun missingEmptyAndUnrelatedLogsHaveNoHint() { assertNull(hint(null)) From f0f7f7a116f6e359e7ec1fd7f233fad056b4c2ee Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:43:55 -0500 Subject: [PATCH 38/60] feat(agent): permission modes for every harness, asking first by default (#2854) * fix(agent): show the side menu's agent page whenever the tab is shown * feat(agent): permission modes for every harness, asking first by default * test(agent): give the drawer page tests their agent page explicitly * fix(agent): fail turns on lost stdin writes, wait for Codex to initialize, keep approvals visible * fix(agent): redo setup on a kept process after it failed, keep approvals in view * fix(agent): keep full-page panels closed while an approval waits --- .../droiddeck/launcher/agent/AgentHarness.kt | 709 +++++++++++++----- .../com/droiddeck/launcher/agent/AgentHost.kt | 115 ++- .../droiddeck/launcher/agent/AgentNotice.kt | 11 +- .../com/droiddeck/launcher/ui/AgentPage.kt | 59 +- .../com/droiddeck/launcher/ui/AgentPanels.kt | 16 +- .../droiddeck/launcher/ui/AgentSetupView.kt | 4 +- .../launcher/ui/SessionDrawerPage.kt | 2 +- app/src/main/res/values/strings.xml | 16 + .../droiddeck/launcher/agent/AgentHostTest.kt | 163 ++-- .../droiddeck/launcher/agent/OpenCodeTest.kt | 170 +++-- .../launcher/ui/SessionDrawerPageTest.kt | 10 +- 11 files changed, 967 insertions(+), 308 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt index 1db8009699..9ae46f143c 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHarness.kt @@ -1,11 +1,13 @@ package com.droiddeck.launcher.agent +import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting +import com.droiddeck.launcher.R import org.json.JSONArray import org.json.JSONObject import java.io.File -/** One coding agent CLI in the Linux userland, run one process per turn (or kept open, see [input]). */ +/** One coding agent CLI in the Linux userland, run as a process that takes its turns over stdin (see [AgentProtocol]). */ interface AgentHarness { val id: String val name: String @@ -35,22 +37,20 @@ interface AgentHarness { /** Whether the CLI has models that need no account; [useFree] then counts as signed in. */ val free: Boolean get() = false fun useFree(rootfs: File) {} + /** Usage reports the conversation's whole cost rather than the turn's. */ + val sessionCost: Boolean get() = false /** Whether [Options.plan] means anything to this CLI. */ val plans: Boolean /** Reasoning effort levels the CLI accepts, lowest first; empty when it has none. */ val efforts: List /** Models to offer besides the CLI's default; [rootfs] is where the CLI's own files can be read. */ fun models(rootfs: File): List - /** The guest command for one turn; [conversation] is null for the first one. */ + /** How the CLI may run its tools, the one that asks before each action first and the default. */ + val permissions: List + /** The guest command of the process that runs the conversation's turns; [conversation] is null for a new one. */ fun turn(message: String, conversation: String?, options: Options): List - /** - * The line that hands [message] to a [turn] process over stdin, or null when the message is already in the - * command. A process that takes its messages this way stays open between turns, so work it started in the - * background can wake it, as it does in the CLI's own terminal. - */ - fun input(message: String): String? = null - /** One line of the CLI's output, or null when it carries nothing to show. */ - fun parse(line: String): AgentEvent? + /** A new reader for one [turn] process; it keeps what that process has said so far. */ + fun protocol(): AgentProtocol /** The folder, under the userland's root, where the CLI loads user skills (`/SKILL.md`). */ val skills: String /** The CLI's global instructions file under the userland's root, where DroidDeck keeps its rules in a marked block. */ @@ -65,14 +65,42 @@ interface AgentHarness { /** An API reached with a key; [keyPage] is where the key is made, and a [custom] one is any OpenAI-compatible server. */ data class Provider(val id: String, val name: String, val keyPage: String? = null, val custom: Boolean = false) - data class Options(val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null) + /** A permission mode; [id] is DroidDeck's own name for it, which each CLI maps to its flags. */ + data class Permission(val id: String, @StringRes val label: Int, @StringRes val hint: Int) + + data class Options( + val model: String? = null, val plan: Boolean = false, val brief: String? = null, val effort: String? = null, + val permission: String = ASK, val workdir: String = "/root", + ) companion object { + const val ASK = "ask" + const val EDITS = "edits" + const val AUTO = "auto" + const val DONT_ASK = "dontask" + const val FULL = "full" + val all: List = listOf(ClaudeCode, Codex, OpenCode) fun byId(id: String?): AgentHarness = all.firstOrNull { it.id == id } ?: ClaudeCode } } +/** What goes to one CLI process's stdin, and what its output lines mean. */ +interface AgentProtocol { + /** + * The lines that start a turn of [message]; [started] is true for a process that has just been started. The + * process stays open between turns, so work it started in the background can wake it. + */ + fun input(message: String, conversation: String?, options: AgentHarness.Options, started: Boolean): List + /** One line of the process's output, or null when it carries nothing to show. */ + fun parse(line: String): AgentEvent? + /** The line that answers [approval]. */ + fun answer(approval: AgentHost.Approval, allow: Boolean): String +} + +/** The message a CLI tells its model when the user denies a tool call. */ +internal const val DENIED = "The user denied this tool call." + /** What one line of output carries: whole entries, or text still being written. */ data class AgentEvent( val conversation: String? = null, @@ -89,6 +117,12 @@ data class AgentEvent( val background: Boolean = false, /** The error a background turn ended with, if it failed. */ val backgroundError: String? = null, + /** Lines to write to the process's stdin right away, the next step of a request it has answered. */ + val reply: List = emptyList(), + /** A tool call that waits for the user to allow it. */ + val approval: AgentHost.Approval? = null, + /** The id of an approval the CLI no longer waits for. */ + val resolved: String? = null, ) /** Claude Code: `claude -p` with stream-json input and output, resumed by session id. */ @@ -130,22 +164,54 @@ object ClaudeCode : AgentHarness { AgentHarness.Model("opus", "Opus"), AgentHarness.Model("sonnet", "Sonnet"), AgentHarness.Model("haiku", "Haiku"), ) - // DroidDeck runs the agent unattended on the user's own device; permission prompts have no one to answer them. + override val permissions = listOf( + AgentHarness.Permission(AgentHarness.ASK, R.string.agent_permission_ask, R.string.agent_permission_ask_hint), + AgentHarness.Permission(AgentHarness.EDITS, R.string.agent_permission_edits, R.string.agent_permission_edits_hint), + AgentHarness.Permission(AgentHarness.AUTO, R.string.agent_permission_auto, R.string.agent_permission_auto_hint), + AgentHarness.Permission(AgentHarness.DONT_ASK, R.string.agent_permission_dont_ask, R.string.agent_permission_dont_ask_hint), + AgentHarness.Permission(AgentHarness.FULL, R.string.agent_permission_full, R.string.agent_permission_full_hint), + ) + + private val MODES = mapOf( + AgentHarness.ASK to "manual", AgentHarness.EDITS to "acceptEdits", AgentHarness.AUTO to "auto", + AgentHarness.DONT_ASK to "dontAsk", AgentHarness.FULL to "bypassPermissions", + ) + + /** + * Prompts reach DroidDeck as can_use_tool requests on stdout (the SDK's stdio prompt tool). Plan mode keeps + * answering none, so a turn that would leave plan mode ends on its plan. + */ override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = buildList { addAll(listOf(binary, "-p", "--input-format", "stream-json", "--output-format", "stream-json", "--verbose", "--include-partial-messages")) - addAll(listOf("--permission-mode", if (options.plan) "plan" else "bypassPermissions")) + val mode = if (options.plan) "plan" else MODES[options.permission] ?: "manual" + addAll(listOf("--permission-mode", mode)) + if (mode != "plan" && mode != "bypassPermissions") add("--permission-prompt-tool=stdio") options.model?.let { addAll(listOf("--model", it)) } options.effort?.let { addAll(listOf("--effort", it)) } options.brief?.let { addAll(listOf("--append-system-prompt", it)) } if (conversation != null) addAll(listOf("--resume", conversation)) } - override fun input(message: String): String? = JSONObject() + fun input(message: String): String = JSONObject() .put("type", "user") .put("message", JSONObject().put("role", "user").put("content", JSONArray().put(JSONObject().put("type", "text").put("text", message)))) .toString() - override fun parse(line: String): AgentEvent? { + override fun protocol(): AgentProtocol = object : AgentProtocol { + override fun input(message: String, conversation: String?, options: AgentHarness.Options, started: Boolean) = listOf(this@ClaudeCode.input(message)) + override fun parse(line: String) = this@ClaudeCode.parse(line) + override fun answer(approval: AgentHost.Approval, allow: Boolean) = this@ClaudeCode.answer(approval, allow) + } + + @VisibleForTesting + internal fun answer(approval: AgentHost.Approval, allow: Boolean): String { + val decision = if (allow) JSONObject().put("behavior", "allow").put("updatedInput", runCatching { JSONObject(approval.payload) }.getOrDefault(JSONObject())) + else JSONObject().put("behavior", "deny").put("message", DENIED) + return JSONObject().put("type", "control_response") + .put("response", JSONObject().put("subtype", "success").put("request_id", approval.id).put("response", decision)).toString() + } + + fun parse(line: String): AgentEvent? { val o = runCatching { JSONObject(line) }.getOrNull() ?: return null val conversation = o.optString("session_id").takeIf { it.isNotEmpty() } // A subagent's messages carry the call that started it; only its tool calls are shown, under that call. @@ -192,6 +258,13 @@ object ClaudeCode : AgentHarness { AgentEvent(conversation, results) } "rate_limit_event" -> AgentEvent(conversation, limits = limits(o.optJSONObject("rate_limit_info"))) + "control_request" -> { + val request = o.optJSONObject("request")?.takeIf { it.optString("subtype") == "can_use_tool" } ?: return null + val tool = request.optString("tool_name") + val input = request.optJSONObject("input") ?: JSONObject() + AgentEvent(approval = AgentHost.Approval(o.optString("request_id"), tool, detail(input), fullInput(tool, input), input.toString())) + } + "control_cancel_request" -> AgentEvent(resolved = o.optString("request_id")) // The CLI starts turns of its own for background tasks (a resumed session first answers the ones the last // run left behind). Such a result is not the end of the user's turn; the host decides what it ends. "result" -> { @@ -274,7 +347,7 @@ object ClaudeCode : AgentHarness { }.joinToString("\n") } -/** OpenAI Codex: `codex exec --json`, resumed by thread id. */ +/** OpenAI Codex: `codex app-server`, its JSON-RPC protocol over stdio, resumed by thread id. */ object Codex : AgentHarness { override val id = "codex" override val name = "Codex" @@ -300,6 +373,13 @@ object Codex : AgentHarness { override val plans = false override val efforts = listOf("low", "medium", "high") + // Codex's sandbox needs Landlock and seccomp, which proot does not provide, so commands run unsandboxed + // and "untrusted" is what makes Codex ask before each one that is not known to be safe. + override val permissions = listOf( + AgentHarness.Permission(AgentHarness.ASK, R.string.agent_permission_ask, R.string.agent_permission_ask_hint), + AgentHarness.Permission(AgentHarness.FULL, R.string.agent_permission_full, R.string.agent_permission_full_hint), + ) + /** Codex keeps the models its account can use in `~/.codex/models_cache.json` once it has run. */ override fun models(rootfs: File): List = runCatching { val o = JSONObject(File(rootfs, "root/.codex/models_cache.json").readText()) @@ -312,106 +392,230 @@ object Codex : AgentHarness { } }.getOrDefault(emptyList()) - // Codex's own sandbox needs Landlock and seccomp, which proot does not provide. - override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = buildList { - addAll(listOf(binary, "exec")) - if (conversation != null) addAll(listOf("resume", conversation)) - addAll(listOf("--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check")) - options.model?.let { addAll(listOf("-m", it)) } - options.effort?.let { addAll(listOf("-c", "model_reasoning_effort=\"$it\"")) } - // codex exec has no system prompt option, so a new conversation starts with the brief. - add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) - } + override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = withoutStderr("codex", listOf(binary, "app-server")) - override fun parse(line: String): AgentEvent? { - val o = runCatching { JSONObject(line) }.getOrNull() ?: return null - val item = o.optJSONObject("item") - val id = item?.optString("id").orEmpty() - val entries = when (o.optString("type")) { - "thread.started" -> return AgentEvent(o.optString("thread_id").takeIf { it.isNotEmpty() }) - "item.started" -> when (item?.optString("type")) { - "command_execution" -> shellCommand(item.optString("command")).let { listOf(AgentHost.Entry.Used(id, "Shell", firstLine(it), it)) } - "mcp_tool_call" -> listOf(AgentHost.Entry.Used(id, item.optString("tool").ifEmpty { "Tool" }, item.optString("server"), item.optJSONObject("arguments")?.toString(2).orEmpty())) - "web_search" -> listOf(AgentHost.Entry.Used(id, "Search", item.optString("query"), item.optString("query"))) - else -> emptyList() - } - "item.updated" -> when (item?.optString("type")) { - "todo_list" -> listOf(todoEntry(id, item)) - else -> emptyList() - } - "item.completed" -> when (item?.optString("type")) { - "agent_message" -> item.optString("text").trim().takeIf { it.isNotEmpty() }?.let { listOf(AgentHost.Entry.Said(it)) }.orEmpty() - "reasoning" -> item.optString("text").trim().takeIf { it.isNotEmpty() }?.let { listOf(AgentHost.Entry.Thought(it)) }.orEmpty() - "command_execution" -> listOf(AgentHost.Entry.Result(id, item.optString("aggregated_output"), - item.has("exit_code") && !item.isNull("exit_code") && item.optInt("exit_code") != 0)) - "mcp_tool_call" -> listOf(AgentHost.Entry.Result(id, item.optJSONObject("result")?.toString(2) ?: item.optJSONObject("error")?.optString("message").orEmpty(), - item.optString("status") == "failed")) - "web_search" -> listOf(AgentHost.Entry.Result(id, "", false)) - "file_change" -> listOf( - AgentHost.Entry.Used(id, "Edit", changedFiles(item), changedFiles(item).replace(", ", "\n")), - AgentHost.Entry.Result(id, item.optString("status"), item.optString("status") == "failed"), - ) - "todo_list" -> listOf(todoEntry(id, item)) - "error" -> listOf(AgentHost.Entry.Said("⚠ " + item.optString("message"))) - else -> emptyList() - } - "turn.completed" -> return AgentEvent( - entries = listOf(AgentHost.Entry.Finished(null)), - usage = o.optJSONObject("usage")?.let { AgentHost.Usage(0, 0.0, it.optLong("input_tokens") + it.optLong("cached_input_tokens"), it.optLong("output_tokens")) }, + override fun protocol(): AgentProtocol = Protocol() + + @VisibleForTesting + internal class Protocol : AgentProtocol { + private var next = 1 + private var thread: String? = null + /** The initialize request, the thread/start or thread/resume sent once it succeeds, and the turn that waits for its thread. */ + private var initializing = -1 + private var initialized = false + private var open: String? = null + private var opening = -1 + private var waiting: JSONObject? = null + private var starting = -1 + private var turnId = "" + /** Each file change's paths and diffs, from its start; an approval for it names only the item. */ + private val changes = mutableMapOf() + private var input = 0L + private var output = 0L + + override fun input(message: String, conversation: String?, options: AgentHarness.Options, started: Boolean): List { + val turn = JSONObject() + .put("input", JSONArray().put(JSONObject().put("type", "text").put("text", message).put("text_elements", JSONArray()))) + options.model?.let { turn.put("model", it) } + options.effort?.let { turn.put("effort", it) } + val known = thread + if (!started && known != null) return listOf(startTurn(turn.put("threadId", known))) + val params = JSONObject() + .put("approvalPolicy", if (options.permission == AgentHarness.FULL) "never" else "untrusted") + .put("sandbox", "danger-full-access") + options.model?.let { params.put("model", it) } + options.brief?.let { params.put("developerInstructions", it) } + if (conversation != null) params.put("threadId", conversation) + waiting = turn + opening = next++ + val request = JSONObject().put("id", opening).put("method", if (conversation != null) "thread/resume" else "thread/start").put("params", params).toString() + // Codex refuses a second initialize on one connection, so a thread that failed to open is asked for again alone. + if (initialized) return listOf(request) + open = request + initializing = next++ + return listOf( + JSONObject().put("id", initializing).put("method", "initialize") + .put("params", JSONObject().put("clientInfo", JSONObject().put("name", "droiddeck").put("title", "DroidDeck").put("version", "1")) + .put("capabilities", JSONObject.NULL)).toString(), ) - "turn.failed" -> listOf(AgentHost.Entry.Finished(o.optJSONObject("error")?.optString("message") ?: "turn failed")) - // codex reports a dropped stream it is retrying as an error event, and the turn goes on. - "error" -> o.optString("message").let { message -> - if (message.startsWith("Reconnecting...")) emptyList() else listOf(AgentHost.Entry.Finished(message.ifEmpty { "error" })) - } - else -> emptyList() } - return if (entries.isEmpty()) null else AgentEvent(entries = entries) + + private fun startTurn(params: JSONObject): String { + starting = next++ + return JSONObject().put("id", starting).put("method", "turn/start").put("params", params).toString() + } + + override fun answer(approval: AgentHost.Approval, allow: Boolean): String = + JSONObject(approval.payload).put("result", JSONObject().put("decision", if (allow) "accept" else "decline")).toString() + + override fun parse(line: String): AgentEvent? { + val o = runCatching { JSONObject(line) }.getOrNull() ?: return null + val method = o.optString("method") + if (method.isEmpty()) return response(o) + val params = o.optJSONObject("params") ?: JSONObject() + if (o.has("id")) return request(o.get("id"), method, params) + return notification(method, params) + } + + private fun response(o: JSONObject): AgentEvent? { + val id = o.optInt("id", -1) + val error = o.optJSONObject("error")?.optString("message")?.ifEmpty { "error" } + return when (id) { + initializing -> { + if (error != null) return AgentEvent(entries = listOf(AgentHost.Entry.Finished(error))) + initialized = true + val request = open ?: return null + open = null + AgentEvent(reply = listOf(JSONObject().put("method", "initialized").toString(), request)) + } + opening -> { + if (error != null) return AgentEvent(entries = listOf(AgentHost.Entry.Finished(error))) + val started = o.optJSONObject("result")?.optJSONObject("thread")?.optString("id")?.takeIf { it.isNotEmpty() } ?: return null + thread = started + val turn = waiting ?: return AgentEvent(started) + waiting = null + AgentEvent(started, reply = listOf(startTurn(turn.put("threadId", started)))) + } + starting -> error?.let { AgentEvent(entries = listOf(AgentHost.Entry.Finished(it))) } + else -> null + } + } + + private fun request(id: Any, method: String, params: JSONObject): AgentEvent { + val payload = JSONObject().put("id", id).toString() + return when (method) { + "item/commandExecution/requestApproval" -> { + val command = shellCommand(params.optString("command")) + val reason = params.optString("reason").takeIf { it.isNotEmpty() && it != "null" } + AgentEvent(approval = AgentHost.Approval(id.toString(), "Shell", firstLine(command), listOfNotNull(command, reason).joinToString("\n\n"), payload)) + } + "item/fileChange/requestApproval" -> { + val list = changes[params.optString("itemId")] ?: JSONArray() + val files = (0 until list.length()).mapNotNull { list.optJSONObject(it) } + AgentEvent(approval = AgentHost.Approval( + id.toString(), "Edit", files.joinToString(", ") { it.optString("path") }.take(400), + files.joinToString("\n\n") { it.optString("path") + "\n" + patchLines(it.optString("diff"), it.optJSONObject("kind")?.optString("type").orEmpty()) }, payload, + )) + } + // Everything else asks for something DroidDeck has no screen for; refusing keeps the turn going. + else -> AgentEvent(reply = listOf(JSONObject(payload) + .put("error", JSONObject().put("code", -32601).put("message", "DroidDeck cannot answer $method")).toString())) + } + } + + private fun notification(method: String, params: JSONObject): AgentEvent? { + val item = params.optJSONObject("item") + val id = item?.optString("id").orEmpty() + val entries: List = when (method) { + "thread/started" -> return params.optJSONObject("thread")?.optString("id")?.takeIf { it.isNotEmpty() }?.let { AgentEvent(it) } + "turn/started" -> { + turnId = params.optJSONObject("turn")?.optString("id").orEmpty() + input = 0 + output = 0 + return null + } + "item/agentMessage/delta" -> return AgentEvent(text = params.optString("delta")) + "item/reasoning/summaryTextDelta", "item/reasoning/textDelta" -> return AgentEvent(thinking = params.optString("delta")) + "item/started" -> when (item?.optString("type")) { + "commandExecution" -> shellCommand(item.optString("command")).let { listOf(AgentHost.Entry.Used(id, "Shell", firstLine(it), it)) } + "mcpToolCall" -> listOf(AgentHost.Entry.Used(id, item.optString("tool").ifEmpty { "Tool" }, item.optString("server"), item.opt("arguments")?.let(::pretty).orEmpty())) + "webSearch" -> listOf(AgentHost.Entry.Used(id, "Search", item.optString("query"), item.optString("query"))) + "fileChange" -> { + val list = item.optJSONArray("changes") ?: JSONArray() + changes[id] = list + fileEntries(id, list) + } + else -> emptyList() + } + "item/completed" -> when (item?.optString("type")) { + "agentMessage" -> item.optString("text").trim().takeIf { it.isNotEmpty() }?.let { listOf(AgentHost.Entry.Said(it)) }.orEmpty() + "reasoning" -> { + val parts = (strings(item.optJSONArray("summary")) + strings(item.optJSONArray("content"))).joinToString("\n\n").trim() + if (parts.isEmpty()) emptyList() else listOf(AgentHost.Entry.Thought(parts)) + } + "commandExecution" -> { + val status = item.optString("status") + val exit = if (item.isNull("exitCode")) 0 else item.optInt("exitCode") + val out = item.optString("aggregatedOutput").takeUnless { item.isNull("aggregatedOutput") }.orEmpty() + listOf(AgentHost.Entry.Result(id, if (status == "declined") out.ifEmpty { DENIED } else out, status != "completed" || exit != 0)) + } + "mcpToolCall" -> listOf(AgentHost.Entry.Result(id, + item.optJSONObject("result")?.let(::pretty) ?: item.optJSONObject("error")?.optString("message").orEmpty(), item.optString("status") == "failed")) + "webSearch" -> listOf(AgentHost.Entry.Result(id, "", false)) + "fileChange" -> { + val list = item.optJSONArray("changes") ?: changes[id] ?: JSONArray() + changes.remove(id) + val failed = item.optString("status") != "completed" + (0 until list.length()).map { AgentHost.Entry.Result("$id#$it", if (failed) item.optString("status") else "", failed) } + } + else -> emptyList() + } + "turn/plan/updated" -> listOf(plan(params.optJSONArray("plan"))) + "thread/tokenUsage/updated" -> { + val usage = params.optJSONObject("tokenUsage") ?: return null + val last = usage.optJSONObject("last") + input += last?.optLong("inputTokens") ?: 0 + output += last?.optLong("outputTokens") ?: 0 + return AgentEvent( + context = last?.optLong("totalTokens")?.takeIf { it > 0 }, + window = usage.optLong("modelContextWindow").takeIf { it > 0 }, + ) + } + "account/rateLimits/updated" -> return rateLimits(params.optJSONObject("rateLimits"))?.let { AgentEvent(limits = it) } + "serverRequest/resolved" -> return AgentEvent(resolved = params.opt("requestId")?.toString()) + "turn/completed" -> { + val turn = params.optJSONObject("turn") ?: JSONObject() + val error = when (turn.optString("status")) { + "failed" -> turn.optJSONObject("error")?.optString("message")?.ifEmpty { null } ?: "turn failed" + else -> null + } + return AgentEvent( + entries = listOf(AgentHost.Entry.Finished(error)), + usage = AgentHost.Usage(if (turn.isNull("durationMs")) 0 else turn.optLong("durationMs"), 0.0, input, output), + ) + } + else -> emptyList() + } + return if (entries.isEmpty()) null else AgentEvent(entries = entries) + } + + private fun plan(steps: JSONArray?): AgentHost.Entry.Used { + val text = (0 until (steps?.length() ?: 0)).mapNotNull { i -> + val step = steps?.optJSONObject(i) ?: return@mapNotNull null + val mark = when (step.optString("status")) { "completed" -> "[x]"; "inProgress" -> "[~]"; else -> "[ ]" } + "$mark ${step.optString("step")}" + }.joinToString("\n") + return AgentHost.Entry.Used("$turnId-todo", "TodoWrite", "", text, output = "") + } } - private const val TOKEN_COUNT = "\"payload\":{\"type\":\"token_count\"" - - /** Codex prints no limits with --json; its session log, named after the thread, has a token_count event each step. */ - override fun usage(rootfs: File, conversation: String?): AgentEvent? { - conversation ?: return null - val log = File(rootfs, "root/.codex/sessions").walkBottomUp().filter { it.isFile && it.name.endsWith("-$conversation.jsonl") } - .maxByOrNull { it.lastModified() } ?: return null - val last = runCatching { log.readLines().lastOrNull { it.contains(TOKEN_COUNT) } }.getOrNull() ?: return null - return tokenCount(last) + /** One Edit per changed file: its path, then the diff as lines led by ' ', '-' or '+'. */ + private fun fileEntries(id: String, changes: JSONArray) = (0 until changes.length()).mapNotNull { i -> + val change = changes.optJSONObject(i) ?: return@mapNotNull null + val path = change.optString("path") + AgentHost.Entry.Used("$id#$i", "Edit", path, path + "\n" + patchLines(change.optString("diff"), change.optJSONObject("kind")?.optString("type").orEmpty())) } @VisibleForTesting - internal fun tokenCount(line: String): AgentEvent? { - val payload = runCatching { JSONObject(line).optJSONObject("payload") }.getOrNull()?.takeIf { it.optString("type") == "token_count" } ?: return null - val info = payload.optJSONObject("info") - val rates = payload.optJSONObject("rate_limits") - val limits = listOf("primary", "secondary").mapNotNull { key -> - val w = rates?.optJSONObject(key) ?: return@mapNotNull null - AgentHost.Limit(w.optInt("window_minutes"), w.optDouble("used_percent", 0.0).toInt(), w.optLong("resets_at")) - } - return AgentEvent( - context = info?.optJSONObject("last_token_usage")?.optLong("total_tokens")?.takeIf { it > 0 }, - window = info?.optLong("model_context_window")?.takeIf { it > 0 }, - limits = limits.takeIf { it.isNotEmpty() }, - ) + internal fun rateLimits(snapshot: JSONObject?): List? { + snapshot ?: return null + return listOf("primary", "secondary").mapNotNull { key -> + val w = snapshot.optJSONObject(key) ?: return@mapNotNull null + AgentHost.Limit(w.optInt("windowDurationMins"), w.optDouble("usedPercent", 0.0).toInt(), w.optLong("resetsAt")) + }.takeIf { it.isNotEmpty() } } - private fun todoEntry(id: String, item: JSONObject): AgentHost.Entry.Used { - val items = item.optJSONArray("items") ?: JSONArray() - val text = (0 until items.length()).mapNotNull { i -> - val todo = items.optJSONObject(i) ?: return@mapNotNull null - "${if (todo.optBoolean("completed")) "[x]" else "[ ]"} ${todo.optString("text")}" - }.joinToString("\n") - return AgentHost.Entry.Used("$id-todo", "TodoWrite", "", text, output = "") - } + private fun strings(list: JSONArray?) = (0 until (list?.length() ?: 0)).mapNotNull { list?.optString(it)?.takeIf { s -> s.isNotBlank() } } - private fun changedFiles(item: JSONObject): String { - val changes = item.optJSONArray("changes") ?: return "" - return (0 until changes.length()).mapNotNull { changes.optJSONObject(it)?.optString("path") }.joinToString(", ").take(400) + private fun pretty(value: Any): String = when (value) { + is JSONObject -> value.toString(2) + is JSONArray -> value.toString(2) + JSONObject.NULL -> "" + else -> value.toString() } } -/** OpenCode: `opencode run --format json`, resumed by session id. */ +/** OpenCode: `opencode acp`, the Agent Client Protocol over stdio, resumed by session id. */ object OpenCode : AgentHarness { override val id = "opencode" override val name = "OpenCode" @@ -579,86 +783,234 @@ object OpenCode : AgentHarness { private val MODEL_ID = Regex("""^[\w.-]+/\S+$""") - private class Spent(var cost: Double = 0.0, var input: Long = 0, var output: Long = 0) - private val spent = Spent() - @Volatile private var model: String? = null + override val permissions = listOf( + AgentHarness.Permission(AgentHarness.ASK, R.string.agent_permission_ask, R.string.agent_permission_ask_hint), + AgentHarness.Permission(AgentHarness.EDITS, R.string.agent_permission_edits, R.string.agent_permission_edits_hint), + AgentHarness.Permission(AgentHarness.FULL, R.string.agent_permission_full, R.string.agent_permission_full_hint), + ) - override fun turn(message: String, conversation: String?, options: AgentHarness.Options): List { - synchronized(spent) { spent.cost = 0.0; spent.input = 0; spent.output = 0 } - model = options.model - // DroidDeck runs the agent unattended; --auto approves all the agent does not deny itself, and plan mode denies edits. - return buildList { - addAll(listOf(binary, "run", "--format", "json", "--auto", "--thinking")) - if (conversation != null) addAll(listOf("-s", conversation)) - if (options.plan) addAll(listOf("--agent", "plan")) - options.model?.let { addAll(listOf("-m", it)) } - options.effort?.let { addAll(listOf("--variant", it)) } - add("--") - // opencode run has no system prompt option, so a new conversation starts with the brief. - add(if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message) + /** + * Rules merged over the user's opencode config. OpenCode applies the last rule that matches in key order, so the + * asking modes name each permission rather than "*", which could land after a rule of the user's and override it. + */ + @VisibleForTesting + internal fun rules(permission: String): JSONObject { + val asks = listOf("bash", "webfetch", "websearch", "codesearch") + return when (permission) { + AgentHarness.FULL -> JSONObject().put("*", "allow") + AgentHarness.EDITS -> JSONObject().put("edit", "allow").apply { asks.forEach { put(it, "ask") } } + else -> JSONObject().put("edit", "ask").apply { asks.forEach { put(it, "ask") } } } } - override fun usage(rootfs: File, conversation: String?): AgentEvent? { - val id = model ?: return null - return listed(rootfs)?.windows?.get(id)?.let { AgentEvent(window = it) } - } + override fun turn(message: String, conversation: String?, options: AgentHarness.Options) = + withoutStderr("opencode", listOf("/usr/bin/env", "OPENCODE_PERMISSION=${rules(options.permission)}", binary, "acp")) - override fun parse(line: String): AgentEvent? { - val o = runCatching { JSONObject(line) }.getOrNull() ?: return null - val conversation = o.optString("sessionID").takeIf { it.isNotEmpty() } - val part = o.optJSONObject("part") - return when (o.optString("type")) { - "text" -> AgentEvent(conversation, text(part) { AgentHost.Entry.Said(it) }) - "reasoning" -> AgentEvent(conversation, text(part) { AgentHost.Entry.Thought(it) }) - "tool_use" -> AgentEvent(conversation, part?.let { tool(it) }.orEmpty()) - "step_finish" -> { - val tokens = part?.optJSONObject("tokens") - val cache = tokens?.optJSONObject("cache") - val total = synchronized(spent) { - spent.cost += part?.optDouble("cost", 0.0) ?: 0.0 - spent.input += (tokens?.optLong("input") ?: 0) + (cache?.optLong("read") ?: 0) + (cache?.optLong("write") ?: 0) - spent.output += (tokens?.optLong("output") ?: 0) + (tokens?.optLong("reasoning") ?: 0) - AgentHost.Usage(0, spent.cost, spent.input, spent.output) + /** The conversation's cost so far; DroidDeck takes the turn's share from what its chat has recorded. */ + override val sessionCost = true + + override fun protocol(): AgentProtocol = Protocol() + + /** `opencode acp`: the Agent Client Protocol, JSON-RPC over stdio. */ + @VisibleForTesting + internal class Protocol : AgentProtocol { + private enum class Stage { INIT, SESSION, CONFIG, PROMPT, IDLE } + + private var next = 1 + private var stage = Stage.IDLE + private var pending = -1 + private var session: String? = null + private var resume: String? = null + private var cwd = "/root" + /** Requests for the session still to send, each once the one before it has been answered. */ + private val queue = ArrayDeque<(String) -> JSONObject>() + private val said = StringBuilder() + private val thought = StringBuilder() + /** Each tool call's name, which only its first update carries, and its latest entry. */ + private val names = mutableMapOf() + private val used = mutableMapOf() + private var cost = 0.0 + private var started = 0L + + override fun input(message: String, conversation: String?, options: AgentHarness.Options, started: Boolean): List { + val text = if (conversation == null && options.brief != null) "${options.brief}\n\n$message" else message + val prompt = { id: String -> + JSONObject().put("sessionId", id).put("prompt", JSONArray().put(JSONObject().put("type", "text").put("text", text))) + } + queue.clear() + val known = session + if (!started && known != null && configured) return listOf(send(Stage.PROMPT, "session/prompt", prompt(known))) + fun option(config: String, value: String) = { id: String -> JSONObject().put("sessionId", id).put("configId", config).put("value", value) } + options.model?.let { queue += option("model", it) } + options.effort?.let { queue += option("effort", it) } + queue += option("mode", if (options.plan) "plan" else "build") + queue += prompt + // A session whose options were refused sets them all again before its next prompt. + if (!started && known != null) return listOf(advance(known)) + resume = conversation + cwd = options.workdir + return listOf(send(Stage.INIT, "initialize", JSONObject().put("protocolVersion", 1).put("clientCapabilities", JSONObject()))) + } + + private fun send(stage: Stage, method: String, params: JSONObject): String { + this.stage = stage + pending = next++ + if (stage == Stage.PROMPT) started = System.currentTimeMillis() + return JSONObject().put("jsonrpc", "2.0").put("id", pending).put("method", method).put("params", params).toString() + } + + /** The next queued request: the prompt once nothing else is left. */ + private fun advance(id: String): String { + val make = queue.removeFirst() + val params = make(id) + configuring = params.optString("configId") + configured = queue.isEmpty() + return if (queue.isEmpty()) send(Stage.PROMPT, "session/prompt", params) else send(Stage.CONFIG, "session/set_config_option", params) + } + + /** The config option the pending set_config_option sets. */ + private var configuring = "" + /** The session's model, effort and mode were all set, so a later prompt can go straight to it. */ + private var configured = false + + override fun answer(approval: AgentHost.Approval, allow: Boolean): String = JSONObject(approval.payload).put("jsonrpc", "2.0") + .put("result", JSONObject().put("outcome", JSONObject().put("outcome", "selected").put("optionId", if (allow) "once" else "reject"))).toString() + + override fun parse(line: String): AgentEvent? { + val o = runCatching { JSONObject(line) }.getOrNull() ?: return null + val method = o.optString("method") + val params = o.optJSONObject("params") ?: JSONObject() + return when { + method.isEmpty() -> response(o) + o.has("id") -> request(o.get("id"), method, params) + method == "session/update" -> update(params.optJSONObject("update") ?: return null) + else -> null + } + } + + private fun response(o: JSONObject): AgentEvent? { + if (o.optInt("id", -1) != pending) return null + val error = o.optJSONObject("error")?.let { it.optJSONObject("data")?.optString("message")?.ifEmpty { null } ?: it.optString("message").ifEmpty { "error" } } + val result = o.optJSONObject("result") ?: JSONObject() + return when (stage) { + Stage.INIT -> error?.let(::failed) ?: AgentEvent(reply = listOf( + resume?.let { send(Stage.SESSION, "session/resume", JSONObject().put("sessionId", it).put("cwd", cwd).put("mcpServers", JSONArray())) } + ?: send(Stage.SESSION, "session/new", JSONObject().put("cwd", cwd).put("mcpServers", JSONArray())), + )) + Stage.SESSION -> { + if (error != null) return failed(error) + val id = result.optString("sessionId").ifEmpty { resume.orEmpty() }.takeIf { it.isNotEmpty() } ?: return failed("no session") + session = id + AgentEvent(id, reply = listOf(advance(id))) } - val context = tokens?.optLong("total")?.takeIf { it > 0 } - // A step that ends to run tools is followed by another; any other reason ends the turn. - if (part?.optString("reason") == "tool-calls") AgentEvent(conversation, context = context) - else AgentEvent(conversation, listOf(AgentHost.Entry.Finished(null)), context = context, usage = total) + // A model without effort levels refuses one and the turn goes on with its default; a refused + // mode would run a plan turn as a build one, so it ends the turn instead. + Stage.CONFIG -> if (error != null && configuring == "mode") failed(error) else AgentEvent(reply = listOf(advance(session ?: return null))) + Stage.PROMPT -> { + stage = Stage.IDLE + val usage = result.optJSONObject("usage") + val reason = result.optString("stopReason") + AgentEvent( + session, + flush() + AgentHost.Entry.Finished(error ?: if (reason == "refusal") "refused" else null), + usage = AgentHost.Usage( + System.currentTimeMillis() - started, cost, + (usage?.optLong("inputTokens") ?: 0) + (usage?.optLong("cachedReadTokens") ?: 0), + (usage?.optLong("outputTokens") ?: 0) + (usage?.optLong("thoughtTokens") ?: 0), + ), + ) + } + Stage.IDLE -> null } - "error" -> { - val error = o.optJSONObject("error") - val message = error?.optJSONObject("data")?.optString("message")?.takeIf { it.isNotEmpty() } - ?: error?.optString("message")?.takeIf { it.isNotEmpty() } ?: error?.optString("name")?.takeIf { it.isNotEmpty() } ?: "error" - AgentEvent(conversation, listOf(AgentHost.Entry.Finished(message))) + } + + private fun failed(error: String): AgentEvent { + stage = Stage.IDLE + configured = false + return AgentEvent(session, flush() + AgentHost.Entry.Finished(error)) + } + + private fun request(id: Any, method: String, params: JSONObject): AgentEvent { + val payload = JSONObject().put("id", id).toString() + if (method != "session/request_permission") { + // File writes and terminals stay with OpenCode, which does them itself when the client declines. + return AgentEvent(reply = listOf(JSONObject(payload).put("jsonrpc", "2.0") + .put("error", JSONObject().put("code", -32601).put("message", "DroidDeck cannot answer $method")).toString())) } - else -> conversation?.let { AgentEvent(it) } + val call = params.optJSONObject("toolCall") ?: JSONObject() + val raw = call.optJSONObject("rawInput") ?: JSONObject() + val name = names[call.optString("toolCallId")] ?: call.optString("kind") + val kind = call.optString("kind") + val approval = when { + kind == "execute" -> AgentHost.Approval(id.toString(), "Bash", firstLine(raw.optString("command")), raw.optString("command"), payload) + // OpenCode asks for a folder outside the workspace on its own, before the tool's own ask. + raw.has("parentDir") -> AgentHost.Approval( + id.toString(), "External directory", raw.optString("parentDir"), + listOf(raw.optString("parentDir"), raw.optString("command")).filter { it.isNotEmpty() }.joinToString("\n\n"), payload, + ) + raw.has("diff") -> { + val path = raw.optString("filepath") + AgentHost.Approval(id.toString(), "Edit", path, path + "\n" + patchLines(raw.optString("diff"), ""), payload) + } + else -> AgentHost.Approval(id.toString(), toolName(name), call.optString("title"), raw.toString(2), payload) + } + return AgentEvent(session, flush(), approval = approval) + } + + private fun update(u: JSONObject): AgentEvent? = when (u.optString("sessionUpdate")) { + "agent_message_chunk" -> chunk(u)?.let { said.append(it); AgentEvent(session, text = it) } + "agent_thought_chunk" -> chunk(u)?.let { thought.append(it); AgentEvent(session, thinking = it) } + "tool_call", "tool_call_update" -> AgentEvent(session, flush() + tool(u)) + "usage_update" -> { + u.optJSONObject("cost")?.optDouble("amount")?.takeIf { !it.isNaN() }?.let { cost = it } + AgentEvent(session, context = u.optLong("used").takeIf { it > 0 }, window = u.optLong("size").takeIf { it > 0 }) + } + else -> null + } + + private fun chunk(u: JSONObject) = u.optJSONObject("content")?.takeIf { it.optString("type") == "text" }?.optString("text")?.takeIf { it.isNotEmpty() } + + /** What was written since the last entry, as whole entries. */ + private fun flush(): List = buildList { + thought.toString().trim().takeIf { it.isNotEmpty() }?.let { add(AgentHost.Entry.Thought(it)) } + said.toString().trim().takeIf { it.isNotEmpty() }?.let { add(AgentHost.Entry.Said(it)) } + thought.clear() + said.clear() + } + + private fun tool(u: JSONObject): List { + val id = u.optString("toolCallId") + if (u.optString("sessionUpdate") == "tool_call") names[id] = u.optString("title") + val input = u.optJSONObject("rawInput")?.takeIf { it.length() > 0 } + val entry = if (input != null || used[id] == null) tool(id, names[id].orEmpty(), input ?: JSONObject()) else used.getValue(id) + used[id] = entry + val raw = u.optJSONObject("rawOutput") + return when (u.optString("status")) { + "completed" -> { + val exit = raw?.optJSONObject("metadata")?.opt("exit") + listOf(entry, AgentHost.Entry.Result(id, raw?.optString("output")?.ifEmpty { null } ?: content(u), exit is Number && exit.toInt() != 0)) + } + "failed" -> listOf(entry, AgentHost.Entry.Result(id, raw?.optString("error")?.ifEmpty { null } ?: content(u), true)) + else -> listOf(entry) + } + } + + private fun content(u: JSONObject): String { + val list = u.optJSONArray("content") ?: return "" + return (0 until list.length()).mapNotNull { list.optJSONObject(it)?.optJSONObject("content")?.optString("text") }.joinToString("\n") } } - private fun text(part: JSONObject?, entry: (String) -> AgentHost.Entry) = - part?.optString("text")?.trim()?.takeIf { it.isNotEmpty() }?.let { listOf(entry(it)) }.orEmpty() + private fun toolName(name: String) = name.replaceFirstChar { it.uppercase() }.ifEmpty { "Tool" } - private fun tool(part: JSONObject): List { - val id = part.optString("callID").ifEmpty { part.optString("id") } - val state = part.optJSONObject("state") ?: JSONObject() - val input = state.optJSONObject("input") ?: JSONObject() + private fun tool(id: String, name: String, input: JSONObject): AgentHost.Entry.Used { val path = input.optString("filePath") - val (name, detail, full) = when (val tool = part.optString("tool")) { - "bash" -> Triple("Bash", firstLine(input.optString("command")), input.optString("command")) - "edit" -> Triple("Edit", path, path + "\n" + lineDiff(input.optString("oldString"), input.optString("newString"))) - "write" -> Triple("Write", path, path + "\n" + lineDiff("", input.optString("content"))) - "todowrite" -> Triple("TodoWrite", "", todos(input.optJSONArray("todos"))) - else -> Triple(tool.replaceFirstChar { it.uppercase() }.ifEmpty { "Tool" }, detail(input), input.toString(2)) - } - val used = AgentHost.Entry.Used(id, name, detail, full) - return when (state.optString("status")) { - "completed" -> { - val exit = state.optJSONObject("metadata")?.opt("exit") - listOf(used, AgentHost.Entry.Result(id, state.optString("output"), exit is Number && exit.toInt() != 0)) - } - "error" -> listOf(used, AgentHost.Entry.Result(id, state.optString("error"), true)) - else -> listOf(used) + return when (name) { + "bash" -> AgentHost.Entry.Used(id, "Bash", firstLine(input.optString("command")), input.optString("command")) + "edit" -> AgentHost.Entry.Used(id, "Edit", path, path + "\n" + lineDiff(input.optString("oldString"), input.optString("newString"))) + "write" -> AgentHost.Entry.Used(id, "Write", path, path + "\n" + lineDiff("", input.optString("content"))) + "todowrite" -> AgentHost.Entry.Used(id, "TodoWrite", "", todos(input.optJSONArray("todos"))) + else -> AgentHost.Entry.Used(id, toolName(name), detail(input), if (input.length() == 0) "" else input.toString(2)) } } @@ -679,6 +1031,13 @@ object OpenCode : AgentHarness { @VisibleForTesting internal fun firstLine(text: String) = text.lineSequence().first().take(160) +/** + * [command] with its stderr in a log of its own under /root/.cache/droiddeck. The agent's stdout and stderr share one + * pipe, and a log line written in the middle of a long JSON line would make that line unreadable. + */ +internal fun withoutStderr(log: String, command: List) = + listOf("/bin/sh", "-c", "mkdir -p /root/.cache/droiddeck; exec \"\$@\" 2>/root/.cache/droiddeck/$log.log", "sh") + command + private const val DIFF_CONTEXT = 2 /** @@ -701,6 +1060,18 @@ internal fun lineDiff(old: String, new: String): String { }.joinToString("\n") } +/** A unified diff's hunks without their headers; an added or deleted file's diff is its whole content. */ +@VisibleForTesting +internal fun patchLines(diff: String, kind: String): String { + val lines = diff.removeSuffix("\n").lines() + when (kind) { + "add" -> return lines.joinToString("\n") { "+$it" } + "delete" -> return lines.joinToString("\n") { "-$it" } + } + val start = lines.indexOfFirst { it.startsWith("@@") } + return (if (start < 0) lines else lines.drop(start)).filter { it.isNotEmpty() && !it.startsWith("@@") && !it.startsWith("\\") }.joinToString("\n") +} + private val SHELL_WRAPPER = Regex("^/bin/(?:ba)?sh -l?c '(.*)'$", RegexOption.DOT_MATCHES_ALL) /** Codex runs each command as `/bin/bash -lc ''`; the command is what the user wants to read. */ diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt index de00d5ce73..80667afef0 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentHost.kt @@ -21,8 +21,8 @@ import java.nio.file.Files /** * The launcher's agent: a coding agent CLI ([AgentHarness]) from the Linux userland, run headless - * outside any game or desktop session: one process per turn, or for a CLI that takes its messages over - * stdin one process kept open between turns, so background work can start a turn of its own. Conversations are kept on disk + * outside any game or desktop session as one process that takes its messages over stdin and stays open + * between turns, so background work can start a turn of its own. Conversations are kept on disk * ([AgentChats]), so a restart (a Lab build, a crash) continues the same one. */ object AgentHost { @@ -56,6 +56,9 @@ object AgentHost { /** A message typed while the agent was working, sent when the turn ends. */ data class Queued(val text: String, val files: List) + /** A tool call the CLI waits on the user to allow; [payload] is what its protocol needs to answer. */ + data class Approval(val id: String, val tool: String, val detail: String, val input: String, val payload: String = "") + enum class State { MISSING, IDLE, WORKING } private const val TAG = "AgentHost" @@ -94,6 +97,12 @@ object AgentHost { private set var plan by mutableStateOf(false) private set + /** The chosen [AgentHarness.Permission] of [harness]; asking first until the user picks another. */ + var permission by mutableStateOf(AgentHarness.ASK) + private set + /** Tool calls of the running turn that wait for the user, oldest first. */ + val approvals = mutableStateListOf() + private var approvalNoticed = false var chat by mutableStateOf(null) private set /** A reply finished since the conversation was last on screen. */ @@ -123,7 +132,9 @@ object AgentHost { var lab by mutableStateOf(null) private set - private class Turn(val process: Process, val pid: Int, val stdin: java.io.OutputStream? = null) { + private class Turn(val process: Process, val pid: Int, val protocol: AgentProtocol, val stdin: java.io.OutputStream) { + fun write(lines: List) = synchronized(this) { stdin.apply { lines.forEach { write((it + "\n").toByteArray()) }; flush() } } + var writingGeneration: Int? = null var exitStatus: Int? = null var costs: AgentCostTracker? = null @@ -171,6 +182,8 @@ object AgentHost { model = prefs(app).getString(modelKey(harness), null) effort = prefs(app).getString(effortKey(harness), null)?.takeIf { it in harness.efforts } plan = prefs(app).getBoolean(PLAN_KEY, false) + permission = prefs(app).getString(permissionKey(harness), null)?.takeIf { id -> harness.permissions.any { it.id == id } } + ?: harness.permissions.first().id limits = decodeLimits(prefs(app).getString(limitsKey(harness), null)) available = LinuxRuntime.hasRootfs(app) installed = harness.files.all { guestFileExists(app, it) } @@ -273,6 +286,42 @@ object AgentHost { prefs(context).edit().putBoolean(PLAN_KEY, on).apply() } + /** Kept per CLI, for every conversation; the CLI process restarts with it on the next message. */ + fun choosePermission(context: Context, id: String) { + if (harness.permissions.none { it.id == id }) return + permission = id + prefs(context).edit().putString(permissionKey(harness), id).apply() + } + + /** Lets the CLI run [approval]'s tool call, or tells it the user said no. */ + fun answer(context: Context, approval: Approval, allow: Boolean) { + if (!approvals.remove(approval)) return + val running = turn ?: session ?: return + val line = running.protocol.answer(approval, allow) + val app = context.applicationContext + val current = harness + Thread({ runCatching { running.write(listOf(line)) }.onFailure { lost(app, running, current, it) } }, "agent-approval").start() + approvalsChanged(app) + } + + /** The approval notice goes once nothing waits on the user any more. */ + private fun approvalsChanged(app: Context) { + if (approvals.isNotEmpty() || !approvalNoticed) return + approvalNoticed = false + AgentNotice.clear(app) + } + + /** + * A line the CLI waits for could not be written, so it would wait forever: its process ends, which ends + * the turn, and the chat says why. A request that may have reached it is not sent again. + */ + private fun lost(app: Context, from: Turn, current: AgentHarness, error: Throwable) { + Log.w(TAG, "could not write to ${current.name}", error) + main.post { if (turn === from || session === from) record(app, Entry.Notice("Could not write to ${current.name}: ${error.message ?: error.javaClass.simpleName}")) } + AgentProcesses.killTree(from.pid) + from.process.destroy() + } + fun models(context: Context) = harness.models(LinuxRuntime.rootDir(context.applicationContext)) /** Sends [text] now, or after the current turn when the agent is working. */ @@ -303,19 +352,20 @@ object AgentHost { val current = harness val prompt = AgentAttachments.prompt(message, attached) turnPlanned = plan && current.plans - val options = AgentHarness.Options(model, turnPlanned, BRIEF, effort) - val command = current.turn(prompt, conversation, options) - val line = current.input(prompt) - val key = "${current.id}|$id|$model|$turnPlanned|$effort" + val options = AgentHarness.Options(model, turnPlanned, BRIEF, effort, permission, workspace(app)) + val key = "${current.id}|$id|$model|$turnPlanned|$effort|$permission" + val resumed = conversation background = false + approvals.clear() + approvalsChanged(app) val kept = session - if (kept != null && line != null && sessionKey == key && kept.process.isAlive) { + if (kept != null && sessionKey == key && kept.process.isAlive) { main.removeCallbacks(reap) turn = kept kept.writingGeneration = gen kept.clearingCosts = prompt == "/clear" Thread({ - val written = runCatching { synchronized(kept) { kept.stdin?.apply { write((line + "\n").toByteArray()); flush() } != null } }.getOrDefault(false) + val written = runCatching { kept.write(kept.protocol.input(prompt, resumed, options, started = false)) }.isSuccess // The process died between turns: the same message goes to a new one, which resumes the conversation. main.post { if (kept.writingGeneration == gen) kept.writingGeneration = null @@ -323,7 +373,7 @@ object AgentHost { if (!written) { dropSession() turn = null - spawn(app, gen, current, current.turn(prompt, conversation, options), line, key) + spawn(app, gen, current, prompt, resumed, options, key) } else kept.exitStatus?.let { processExited(app, kept, current, it) } } } @@ -331,12 +381,14 @@ object AgentHost { return } dropSession() - spawn(app, gen, current, command, line, key) + spawn(app, gen, current, prompt, resumed, options, key) } - private fun spawn(app: Context, gen: Int, current: AgentHarness, command: List, line: String?, key: String) { - val workdir = workspace(app) - var threadConversation = conversation + private fun spawn(app: Context, gen: Int, current: AgentHarness, prompt: String, resumed: String?, options: AgentHarness.Options, key: String) { + val workdir = options.workdir + val command = current.turn(prompt, resumed, options) + val protocol = current.protocol() + var threadConversation = resumed Thread({ runCatching { current.prepare(LinuxRuntime.rootDir(app)) } runCatching { AgentSetup.installHelpers(app) } @@ -349,17 +401,18 @@ object AgentHost { main.post { if (generation == gen) finish(app, e.message ?: "could not start") } return@Thread } - val started = Turn(child, AgentProcesses.pidOf(child), if (line != null) child.outputStream else null).apply { - if (current === ClaudeCode && line != null) costs = AgentCostTracker() + val started = Turn(child, AgentProcesses.pidOf(child), protocol, child.outputStream).apply { + if (current === ClaudeCode) costs = AgentCostTracker() } OrphanReaper.keep(started.pid) main.post { if (generation == gen && state == State.WORKING && turn == null) { turn = started - if (line != null) { session = started; sessionKey = key } + session = started + sessionKey = key } else AgentProcesses.killTree(started.pid) } - if (line != null) runCatching { child.outputStream.apply { write((line + "\n").toByteArray()); flush() } } else child.outputStream.close() + runCatching { started.write(protocol.input(prompt, resumed, options, started = true)) }.onFailure { lost(app, started, current, it) } val raw = runCatching { val log = File(app.filesDir, TURN_LOG).apply { parentFile?.mkdirs() } log.renameTo(File(app.filesDir, "$TURN_LOG.1")) @@ -368,7 +421,8 @@ object AgentHost { runCatching { child.inputStream.bufferedReader().forEachLine { output -> runCatching { raw?.apply { write(output); newLine(); flush() } } - val parsed = current.parse(output) ?: return@forEachLine + val parsed = protocol.parse(output) ?: return@forEachLine + if (parsed.reply.isNotEmpty()) runCatching { started.write(parsed.reply) }.onFailure { lost(app, started, current, it) } parsed.conversation?.let { threadConversation = it } val done = parsed.entries.any { it is Entry.Finished } val event = if (!done) parsed else runCatching { current.usage(LinuxRuntime.rootDir(app), threadConversation) }.getOrNull() @@ -410,7 +464,7 @@ object AgentHost { if (background && state == State.WORKING) finish(app, event.backgroundError, usage = event.usage?.let { from.costs?.perTurn(it) ?: it }) return } - val content = event.text != null || event.thinking != null || event.entries.any { it !is Entry.Finished } + val content = event.text != null || event.thinking != null || event.approval != null || event.entries.any { it !is Entry.Finished } if (content && state == State.IDLE && session === from) { main.removeCallbacks(reap) background = true @@ -428,10 +482,17 @@ object AgentHost { from.clearingCosts = false } val applied = if (finished != null && state == State.WORKING && event.usage != null) - event.copy(usage = from.costs?.perTurn(event.usage) ?: event.usage) else event + event.copy(usage = turnCost(from.costs?.perTurn(event.usage) ?: event.usage)) else event apply(app, applied) } + /** A CLI that reports the conversation's whole cost spent what this chat has not recorded yet. */ + private fun turnCost(usage: Usage): Usage { + if (!harness.sessionCost) return usage + val recorded = entries.sumOf { (it as? Entry.Finished)?.usage?.costUsd ?: 0.0 } + return usage.copy(costUsd = (usage.costUsd - recorded).coerceAtLeast(0.0)) + } + /** Ends the CLI process kept between turns, and with it whatever it still runs in the background. */ private fun dropSession() { main.removeCallbacks(reap) @@ -529,6 +590,15 @@ object AgentHost { } event.text?.let { live += it } event.thinking?.let { liveThinking += it } + event.resolved?.let { id -> + approvals.removeAll { it.id == id } + approvalsChanged(app) + } + event.approval?.takeIf { a -> state == State.WORKING && approvals.none { it.id == a.id } }?.let { + approvals += it + approvalNoticed = true + AgentNotice.post(app, AgentNotice.Kind.APPROVAL, listOf(it.tool, it.detail).filter { s -> s.isNotEmpty() }.joinToString(": ")) + } event.context?.let { context = it } event.window?.let { window = it } event.limits?.let { reported -> @@ -549,6 +619,8 @@ object AgentHost { private fun finish(app: Context, error: String?, stopped: Boolean = false, usage: Usage? = null) { if (state != State.WORKING) return turn = null + approvals.clear() + approvalsChanged(app) val answeredTask = background background = false main.removeCallbacks(reap) @@ -762,6 +834,7 @@ object AgentHost { private const val LINGER_MS = 20 * 60_000L private fun modelKey(harness: AgentHarness) = "model_${harness.id}" + private fun permissionKey(harness: AgentHarness) = "permission_${harness.id}" private fun limitsKey(harness: AgentHarness) = "limits_${harness.id}" @VisibleForTesting diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt index edba77a0c8..22203ace48 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentNotice.kt @@ -16,10 +16,10 @@ internal object AgentNotice { private const val CHANNEL_ID = "agent_done" private const val NOTIFICATION_ID = 4108 - enum class Kind { DONE, FAILED, QUESTION } + enum class Kind { DONE, FAILED, QUESTION, APPROVAL } fun post(context: Context, kind: Kind, text: String) { - if (onScreen(context)) return + if (onScreen(context, kind)) return val manager = context.getSystemService(NotificationManager::class.java) ?: return manager.createNotificationChannel(NotificationChannel(CHANNEL_ID, context.getString(R.string.agent_done_channel), NotificationManager.IMPORTANCE_DEFAULT)) val open = PendingIntent.getActivity(context, 2, @@ -31,6 +31,7 @@ internal object AgentNotice { Kind.DONE -> R.string.agent_done Kind.FAILED -> R.string.agent_done_failed Kind.QUESTION -> R.string.agent_done_question + Kind.APPROVAL -> R.string.agent_done_approval }) runCatching { manager.notify(NOTIFICATION_ID, Notification.Builder(context, CHANNEL_ID) @@ -49,9 +50,9 @@ internal object AgentNotice { context.getSystemService(NotificationManager::class.java)?.cancel(NOTIFICATION_ID) } - /** The chat in a DroidDeck window in front, or the pet, which shows the reply in its own bubble. */ - private fun onScreen(context: Context): Boolean { - if (AgentPet.floating) return true + /** The chat in a DroidDeck window in front, or the pet, which shows the reply in its own bubble but has no way to answer an approval. */ + private fun onScreen(context: Context, kind: Kind): Boolean { + if (AgentPet.floating && kind != Kind.APPROVAL) return true val state = ActivityManager.RunningAppProcessInfo().also { ActivityManager.getMyMemoryState(it) } return AgentPet.agentOnScreen > 0 && state.importance <= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 32c48765bc..01a486b574 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -30,6 +30,7 @@ import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.ime import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding @@ -39,6 +40,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions @@ -128,7 +130,7 @@ import kotlinx.coroutines.launch internal enum class AgentPanel { NONE, MODEL, USAGE, HISTORY, PROCESSES, TOOLS } /** Slash commands the app handles itself; others go to the CLI, which has its own. */ -private val LOCAL_COMMANDS = listOf("/new", "/model", "/plan", "/history", "/processes", "/stop") +private val LOCAL_COMMANDS = listOf("/new", "/model", "/permissions", "/plan", "/history", "/processes", "/stop") private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") /** @@ -207,7 +209,7 @@ private fun AgentPageContent( var setup by rememberSaveable { mutableStateOf(false) } val draft = rememberSaveable { mutableStateOf("") } if (setup || AgentHost.state == AgentHost.State.MISSING || !(AgentSetup.ready || AgentSetup.completed(context))) { - AgentSetupView(modifier, onDone = { setup = false }) + AgentSetupView(modifier, firstControl = inputModifier, onDone = { setup = false }) return } var panel by rememberSaveable { mutableStateOf(AgentPanel.NONE) } @@ -233,6 +235,10 @@ private fun AgentPageContent( // The keyboard leaves too little height for a panel and the editor together, so typing closes the panel. val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 LaunchedEffect(keyboardOpen) { if (keyboardOpen && (panel == AgentPanel.MODEL || panel == AgentPanel.USAGE)) panel = AgentPanel.NONE } + // History, processes and tools take the whole page, which would hide an approval the turn is waiting on. + LaunchedEffect(AgentHost.approvals.size, panel) { + if (AgentHost.approvals.isNotEmpty() && (panel == AgentPanel.HISTORY || panel == AgentPanel.PROCESSES || panel == AgentPanel.TOOLS)) panel = AgentPanel.NONE + } Column( modifier.fillMaxSize().imePadding().onPreviewKeyEvent { e -> val k = e.nativeKeyEvent @@ -279,7 +285,8 @@ private fun AgentPageContent( readingBack = false scope.launch { list.scrollToItem(maxOf(0, list.layoutInfo.totalItemsCount - 1), Int.MAX_VALUE / 2) } } - val hidden = !composer.focused && !composer.hasUnconsumedFocusRequest() && readingBack && AgentHost.entries.isNotEmpty() + val hidden = !composer.focused && !composer.hasUnconsumedFocusRequest() && readingBack && AgentHost.entries.isNotEmpty() && + AgentHost.approvals.isEmpty() var listHeight by remember { mutableIntStateOf(0) } Box( Modifier.weight(1f).fillMaxWidth().clipToBounds().nestedScroll(dragBack).onGloballyPositioned { @@ -354,7 +361,7 @@ private fun AgentTopBar(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, firstC } } -/** The harness, model, effort and plan mode, opening the model picker; [compact] names only the model. */ +/** The harness, model, effort, a permission mode other than asking first and plan mode, opening the model picker; [compact] names only the model. */ @Composable private fun ModelChip(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, firstControl: Modifier, modifier: Modifier = Modifier, compact: Boolean = false) { val context = LocalContext.current @@ -365,8 +372,12 @@ private fun ModelChip(panel: AgentPanel, onPanel: (AgentPanel) -> Unit, firstCon modifier = modifier.then(if (compact) Modifier.widthIn(max = 120.dp) else Modifier).height(36.dp).clip(Shape12).then(firstControl) .clickable { onPanel(AgentPanel.MODEL) }.padding(horizontal = 8.dp).testTag("agent-model"), ) { - val parts = if (compact) listOf(model) - else listOfNotNull(AgentHost.harness.name, model, AgentHost.effort, stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }) + val mode = AgentHost.harness.permissions.drop(1).firstOrNull { it.id == AgentHost.permission }?.let { stringResource(it.label) } + val parts = if (compact) listOfNotNull(mode ?: model) + else listOfNotNull( + AgentHost.harness.name, model, AgentHost.effort, mode, + stringResource(R.string.agent_plan_short).takeIf { AgentHost.plan && AgentHost.harness.plans }, + ) Text(parts.joinToString(" · "), fontSize = 13.sp, color = if (panel == AgentPanel.MODEL) pal.primary else pal.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f, fill = false)) Icon(Icons.Outlined.ExpandMore, null, tint = pal.onSurfaceVariant, modifier = Modifier.size(16.dp)) @@ -523,6 +534,39 @@ internal fun clock(seconds: Long): String { } } +/** The oldest tool call that waits for the user; tapping its input shows all of it. */ +@Composable +private fun AgentApprovalCard(approval: AgentHost.Approval, more: Int) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var open by remember(approval.id) { mutableStateOf(false) } + Column( + Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, AttentionAmber, Shape14) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("agent-approval"), + ) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Column(Modifier.weight(1f)) { + Text(stringResource(R.string.agent_approval_title, approval.tool), fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + if (more > 0) Text(stringResource(R.string.agent_approval_more, more), fontSize = 12.5.sp, color = pal.onSurfaceVariant) + } + SecondaryButton(stringResource(R.string.agent_approval_deny), compact = true, modifier = Modifier.testTag("agent-approval-deny")) { + AgentHost.answer(context, approval, allow = false) + } + PrimaryButton(stringResource(R.string.agent_approval_allow), compact = true, modifier = Modifier.testTag("agent-approval-allow")) { + AgentHost.answer(context, approval, allow = true) + } + } + val body = approval.input.ifBlank { approval.detail } + val shown = Modifier.fillMaxWidth().padding(top = 6.dp) + .then(if (open) Modifier.heightIn(max = 280.dp).verticalScroll(rememberScrollState()) else Modifier).clickable { open = !open } + if (body.isNotBlank()) Text( + body, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = pal.onSurfaceVariant, + maxLines = if (open) Int.MAX_VALUE else 4, overflow = TextOverflow.Ellipsis, modifier = shown, + ) + } +} + @Composable private fun AgentLabCard() { val context = LocalContext.current @@ -675,7 +719,7 @@ private fun AgentComposer( val text = draft.trim() when (text.substringBefore(' ')) { "/new" -> AgentHost.forget(context) - "/model" -> onPanel(AgentPanel.MODEL) + "/model", "/permissions" -> onPanel(AgentPanel.MODEL) "/plan" -> AgentHost.choosePlan(context, !AgentHost.plan) "/history" -> onPanel(AgentPanel.HISTORY) "/processes" -> onPanel(AgentPanel.PROCESSES) @@ -692,6 +736,7 @@ private fun AgentComposer( val keyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0 Column(Modifier.fillMaxWidth().padding(bottom = if (keyboardOpen) 4.dp else 8.dp)) { if (labOpen) AgentLabCard() + AgentHost.approvals.firstOrNull()?.let { AgentApprovalCard(it, AgentHost.approvals.size - 1) } if (hasActivity()) Row( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.padding(top = 8.dp).fillMaxWidth().horizontalScroll(rememberScrollState()), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt index 1029db97ea..a462fca130 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPanels.kt @@ -67,7 +67,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.withContext -/** The model, reasoning effort and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ +/** The model, reasoning effort, permissions and plan mode for the next turns; a conversation keeps going with whatever is chosen. */ @Composable internal fun AgentModelPicker() { val context = LocalContext.current @@ -92,6 +92,20 @@ internal fun AgentModelPicker() { } } } + val modes = AgentHost.harness.permissions + if (modes.size > 1) Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { + Text(stringResource(R.string.agent_permissions), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 2.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.horizontalScroll(rememberScrollState())) { + for (mode in modes) { + val label = stringResource(mode.label) + if (mode.id == AgentHost.permission) PrimaryButton(label, compact = true, modifier = Modifier.testTag("agent-permission")) {} + else SecondaryButton(label, compact = true, modifier = Modifier.testTag("agent-permission")) { AgentHost.choosePermission(context, mode.id) } + } + } + modes.firstOrNull { it.id == AgentHost.permission }?.let { + Text(stringResource(it.hint), fontSize = 12.5.sp, color = pal.onSurfaceVariant, modifier = Modifier.padding(horizontal = 2.dp)) + } + } if (AgentHost.harness.plans) Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(horizontal = 2.dp)) { Column(Modifier.weight(1f)) { Text(stringResource(R.string.agent_plan), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt index 00d7880937..3f7293b748 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -48,7 +48,7 @@ import com.droiddeck.launcher.agent.AgentSetup.Step import com.droiddeck.launcher.core.WirelessAdbPairingService @Composable -internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { +internal fun AgentSetupView(modifier: Modifier, firstControl: Modifier = Modifier, onDone: () -> Unit = {}) { val context = LocalContext.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current @@ -78,7 +78,7 @@ internal fun AgentSetupView(modifier: Modifier, onDone: () -> Unit = {}) { Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { for (harness in AgentHarness.all) { val chosen = harness == AgentHost.harness - if (chosen) PrimaryButton(harness.name, compact = true) {} else SecondaryButton(harness.name, enabled = !AgentSetup.busy, compact = true) { AgentHost.choose(context, harness) } + if (chosen) PrimaryButton(harness.name, compact = true, modifier = firstControl) {} else SecondaryButton(harness.name, enabled = !AgentSetup.busy, compact = true) { AgentHost.choose(context, harness) } } } val steps = Step.entries diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt index cb438903b7..d65852ece2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionDrawerPage.kt @@ -14,7 +14,7 @@ internal enum class SessionDrawerPage(val firstControl: String) { } internal fun sessionDrawerPages( - hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentHost.installed && com.droiddeck.launcher.agent.AgentTab.shown, + hasSecondScreen: Boolean, hasGlasses: Boolean = false, hasAgent: Boolean = com.droiddeck.launcher.agent.AgentTab.shown, ): List = SessionDrawerPage.entries.filter { (hasSecondScreen || it != SessionDrawerPage.SECOND_SCREEN) && (hasGlasses || it != SessionDrawerPage.GLASSES) && diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index da2cf23085..44e51c682c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1256,6 +1256,7 @@ Agent finished Agent stopped with an error Agent has a question + Agent is waiting for your OK %d step %d steps @@ -1333,6 +1334,21 @@ Plan first Plan Proposes a plan without changing anything + Permissions + Ask first + Asks before edits and commands that need your OK + Accept edits + Edits files freely, asks before commands + Auto + A safety check decides, blocking risky actions + Don\'t ask + Denies anything your settings don\'t allow + Full access + Runs everything without asking + Allow %1$s? + Allow + Deny + +%1$d more Conversations No conversations yet Just now diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt index 30cb71009e..e51a0d2fca 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentHostTest.kt @@ -84,10 +84,10 @@ class AgentHostTest { val command = ClaudeCode.turn("hello there", null, AgentHarness.Options()) assertEquals("stream-json", command[command.indexOf("--input-format") + 1]) assertFalse("hello there" in command) - val line = org.json.JSONObject(ClaudeCode.input("hello there")!!) + val line = org.json.JSONObject(ClaudeCode.input("hello there")) assertEquals("user", line.getString("type")) assertEquals("hello there", line.getJSONObject("message").getJSONArray("content").getJSONObject(0).getString("text")) - assertNull(Codex.input("hi")) + assertEquals(listOf(ClaudeCode.input("hi")), ClaudeCode.protocol().input("hi", "abc", AgentHarness.Options(), started = false)) } @Test fun aTaskNotificationResultIsMarkedBackgroundAndCarriesItsUsage() { @@ -126,13 +126,35 @@ class AgentHostTest { assertTrue(used("Monitor", """{"command":"tail -f log"}""").background) } - @Test fun claudeTurnsBypassPermissionsOrPlanAndTakeAModel() { + @Test fun claudeTurnsAskFirstByDefaultAndTakeAModel() { val first = ClaudeCode.turn("hi", null, AgentHarness.Options()) - assertTrue("bypassPermissions" in first && "--resume" !in first && "--model" !in first && "--include-partial-messages" in first) + assertEquals("manual", first[first.indexOf("--permission-mode") + 1]) + assertTrue("--permission-prompt-tool=stdio" in first && "--resume" !in first && "--model" !in first && "--include-partial-messages" in first) val next = ClaudeCode.turn("hi", "abc", AgentHarness.Options(model = "opus", plan = true)) assertEquals("abc", next[next.indexOf("--resume") + 1]) assertEquals("opus", next[next.indexOf("--model") + 1]) assertEquals("plan", next[next.indexOf("--permission-mode") + 1]) + assertFalse("--permission-prompt-tool=stdio" in next) + fun mode(permission: String) = ClaudeCode.turn("hi", null, AgentHarness.Options(permission = permission)).let { it[it.indexOf("--permission-mode") + 1] } + assertEquals(listOf("manual", "acceptEdits", "auto", "dontAsk", "bypassPermissions"), ClaudeCode.permissions.map { mode(it.id) }) + assertFalse("--permission-prompt-tool=stdio" in ClaudeCode.turn("hi", null, AgentHarness.Options(permission = AgentHarness.FULL))) + } + + @Test fun claudePermissionPromptsBecomeApprovalsAnsweredOnStdin() { + val event = ClaudeCode.parse("""{"type":"control_request","request_id":"r1","request":{"subtype":"can_use_tool","tool_name":"Bash","input":{"command":"rm -rf build"},"tool_use_id":"t1"}}""")!! + val approval = event.approval!! + assertEquals(AgentHost.Approval("r1", "Bash", "rm -rf build", "rm -rf build", """{"command":"rm -rf build"}"""), approval) + val allow = org.json.JSONObject(ClaudeCode.answer(approval, allow = true)) + assertEquals("control_response", allow.getString("type")) + val response = allow.getJSONObject("response") + assertEquals("r1", response.getString("request_id")) + assertEquals("allow", response.getJSONObject("response").getString("behavior")) + assertEquals("rm -rf build", response.getJSONObject("response").getJSONObject("updatedInput").getString("command")) + val deny = org.json.JSONObject(ClaudeCode.answer(approval, allow = false)).getJSONObject("response").getJSONObject("response") + assertEquals("deny", deny.getString("behavior")) + assertTrue(deny.getString("message").isNotEmpty()) + assertEquals("r1", ClaudeCode.parse("""{"type":"control_cancel_request","request_id":"r1"}""")!!.resolved) + assertNull(ClaudeCode.parse("""{"type":"control_request","request_id":"r2","request":{"subtype":"hook_callback"}}""")) } @Test fun claudeShowsWholeEditsAndTodos() { @@ -142,28 +164,99 @@ class AgentHostTest { """{"todos":[{"content":"read","status":"completed"},{"content":"fix","status":"in_progress"},{"content":"test","status":"pending"}]}"""))) } - @Test fun codexEventsBecomeEntries() { - assertEquals("t1", Codex.parse("""{"type":"thread.started","thread_id":"t1"}""")!!.conversation) - assertEquals(listOf(Entry.Used("i1", "Shell", "uname -m", "uname -m")), - Codex.parse("""{"type":"item.started","item":{"id":"i1","type":"command_execution","command":"uname -m","status":"in_progress"}}""")!!.entries) - assertEquals(listOf(Entry.Result("i1", "aarch64\n", false)), - Codex.parse("""{"type":"item.completed","item":{"id":"i1","type":"command_execution","command":"uname -m","aggregated_output":"aarch64\n","exit_code":0}}""")!!.entries) - assertEquals(listOf(Entry.Said("It is aarch64.")), - Codex.parse("""{"type":"item.completed","item":{"id":"i2","type":"agent_message","text":"It is aarch64."}}""")!!.entries) - assertEquals(Entry.Used("i3", "Edit", "a.kt, b.kt", "a.kt\nb.kt"), - Codex.parse("""{"type":"item.completed","item":{"id":"i3","type":"file_change","status":"completed","changes":[{"path":"a.kt"},{"path":"b.kt"}]}}""")!!.entries.first()) - assertEquals(listOf(Entry.Finished(null)), Codex.parse("""{"type":"turn.completed","usage":{}}""")!!.entries) - assertEquals(listOf(Entry.Finished("quota")), Codex.parse("""{"type":"turn.failed","error":{"message":"quota"}}""")!!.entries) - assertNull(Codex.parse("""{"type":"error","message":"Reconnecting... 1/5 (stream disconnected before completion)"}""")) - assertEquals(listOf(Entry.Finished("unauthorized")), Codex.parse("""{"type":"error","message":"unauthorized"}""")!!.entries) - assertNull(Codex.parse("""{"type":"item.started","item":{"type":"reasoning"}}""")) + private fun json(line: String) = org.json.JSONObject(line) + + @Test fun codexOpensAThreadThenStartsTheTurn() { + val command = Codex.turn("hi", null, AgentHarness.Options()) + assertEquals(listOf("/root/.local/bin/codex", "app-server"), command.takeLast(2)) + assertTrue(command[2].endsWith("2>/root/.cache/droiddeck/codex.log")) + val p = Codex.Protocol() + val init = json(p.input("hi", null, AgentHarness.Options(model = "gpt", effort = "high", brief = "brief"), started = true).single()) + assertEquals("initialize", init.getString("method")) + val lines = p.parse("""{"id":${init.getInt("id")},"result":{"userAgent":"codex"}}""")!!.reply + assertEquals(listOf("initialized", "thread/start"), lines.map { json(it).getString("method") }) + val start = json(lines[1]) + val params = start.getJSONObject("params") + assertEquals("untrusted", params.getString("approvalPolicy")) + assertEquals("danger-full-access", params.getString("sandbox")) + assertEquals("brief", params.getString("developerInstructions")) + val opened = p.parse("""{"id":${start.getInt("id")},"result":{"thread":{"id":"t1"},"approvalPolicy":"untrusted"}}""")!! + assertEquals("t1", opened.conversation) + val turn = json(opened.reply.single()) + assertEquals("turn/start", turn.getString("method")) + assertEquals("t1", turn.getJSONObject("params").getString("threadId")) + assertEquals("hi", turn.getJSONObject("params").getJSONArray("input").getJSONObject(0).getString("text")) + assertEquals("high", turn.getJSONObject("params").getString("effort")) + val next = json(p.input("again", "t1", AgentHarness.Options(), started = false).single()) + assertEquals("turn/start", next.getString("method")) + assertEquals("t1", next.getJSONObject("params").getString("threadId")) + fun opening(q: Codex.Protocol, conversation: String?, options: AgentHarness.Options): org.json.JSONObject { + val id = json(q.input("hi", conversation, options, started = true).single()).getInt("id") + return json(q.parse("""{"id":$id,"result":{}}""")!!.reply.last()) + } + val resumed = opening(Codex.Protocol(), "t9", AgentHarness.Options(permission = AgentHarness.FULL)) + assertEquals("thread/resume", resumed.getString("method")) + assertEquals("t9", resumed.getJSONObject("params").getString("threadId")) + assertEquals("never", resumed.getJSONObject("params").getString("approvalPolicy")) + assertEquals(listOf(Entry.Finished("no such thread")), Codex.Protocol().let { q -> + val id = opening(q, "gone", AgentHarness.Options()).getInt("id") + q.parse("""{"id":$id,"error":{"code":-32600,"message":"no such thread"}}""")!!.entries + }) + // A thread that failed to open is asked for again on the same connection without a second initialize. + Codex.Protocol().let { q -> + val id = opening(q, "gone", AgentHarness.Options()).getInt("id") + q.parse("""{"id":$id,"error":{"code":-32600,"message":"no such thread"}}""") + assertEquals(listOf("thread/resume"), q.input("again", "gone", AgentHarness.Options(), started = false).map { json(it).getString("method") }) + } + assertEquals(listOf(Entry.Finished("not signed in")), Codex.Protocol().let { q -> + val id = json(q.input("hi", null, AgentHarness.Options(), started = true).single()).getInt("id") + q.parse("""{"id":$id,"error":{"code":-32600,"message":"not signed in"}}""")!!.entries + }) } - @Test fun codexTurnsSkipItsSandboxResumeAndTakeAModel() { - assertEquals(listOf("/root/.local/bin/codex", "exec", "--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "hi"), - Codex.turn("hi", null, AgentHarness.Options())) - assertEquals(listOf("/root/.local/bin/codex", "exec", "resume", "t1", "--json", "--dangerously-bypass-approvals-and-sandbox", "--skip-git-repo-check", "-m", "gpt", "hi"), - Codex.turn("hi", "t1", AgentHarness.Options(model = "gpt"))) + @Test fun codexItemsBecomeEntries() { + val p = Codex.Protocol() + assertEquals(listOf(Entry.Used("e1", "Shell", "touch x", "touch x")), p.parse( + """{"method":"item/started","params":{"item":{"type":"commandExecution","id":"e1","command":"/bin/bash -lc 'touch x'","status":"inProgress","aggregatedOutput":null,"exitCode":null}}}""")!!.entries) + assertEquals(listOf(Entry.Result("e1", "", false)), p.parse( + """{"method":"item/completed","params":{"item":{"type":"commandExecution","id":"e1","command":"/bin/bash -lc 'touch x'","status":"completed","aggregatedOutput":null,"exitCode":0}}}""")!!.entries) + assertTrue((p.parse("""{"method":"item/completed","params":{"item":{"type":"commandExecution","id":"e2","command":"false","status":"declined","aggregatedOutput":null,"exitCode":null}}}""")!!.entries.single() as Entry.Result).failed) + assertEquals(listOf(Entry.Said("done")), p.parse("""{"method":"item/completed","params":{"item":{"type":"agentMessage","id":"m1","text":"done","phase":"final_answer"}}}""")!!.entries) + assertEquals("Do", p.parse("""{"method":"item/agentMessage/delta","params":{"itemId":"m1","delta":"Do"}}""")!!.text) + assertEquals(listOf(Entry.Used("f1#0", "Edit", "/w/note.txt", "/w/note.txt\n+hi")), p.parse( + """{"method":"item/started","params":{"item":{"type":"fileChange","id":"f1","changes":[{"path":"/w/note.txt","kind":{"type":"add"},"diff":"hi\n"}],"status":"inProgress"}}}""")!!.entries) + assertEquals(listOf(Entry.Result("f1#0", "", false)), p.parse( + """{"method":"item/completed","params":{"item":{"type":"fileChange","id":"f1","changes":[{"path":"/w/note.txt","kind":{"type":"add"},"diff":"hi\n"}],"status":"completed"}}}""")!!.entries) + p.parse("""{"method":"turn/started","params":{"turn":{"id":"u1"}}}""") + assertEquals("[x] read\n[~] fix\n[ ] test", (p.parse("""{"method":"turn/plan/updated","params":{"plan":[{"step":"read","status":"completed"},{"step":"fix","status":"inProgress"},{"step":"test","status":"pending"}]}}""")!!.entries.single() as Entry.Used).input) + val usage = p.parse("""{"method":"thread/tokenUsage/updated","params":{"tokenUsage":{"total":{"totalTokens":32017},"last":{"totalTokens":16055,"inputTokens":16019,"outputTokens":36},"modelContextWindow":258400}}}""")!! + assertEquals(16_055L, usage.context) + assertEquals(258_400L, usage.window) + assertEquals(listOf(AgentHost.Limit(10_080, 84, 1795123687)), p.parse( + """{"method":"account/rateLimits/updated","params":{"rateLimits":{"limitId":"codex","primary":{"usedPercent":84,"windowDurationMins":10080,"resetsAt":1795123687},"secondary":null}}}""")!!.limits) + val end = p.parse("""{"method":"turn/completed","params":{"turn":{"id":"u1","status":"completed","error":null,"durationMs":4200}}}""")!! + assertEquals(listOf(Entry.Finished(null)), end.entries) + assertEquals(AgentHost.Usage(4200, 0.0, 16_019, 36), end.usage) + assertEquals(listOf(Entry.Finished("quota")), p.parse("""{"method":"turn/completed","params":{"turn":{"id":"u2","status":"failed","error":{"message":"quota"},"durationMs":null}}}""")!!.entries) + assertNull(p.parse("""{"method":"error","params":{"error":{"message":"Reconnecting..."},"willRetry":true}}""")) + assertNull(p.parse("not json")) + } + + @Test fun codexApprovalRequestsWaitForTheUser() { + val p = Codex.Protocol() + val command = p.parse("""{"method":"item/commandExecution/requestApproval","id":0,"params":{"kind":"command","itemId":"e1","command":"/bin/bash -lc 'touch x'","cwd":"/w"}}""")!!.approval!! + assertEquals(AgentHost.Approval("0", "Shell", "touch x", "touch x", """{"id":0}"""), command) + assertEquals("""{"id":0,"result":{"decision":"accept"}}""", p.answer(command, allow = true)) + assertEquals("decline", json(p.answer(command, allow = false)).getJSONObject("result").getString("decision")) + p.parse("""{"method":"item/started","params":{"item":{"type":"fileChange","id":"f1","changes":[{"path":"/w/a.kt","kind":{"type":"update"},"diff":"@@ -1 +1 @@\n-old\n+new\n"}],"status":"inProgress"}}}""") + val edit = p.parse("""{"method":"item/fileChange/requestApproval","id":1,"params":{"itemId":"f1","reason":null}}""")!!.approval!! + assertEquals("Edit", edit.tool) + assertEquals("/w/a.kt", edit.detail) + assertEquals("/w/a.kt\n-old\n+new", edit.input) + val refused = json(p.parse("""{"method":"item/tool/requestUserInput","id":2,"params":{}}""")!!.reply.single()) + assertEquals(2, refused.getInt("id")) + assertTrue(refused.has("error")) + assertEquals("1", p.parse("""{"method":"serverRequest/resolved","params":{"requestId":1}}""")!!.resolved) } @Test fun aToolIdUsedAgainInALaterTurnIsANewCall() { @@ -289,28 +382,6 @@ class AgentHostTest { assertEquals(1_000_000L, result.window) } - @Test fun codexTokenCountsCarryContextAndLimits() { - val event = Codex.tokenCount("""{"timestamp":"t","type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"total_tokens":90000},"last_token_usage":{"total_tokens":41000},"model_context_window":272000},"rate_limits":{"primary":{"used_percent":12.5,"window_minutes":300,"resets_at":1794435600},"secondary":{"used_percent":40.0,"window_minutes":10080,"resets_at":1794592800}}}}""")!! - assertEquals(41_000L, event.context) - assertEquals(272_000L, event.window) - assertEquals(listOf(AgentHost.Limit(300, 12, 1794435600), AgentHost.Limit(10_080, 40, 1794592800)), event.limits) - assertNull(Codex.tokenCount("""{"type":"event_msg","payload":{"type":"agent_message"}}""")) - } - - @Test fun codexUsageComesFromTheThreadsSessionLog() { - val root = Files.createTempDirectory("rootfs").toFile() - val log = File(root, "root/.codex/sessions/2026/11/12/rollout-2026-11-12T10-00-00-thread1.jsonl").apply { parentFile!!.mkdirs() } - log.writeText( - """{"type":"event_msg","payload":{"type":"token_count","info":{"last_token_usage":{"total_tokens":15692},"model_context_window":258400},"rate_limits":{"primary":{"used_percent":86.0,"window_minutes":10080,"resets_at":1794716485},"secondary":null}}}""" + "\n" + - """{"type":"response_item","payload":{"type":"additional_tools","tools":[{"description":"reports token_count as it goes"}]}}""" + "\n", - ) - val event = Codex.usage(root, "thread1")!! - assertEquals(15_692L, event.context) - assertEquals(258_400L, event.window) - assertEquals(listOf(AgentHost.Limit(10_080, 86, 1794716485)), event.limits) - assertNull(Codex.usage(root, "other")) - } - @Test fun limitsRoundTripThroughPrefs() { val limits = listOf(AgentHost.Limit(300, 7, 1794435600), AgentHost.Limit(10_080, 85, 1794592800)) assertEquals(limits, AgentHost.decodeLimits(AgentHost.encodeLimits(limits))) diff --git a/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt index d05f5f09f3..24ce085ec0 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/OpenCodeTest.kt @@ -18,61 +18,133 @@ import java.nio.file.Files class OpenCodeTest { private val session = "ses_1" - private fun event(type: String, part: String) = """{"type":"$type","timestamp":1,"sessionID":"$session","part":$part}""" + private fun json(line: String) = JSONObject(line) + private fun update(u: String) = """{"jsonrpc":"2.0","method":"session/update","params":{"sessionId":"$session","update":$u}}""" - @Test fun turnsResumeByIdAndCarryModelPlanAndVariant() { - assertEquals(listOf(OpenCode.binary, "run", "--format", "json", "--auto", "--thinking", "--", "brief\n\nhi"), - OpenCode.turn("hi", null, AgentHarness.Options(brief = "brief"))) - assertEquals(listOf(OpenCode.binary, "run", "--format", "json", "--auto", "--thinking", "-s", "ses_1", "--agent", "plan", - "-m", "opencode/big-pickle", "--variant", "high", "--", "-hi"), - OpenCode.turn("-hi", "ses_1", AgentHarness.Options(model = "opencode/big-pickle", plan = true, brief = "brief", effort = "high"))) + /** Drives a new process through initialize and session/new to the prompt, returning it and the prompt's id. */ + private fun opened(options: AgentHarness.Options = AgentHarness.Options()): Pair { + val p = OpenCode.Protocol() + var line = p.input("hi", null, options, started = true).single() + var result = "{}" + while (true) { + val request = json(line) + if (request.getString("method") == "session/prompt") return p to request.getInt("id") + if (request.getString("method") == "session/new") result = """{"sessionId":"$session"}""" + line = p.parse("""{"jsonrpc":"2.0","id":${request.getInt("id")},"result":$result}""")!!.reply.single() + } } - @Test fun textReasoningAndStepsBecomeEntries() { - OpenCode.turn("hi", null, AgentHarness.Options()) - assertEquals(session, OpenCode.parse(event("step_start", """{"type":"step-start"}"""))!!.conversation) - assertEquals(listOf(Entry.Said("x86_64")), OpenCode.parse(event("text", """{"type":"text","text":" x86_64\n"}"""))!!.entries) - assertEquals(listOf(Entry.Thought("why")), OpenCode.parse(event("reasoning", """{"type":"reasoning","text":"why"}"""))!!.entries) - val step = OpenCode.parse(event("step_finish", """{"reason":"tool-calls","tokens":{"total":7894,"input":6013,"output":89,"reasoning":0,"cache":{"write":0,"read":1792}},"cost":0.01}"""))!! - assertEquals(emptyList(), step.entries) - assertEquals(7894L, step.context) - val end = OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"total":7927,"input":241,"output":6,"reasoning":2,"cache":{"write":0,"read":7680}},"cost":0.02}"""))!! - assertEquals(listOf(Entry.Finished(null)), end.entries) - assertEquals(AgentHost.Usage(0, 0.03, 6013L + 1792 + 241 + 7680, 89L + 6 + 2), end.usage!!.copy(costUsd = Math.round(end.usage!!.costUsd * 100) / 100.0)) + @Test fun turnsServeAcpUnderTheChosenRules() { + val command = OpenCode.turn("hi", null, AgentHarness.Options()).dropWhile { it != "/usr/bin/env" } + assertEquals(listOf("/usr/bin/env", OpenCode.binary, "acp"), listOf(command[0]) + command.drop(2)) + val ask = json(command[1].removePrefix("OPENCODE_PERMISSION=")) + assertEquals("ask", ask.getString("edit")) + assertEquals("ask", ask.getString("bash")) + assertFalse(ask.has("*")) + assertEquals("allow", OpenCode.rules(AgentHarness.EDITS).getString("edit")) + assertEquals("ask", OpenCode.rules(AgentHarness.EDITS).getString("bash")) + assertEquals("""{"*":"allow"}""", OpenCode.rules(AgentHarness.FULL).toString()) } - @Test fun eachTurnCountsOnlyItsOwnSteps() { - OpenCode.turn("one", null, AgentHarness.Options()) - OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"input":100,"output":10,"cache":{}},"cost":1}""")) - OpenCode.turn("two", session, AgentHarness.Options()) - val end = OpenCode.parse(event("step_finish", """{"reason":"stop","tokens":{"input":5,"output":1,"cache":{}},"cost":0}"""))!! - assertEquals(AgentHost.Usage(0, 0.0, 5, 1), end.usage) + @Test fun aNewProcessOpensItsSessionAndSetsModelModeAndEffortBeforeThePrompt() { + val p = OpenCode.Protocol() + val init = json(p.input("hi", null, AgentHarness.Options(model = "opencode/big-pickle", effort = "high", brief = "brief", workdir = "/root/DroidDeck"), started = true).single()) + assertEquals("initialize", init.getString("method")) + val new = json(p.parse("""{"jsonrpc":"2.0","id":${init.getInt("id")},"result":{"protocolVersion":1}}""")!!.reply.single()) + assertEquals("session/new", new.getString("method")) + assertEquals("/root/DroidDeck", new.getJSONObject("params").getString("cwd")) + val created = p.parse("""{"jsonrpc":"2.0","id":${new.getInt("id")},"result":{"sessionId":"$session","configOptions":[]}}""")!! + assertEquals(session, created.conversation) + val sent = mutableListOf() + var line = created.reply.single() + while (true) { + val request = json(line) + sent += request + if (request.getString("method") == "session/prompt") break + // A refused effort, one the model does not have, does not stop the turn. + val refused = request.getJSONObject("params").getString("configId") == "effort" + val answer = if (refused) """"error":{"code":-32602,"message":"no"}""" else """"result":{}""" + line = p.parse("""{"jsonrpc":"2.0","id":${request.getInt("id")},$answer}""")!!.reply.single() + } + assertEquals(listOf("model" to "opencode/big-pickle", "effort" to "high", "mode" to "build"), + sent.dropLast(1).map { it.getJSONObject("params").let { o -> o.getString("configId") to o.getString("value") } }) + assertEquals("brief\n\nhi", sent.last().getJSONObject("params").getJSONArray("prompt").getJSONObject(0).getString("text")) + val again = json(p.input("two", session, AgentHarness.Options(brief = "brief"), started = false).single()) + assertEquals("session/prompt", again.getString("method")) + assertEquals("two", again.getJSONObject("params").getJSONArray("prompt").getJSONObject(0).getString("text")) } - @Test fun toolsBecomeCallsWithTheirResults() { - val bash = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c1","state":{"status":"completed","input":{"command":"uname -m"},"output":"aarch64\n","metadata":{"exit":0}}}"""))!! - assertEquals(listOf(Entry.Used("c1", "Bash", "uname -m", "uname -m"), Entry.Result("c1", "aarch64\n", false)), bash.entries) - val failed = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c2","state":{"status":"completed","input":{"command":"false"},"output":"(no output)","metadata":{"exit":1}}}"""))!! - assertTrue((failed.entries[1] as Entry.Result).failed) - val edit = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"edit","callID":"c3","state":{"status":"completed","input":{"filePath":"/w/a.txt","oldString":"hi","newString":"bye"},"output":"Edit applied successfully."}}"""))!! - assertEquals(Entry.Used("c3", "Edit", "/w/a.txt", "/w/a.txt\n-hi\n+bye"), edit.entries[0]) - val write = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"write","callID":"c4","state":{"status":"completed","input":{"filePath":"/w/b.txt","content":"one\n"},"output":"Wrote file successfully."}}"""))!! - assertEquals("/w/b.txt\n+one", (write.entries[0] as Entry.Used).input) - val todo = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"todowrite","callID":"c5","state":{"status":"completed","input":{"todos":[{"content":"A","status":"completed"},{"content":"B","status":"in_progress"},{"content":"C","status":"pending"}]},"output":"[]"}}"""))!! - assertEquals("[x] A\n[~] B\n[ ] C", (todo.entries[0] as Entry.Used).input) - val read = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"read","callID":"c6","state":{"status":"error","input":{"filePath":"/nope"},"error":"File not found"}}"""))!! - assertEquals("Read", (read.entries[0] as Entry.Used).tool) - assertEquals("/nope", (read.entries[0] as Entry.Used).detail) - assertEquals(Entry.Result("c6", "File not found", true), read.entries[1]) - val running = OpenCode.parse(event("tool_use", """{"type":"tool","tool":"bash","callID":"c7","state":{"status":"running","input":{"command":"sleep 9"}}}"""))!! - assertEquals(listOf(Entry.Used("c7", "Bash", "sleep 9", "sleep 9")), running.entries) + @Test fun aResumedSessionPlansWhenAsked() { + val p = OpenCode.Protocol() + val init = json(p.input("hi", "ses_9", AgentHarness.Options(plan = true), started = true).single()) + val resume = json(p.parse("""{"jsonrpc":"2.0","id":${init.getInt("id")},"result":{}}""")!!.reply.single()) + assertEquals("session/resume", resume.getString("method")) + assertEquals("ses_9", resume.getJSONObject("params").getString("sessionId")) + val resumed = p.parse("""{"jsonrpc":"2.0","id":${resume.getInt("id")},"result":{"configOptions":[]}}""")!! + assertEquals("ses_9", resumed.conversation) + val mode = json(resumed.reply.single()) + assertEquals("plan", mode.getJSONObject("params").getString("value")) + assertEquals(listOf(Entry.Finished("Invalid mode")), p.parse("""{"jsonrpc":"2.0","id":${mode.getInt("id")},"error":{"code":-32602,"message":"Invalid mode"}}""")!!.entries) + // The next message on the same process asks for the mode again rather than prompting in whatever mode the session has. + val retry = json(p.input("again", "ses_9", AgentHarness.Options(plan = true), started = false).single()) + assertEquals("session/set_config_option", retry.getString("method")) + assertEquals("plan", retry.getJSONObject("params").getString("value")) + val prompt = json(p.parse("""{"jsonrpc":"2.0","id":${retry.getInt("id")},"result":{}}""")!!.reply.single()) + assertEquals("session/prompt", prompt.getString("method")) + p.parse("""{"jsonrpc":"2.0","id":${prompt.getInt("id")},"result":{"stopReason":"end_turn"}}""") + assertEquals("session/prompt", json(p.input("third", "ses_9", AgentHarness.Options(plan = true), started = false).single()).getString("method")) + val gone = OpenCode.Protocol() + val id = json(gone.input("hi", "ses_x", AgentHarness.Options(), started = true).single()).getInt("id") + val resumeId = json(gone.parse("""{"jsonrpc":"2.0","id":$id,"result":{}}""")!!.reply.single()).getInt("id") + assertEquals(listOf(Entry.Finished("Session not found")), gone.parse("""{"jsonrpc":"2.0","id":$resumeId,"error":{"code":-32603,"message":"Internal error","data":{"message":"Session not found"}}}""")!!.entries) } - @Test fun errorsEndTheTurn() { - assertEquals(listOf(Entry.Finished("Invalid credential")), OpenCode.parse( - """{"type":"error","sessionID":"ses_1","error":{"name":"APIError","data":{"message":"Invalid credential","statusCode":401}}}""")!!.entries) - assertEquals(listOf(Entry.Finished("UnknownError")), OpenCode.parse("""{"type":"error","error":{"name":"UnknownError"}}""")!!.entries) - assertNull(OpenCode.parse("not json")) + @Test fun chunksAndToolCallsBecomeEntries() { + val (p, prompt) = opened() + assertEquals("We need", p.parse(update("""{"sessionUpdate":"agent_thought_chunk","content":{"type":"text","text":"We need"}}"""))!!.thinking) + val pending = p.parse(update("""{"sessionUpdate":"tool_call","toolCallId":"c1","title":"bash","kind":"execute","status":"pending","locations":[],"rawInput":{"cwd":"/work"}}"""))!! + assertEquals(listOf(Entry.Thought("We need"), Entry.Used("c1", "Bash", "", "")), pending.entries) + assertEquals(listOf(Entry.Used("c1", "Bash", "touch /work/probe.txt", "touch /work/probe.txt")), p.parse(update( + """{"sessionUpdate":"tool_call_update","toolCallId":"c1","status":"in_progress","kind":"execute","title":"touch /work/probe.txt","rawInput":{"command":"touch /work/probe.txt","cwd":"/work"}}"""))!!.entries) + assertEquals(listOf(Entry.Used("c1", "Bash", "touch /work/probe.txt", "touch /work/probe.txt"), Entry.Result("c1", "(no output)", false)), p.parse(update( + """{"sessionUpdate":"tool_call_update","toolCallId":"c1","status":"completed","title":"touch /work/probe.txt","content":[{"type":"content","content":{"type":"text","text":"(no output)"}}],"rawOutput":{"output":"(no output)","metadata":{"exit":0}}}"""))!!.entries) + p.parse(update("""{"sessionUpdate":"tool_call","toolCallId":"c2","title":"write","kind":"edit","status":"pending","rawInput":{}}""")) + assertEquals(Entry.Used("c2", "Write", "/work/note.txt", "/work/note.txt\n+hi"), p.parse(update( + """{"sessionUpdate":"tool_call_update","toolCallId":"c2","status":"in_progress","kind":"edit","title":"write","rawInput":{"content":"hi","filePath":"/work/note.txt"}}"""))!!.entries.single()) + assertEquals(Entry.Result("c2", "The user rejected permission to use this specific tool call.", true), p.parse(update( + """{"sessionUpdate":"tool_call_update","toolCallId":"c2","status":"failed","rawOutput":{"error":"The user rejected permission to use this specific tool call."}}"""))!!.entries[1]) + assertEquals("done", p.parse(update("""{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"done"}}"""))!!.text) + val usage = p.parse(update("""{"sessionUpdate":"usage_update","used":7760,"size":200000,"cost":{"amount":0.25,"currency":"USD"}}"""))!! + assertEquals(7760L, usage.context) + assertEquals(200_000L, usage.window) + val end = p.parse("""{"jsonrpc":"2.0","id":$prompt,"result":{"stopReason":"end_turn","usage":{"inputTokens":592,"outputTokens":3,"totalTokens":7763,"cachedReadTokens":7168}}}""")!! + assertEquals(listOf(Entry.Said("done"), Entry.Finished(null)), end.entries) + assertEquals(0.25, end.usage!!.costUsd, 0.0) + assertEquals(592L + 7168, end.usage!!.inputTokens) + assertTrue(OpenCode.sessionCost) + } + + @Test fun permissionRequestsWaitForTheUser() { + val (p, prompt) = opened() + p.parse(update("""{"sessionUpdate":"tool_call","toolCallId":"c1","title":"bash","kind":"execute","status":"pending","rawInput":{}}""")) + val bash = p.parse("""{"jsonrpc":"2.0","id":0,"method":"session/request_permission","params":{"sessionId":"$session","toolCall":{"toolCallId":"c1","title":"touch /w/x","kind":"execute","status":"pending","rawInput":{"command":"touch /w/x"}},"options":[{"optionId":"once","kind":"allow_once","name":"Allow once"},{"optionId":"reject","kind":"reject_once","name":"Reject"}]}}""")!!.approval!! + assertEquals(AgentHost.Approval("0", "Bash", "touch /w/x", "touch /w/x", """{"id":0}"""), bash) + val outside = p.parse("""{"jsonrpc":"2.0","id":5,"method":"session/request_permission","params":{"sessionId":"$session","toolCall":{"toolCallId":"c1","title":"touch /root/x","kind":"other","rawInput":{"command":"touch /root/x","parentDir":"/root"}}}}""")!!.approval!! + assertEquals("External directory", outside.tool) + assertEquals("/root", outside.detail) + val allow = json(p.answer(bash, allow = true)) + assertEquals(0, allow.getInt("id")) + assertEquals("once", allow.getJSONObject("result").getJSONObject("outcome").getString("optionId")) + assertEquals("reject", json(p.answer(bash, allow = false)).getJSONObject("result").getJSONObject("outcome").getString("optionId")) + val edit = p.parse("""{"jsonrpc":"2.0","id":1,"method":"session/request_permission","params":{"sessionId":"$session","toolCall":{"toolCallId":"c2","title":"/w/a.txt","kind":"edit","rawInput":{"filepath":"/w/a.txt","diff":"Index: /w/a.txt\n===\n--- /w/a.txt\n+++ /w/a.txt\n@@ -1,1 +1,1 @@\n-old\n+new\n"}}}}""")!!.approval!! + assertEquals("Edit", edit.tool) + assertEquals("/w/a.txt\n-old\n+new", edit.input) + val write = json(p.parse("""{"jsonrpc":"2.0","id":2,"method":"fs/write_text_file","params":{"sessionId":"$session","path":"/w/a.txt","content":"new"}}""")!!.reply.single()) + assertEquals(2, write.getInt("id")) + assertTrue(write.has("error")) + assertEquals(listOf(Entry.Finished("Invalid credential")), p.parse( + """{"jsonrpc":"2.0","id":$prompt,"error":{"code":-32603,"message":"Internal error","data":{"message":"Invalid credential"}}}""")!!.entries) + assertNull(p.parse("not json")) } @Test fun verboseModelListingGivesLabelsAndWindows() { @@ -108,16 +180,12 @@ class OpenCodeTest { assertEquals(mapOf("opencode/big-pickle" to 200000L, "opencode-go/kimi-k3" to 262144L), windows) } - @Test fun modelsAndWindowComeFromTheCachedListing() { + @Test fun modelsComeFromTheCachedListing() { val root = Files.createTempDirectory("rootfs").toFile() assertEquals(emptyList(), OpenCode.models(root)) File(root, "root/.cache/droiddeck/opencode-models").apply { parentFile!!.mkdirs() } .writeText("opencode/big-pickle\n{\n \"providerID\": \"opencode\",\n \"name\": \"Big Pickle\",\n \"limit\": {\"context\": 200000}\n}\n") assertEquals(listOf(AgentHarness.Model("opencode/big-pickle", "Big Pickle")), OpenCode.models(root)) - OpenCode.turn("hi", null, AgentHarness.Options(model = "opencode/big-pickle")) - assertEquals(200000L, OpenCode.usage(root, session)!!.window) - OpenCode.turn("hi", null, AgentHarness.Options()) - assertNull(OpenCode.usage(root, session)) } private fun provider(id: String) = OpenCode.providers.first { it.id == id } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt index 15888d289f..58b8ba055b 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionDrawerPageTest.kt @@ -5,7 +5,7 @@ import org.junit.Test class SessionDrawerPageTest { @Test fun singleScreenNavigationStartsWithControllerAndSkipsSecondScreen() { - val pages = sessionDrawerPages(false) + val pages = sessionDrawerPages(false, hasAgent = false) assertEquals(SessionDrawerPage.CONTROLLER, pages.first()) assertFalse(SessionDrawerPage.SECOND_SCREEN in pages) assertEquals(SessionDrawerPage.DISPLAY, pages.step(SessionDrawerPage.CONTROLLER, 1)) @@ -14,11 +14,11 @@ class SessionDrawerPageTest { } @Test fun connectedSecondaryDisplayAddsItsPageAfterControllerAndPreservesOtherPages() { - val connected = sessionDrawerPages(true) + val connected = sessionDrawerPages(true, hasAgent = false) assertEquals(SessionDrawerPage.SECOND_SCREEN, connected.step(SessionDrawerPage.CONTROLLER, 1)) assertEquals(SessionDrawerPage.DISPLAY, connected.step(SessionDrawerPage.SECOND_SCREEN, 1)) - assertEquals(sessionDrawerPages(false), connected.filter { it != SessionDrawerPage.SECOND_SCREEN }) - for (pages in listOf(connected, sessionDrawerPages(false))) { + assertEquals(sessionDrawerPages(false, hasAgent = false), connected.filter { it != SessionDrawerPage.SECOND_SCREEN }) + for (pages in listOf(connected, sessionDrawerPages(false, hasAgent = false))) { assertEquals(SessionDrawerPage.HUD, pages.step(SessionDrawerPage.DISPLAY, 1)) assertEquals(SessionDrawerPage.EFFECTS, pages.step(SessionDrawerPage.HUD, 1)) assertEquals(SessionDrawerPage.VR, pages.step(SessionDrawerPage.EFFECTS, 1)) @@ -27,7 +27,7 @@ class SessionDrawerPageTest { } } - @Test fun theAgentPageComesBeforeSessionOnlyWhenTheAgentIsInstalled() { + @Test fun theAgentPageComesBeforeSessionOnlyWhenTheTabIsShown() { val with = sessionDrawerPages(false, hasAgent = true) assertEquals(SessionDrawerPage.AGENT, with.step(SessionDrawerPage.GAMES, 1)) assertEquals(SessionDrawerPage.SESSION, with.step(SessionDrawerPage.AGENT, 1)) From 5b7409d1d5be04cd584fbe151dc41f73c4432d06 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 15:49:44 -0500 Subject: [PATCH 39/60] fix(game-env): restore D3D12 12_2 and shader model 6_9 for Kingdom Come: Deliverance II (#2787) * fix(game-env): run Kingdom Come: Deliverance II at D3D12 feature level 12_0 * fix(game-env): restore feature level 12_2 and shader model 6_9 for Kingdom Come: Deliverance II --- .../overlay/usr/local/bin/droiddeck-game-env | 15 +++++++++++---- tools/tests/test_game_environment.py | 12 ++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 042abd60bf..0e816b9dab 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -86,9 +86,10 @@ def game_files(exe): class Game: - def __init__(self, exe, args): + def __init__(self, exe, args, app_id=""): self.exe = exe self.args = args + self.app_id = app_id self.stem = os.path.splitext(os.path.basename(exe))[0].lower() self.files = game_files(exe) @@ -158,6 +159,12 @@ def ff7_rebirth_feature_level(game): return {"VKD3D_FEATURE_LEVEL": "12_2"}, [], "Final Fantasy VII Rebirth: D3D12 feature level 12_2 (the device-reported level fails its DX12 check)" +@fix +def kcd2_feature_level(game): + if game.app_id == "1771300": + return {"VKD3D_FEATURE_LEVEL": "12_2", "VKD3D_SHADER_MODEL": "6_9"}, [], "Kingdom Come: Deliverance II: D3D12 feature level 12_2 and shader model 6_9 (the detected level fails its startup check, and 12_0 alone stalls on the splash screen)" + + @fix def arkham_city_x87(game): if "batmanac.exe" in game.files: @@ -367,8 +374,8 @@ def offline_without_anticheat(command, env): return command[:2] + [game] + command[3:] -def engine_fixes(exe, args): - game = Game(exe, args) +def engine_fixes(exe, args, app_id=""): + game = Game(exe, args, app_id) env, extra, notes = {}, [], [] for check in FIXES: found = check(game) @@ -1405,7 +1412,7 @@ def main(): death_stranding_allocator(app_id, command[2]) ubisoft_overlay_off(env) project_zomboid_jvm(command) - fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) + fixes, extra, notes = engine_fixes(command[2], command[3:], app_id) if len(command) > 2 else ({}, [], []) if not gl_default: fixes.pop("vblank_mode", None) for note in notes: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 4b1974632b..18435ffb9c 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -1851,6 +1851,18 @@ class GameEnvironmentTest(unittest.TestCase): config = {"version": 1, "shared": {}, "games": {"42": {"VKD3D_FEATURE_LEVEL": "12_1"}}} self.assertEqual(MODULE["apply_config"]({}, config, "42", env), {"VKD3D_FEATURE_LEVEL": "12_1"}) + def test_kcd2_runs_at_feature_level_12_2_by_app_id_unless_the_game_overrides_it(self): + with tempfile.TemporaryDirectory() as tmp: + exe = Path(tmp) / "Bin/Win64MasterMasterSteamPGO/KingdomCome.exe" + exe.parent.mkdir(parents=True) + exe.touch() + env, extra, notes = MODULE["engine_fixes"](str(exe), [], "1771300") + self.assertEqual(env, {"VKD3D_FEATURE_LEVEL": "12_2", "VKD3D_SHADER_MODEL": "6_9"}) + self.assertTrue(notes) + config = {"version": 1, "shared": {}, "games": {"1771300": {"VKD3D_FEATURE_LEVEL": "12_1"}}} + self.assertEqual(MODULE["apply_config"]({}, config, "1771300", env), {"VKD3D_FEATURE_LEVEL": "12_1", "VKD3D_SHADER_MODEL": "6_9"}) + self.assertEqual(MODULE["engine_fixes"](str(exe), [], "42")[0], {}) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names): From b43724e5f328565b3512dfabc7af98a79f4d3782 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 16:39:07 -0500 Subject: [PATCH 40/60] revert(hud): redraw the FPS graph every game frame outside Strip (#2857) revert(hud): redraw the FPS graph every game frame outside Strip (#2843) --- .../com/droiddeck/launcher/hud/DroidDeckHudView.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index 21734186dd..bd04d149a2 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -290,9 +290,11 @@ class DroidDeckHudView(context: Context) : View(context) { periodDone.trySend(Unit) } if (graphRect == null) return - val now = SystemClock.uptimeMillis() - if (now - lastGraphDrawMs < GRAPH_REDRAW_MS) return - lastGraphDrawMs = now + if (stripRect != null) { + val now = SystemClock.uptimeMillis() + if (now - lastGraphDrawMs < STRIP_GRAPH_REDRAW_MS) return + lastGraphDrawMs = now + } invalidate() } @@ -1265,7 +1267,7 @@ class DroidDeckHudView(context: Context) : View(context) { const val TAB_PAD_X_SP = 7f const val TAB_PAD_Y_SP = 5.5f const val REFRESH_MS = 500L - const val GRAPH_REDRAW_MS = 66L + const val STRIP_GRAPH_REDRAW_MS = 66L private const val HUE_IDLE_MS = 500L const val MIN_SCALE = 0.5f const val MAX_SCALE = 2f From 6ed281f78d8eacc2a1123de953fcf4d34ee9ebb3 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 16:59:45 -0500 Subject: [PATCH 41/60] feat(xbox): install MSIXVC2 back-compat titles from their content boxes (#2851) * feat(xbox): install MSIXVC2 packages from their encrypted content boxes * feat(xbox): run a package's custom install actions once per prefix * fix(xbox): launch the program a launcher menu names instead of the menu * fix(xbox): check free space before an MSIXVC2 install starts * fix(xbox): keep a forwarded launch path relative when the install folder is reached through a link * fix(xbox): rebuild the MSIXVC2 patch on the final legacy install * fix(xbox): keep a backup whose release fails, and test an interrupted restore * fix(xbox): verify resumed msixvc2 files, contain writes, decode install action arguments * fix(xbox): keep one completion record per msixvc2 file, never follow a linked install state * fix(xbox): drop a torn msixvc2 completion record before appending to it * fix(xbox): repair a torn msixvc2 record from its tail instead of rereading it --- .../launcher/stores/xbox/XboxManifest.kt | 23 +- .../launcher/stores/xbox/XboxManifestTest.kt | 40 + .../overlay/usr/local/bin/droiddeck-xbox | 114 ++ tools/tests/test_xbox_launch.py | 95 ++ tools/xbox/README.md | 9 + tools/xbox/droiddeck-legacy-install.patch | 70 +- tools/xbox/droiddeck-msixvc2.patch | 1131 +++++++++++++++++ tools/xbox/prepare.py | 3 +- 8 files changed, 1464 insertions(+), 21 deletions(-) create mode 100644 tools/xbox/droiddeck-msixvc2.patch diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt index bb8bc0408d..d966dea1e8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxManifest.kt @@ -102,8 +102,29 @@ internal object XboxManifest { file = matches.single() } require(file.canonicalPath.startsWith(folder.canonicalPath + File.separator)) - if (file.isFile) return file.relativeTo(folder).invariantSeparatorsPath + if (file.isFile) return forwarded(folder, file) ?: file.relativeTo(folder).invariantSeparatorsPath } error("The Xbox package has no supported PC launch executable.") } + + private fun forwarded(folder: File, launcher: File): String? = try { + val arguments = File(launcher.parentFile, launcher.nameWithoutExtension + "LaunchArguments.txt") + if (!arguments.isFile || arguments.length() > 65_536) null + else arguments.readLines().firstNotNullOfOrNull { line -> + line.trim().takeIf { it.startsWith("exe=", ignoreCase = true) }?.substring(4)?.trim() + }?.takeIf { it.isNotEmpty() && !it.contains(':') }?.let { target -> located(folder.canonicalFile, launcher.parentFile.canonicalFile, target) } + } catch (_: java.io.IOException) { + null + } + + private fun located(root: File, start: File, target: String): String? { + var file = start + for (part in target.split('/', '\\').filter { it.isNotEmpty() && it != "." }) { + file = if (part == "..") file.parentFile ?: return null + else file.listFiles().orEmpty().filter { it.name.equals(part, true) }.singleOrNull() ?: return null + } + val resolved = file.canonicalFile + if (!resolved.isFile || !resolved.path.startsWith(root.path + File.separator) || !resolved.extension.equals("exe", true)) return null + return resolved.relativeTo(root).invariantSeparatorsPath + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt index d2396db935..d23072471a 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxManifestTest.kt @@ -16,6 +16,46 @@ class XboxManifestTest { java.io.File(root, "MicrosoftGame.Config").writeText("") assertEquals("Bin/Game.exe", XboxInstaller.executable(root)) } + @Test fun aLauncherMenuIsSkippedForTheProgramItNames() { + val root = temporary.newFolder() + java.io.File(root, "EmuMenu").mkdir() + java.io.File(root, "EmuMenu/EmuMenu.exe").writeText("menu") + java.io.File(root, "Emu.exe").writeText("emulator") + java.io.File(root, "MicrosoftGame.config").writeText("") + java.io.File(root, "EmuMenu/EmuMenuLaunchArguments.txt").writeText("exe=..\\Emu.exe\r\ntitlename=Game\r\n") + assertEquals("Emu.exe", XboxInstaller.executable(root)) + java.io.File(root, "EmuMenu/EmuMenuLaunchArguments.txt").writeText("exe=..\\..\\outside.exe\r\n") + assertEquals("EmuMenu/EmuMenu.exe", XboxInstaller.executable(root)) + java.io.File(root, "EmuMenu/EmuMenuLaunchArguments.txt").writeText("titlename=Game\r\n") + assertEquals("EmuMenu/EmuMenu.exe", XboxInstaller.executable(root)) + java.io.File(root, "EmuMenu/EmuMenuLaunchArguments.txt").writeText("exe=..\\EMU.EXE\r\n") + assertEquals("Emu.exe", XboxInstaller.executable(root)) + java.io.File(root, "emu.exe").writeText("other") + if (root.listFiles().orEmpty().count { it.name.equals("emu.exe", true) } == 2) + assertEquals("EmuMenu/EmuMenu.exe", XboxInstaller.executable(root)) + } + @Test fun anUnreadableForwardingFileFallsBackToTheDeclaredProgram() { + val root = temporary.newFolder() + java.io.File(root, "EmuMenu").mkdir() + java.io.File(root, "EmuMenu/EmuMenu.exe").writeText("menu") + java.io.File(root, "Emu.exe").writeText("emulator") + java.io.File(root, "MicrosoftGame.config").writeText("") + val arguments = java.io.File(root, "EmuMenu/EmuMenuLaunchArguments.txt").apply { writeText("exe=..\\Emu.exe\r\n") } + org.junit.Assume.assumeTrue(arguments.setReadable(false, false) && !arguments.canRead()) + try { assertEquals("EmuMenu/EmuMenu.exe", XboxInstaller.executable(root)) } finally { arguments.setReadable(true, false) } + } + @Test fun aForwardedProgramStaysRelativeWhenTheFolderIsReachedThroughALink() { + val real = temporary.newFolder() + java.io.File(real, "EmuMenu").mkdir() + java.io.File(real, "EmuMenu/EmuMenu.exe").writeText("menu") + java.io.File(real, "Emu.exe").writeText("emulator") + java.io.File(real, "MicrosoftGame.config").writeText("") + java.io.File(real, "EmuMenu/EmuMenuLaunchArguments.txt").writeText("exe=..\\Emu.exe\r\n") + val link = java.io.File(temporary.root, "linked") + val linked = runCatching { java.nio.file.Files.createSymbolicLink(link.toPath(), real.toPath()) }.isSuccess + org.junit.Assume.assumeTrue(linked) + assertEquals("Emu.exe", XboxInstaller.executable(link)) + } @Test fun rejectsTraversalAndExternalEntities() { for (xml in listOf("", "]>&external;", diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index f15e0b694a..ca7032cdc9 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -1,4 +1,5 @@ #!/usr/bin/python3 +import hashlib import hmac import json import os @@ -11,6 +12,7 @@ import subprocess import sys import tempfile import threading +import xml.etree.ElementTree as ElementTree BIN = Path(__file__).resolve().parent RUNTIME = Path('/usr/local/lib/droiddeck-xbox') @@ -137,6 +139,117 @@ def register_classes(proton, prefix, env): print('droiddeck-xbox: Windows Runtime class registration failed; launching without it', file=sys.stderr) +def game_config(exe): + path = Path(exe) + if not path.is_absolute(): + return None + for folder in list(path.parents)[:4]: + config = folder / 'MicrosoftGame.config' + if config.is_file(): + return config + return None + + +def windows_arguments(text): + arguments, current, quoted, started, at = [], [], False, False, 0 + while at < len(text): + char = text[at] + if char == '\\': + run = len(text) - at - len(text[at:].lstrip('\\')) + at += run + if at < len(text) and text[at] == '"': + current.append('\\' * (run // 2)) + if run % 2: + current.append('"') + at += 1 + else: + current.append('\\' * run) + started = True + continue + if char == '"': + if quoted and text[at + 1:at + 2] == '"': + current.append('"') + at += 2 + continue + quoted = not quoted + started = True + elif char in ' \t' and not quoted: + if started: + arguments.append(''.join(current)) + current, started = [], False + else: + current.append(char) + started = True + at += 1 + if started: + arguments.append(''.join(current)) + return arguments + + +def install_actions(config): + try: + root = ElementTree.fromstring(config.read_bytes()) + except (OSError, ElementTree.ParseError): + return [] + actions = [] + for registration in root.iter(): + if registration.tag.rsplit('}', 1)[-1] != 'CustomInstallActions': + continue + folder = next((node.text or '' for node in registration if node.tag.rsplit('}', 1)[-1] == 'Folder'), '') + for node in registration.iter(): + if node.tag.rsplit('}', 1)[-1] != 'InstallAction': + continue + name, file = node.get('Name', ''), node.get('File', '') + parts = [part for part in (folder.strip() + '\\' + file).replace('/', '\\').split('\\') if part] + if not name or not file or any(part in ('.', '..') or ':' in part for part in parts): + continue + target = config.parent.joinpath(*parts) + try: + inside = target.resolve().is_relative_to(config.parent.resolve()) + except OSError: + inside = False + if inside and target.is_file() and target.suffix.lower() in ('.msi', '.exe'): + actions.append((name, target, windows_arguments(node.get('Arguments', '')))) + return actions + + +def run_install_actions(proton, prefix, exe, env): + config = game_config(exe) + if config is None: + return + done = prefix / 'drive_c' / 'ProgramData' / 'DroidDeck' / 'install-actions' + for name, target, arguments in install_actions(config): + try: + content = hashlib.sha256() + with target.open('rb') as source: + for block in iter(lambda: source.read(1 << 20), b''): + content.update(block) + identity = hashlib.sha256(name.encode('utf-8') + b'\0' + content.digest()).hexdigest()[:24] + marker = done / ('%s-%s' % (''.join(c for c in name if c.isalnum() or c in '-_')[:64], identity)) + if marker.exists(): + continue + except OSError as error: + print('droiddeck-xbox: install action %s could not be read (%s); launching without it' % (name, error), file=sys.stderr) + continue + windows = 'Z:' + str(target).replace('/', '\\') + if target.suffix.lower() == '.msi': + command = [proton, 'run', 'msiexec', '/i', windows, *arguments] + else: + command = [proton, 'run', windows, *arguments] + try: + code = subprocess.run(command, stdout=sys.stderr, env=env, timeout=600).returncode + except (OSError, subprocess.TimeoutExpired): + code = None + if code != 0: + print('droiddeck-xbox: install action %s did not finish; launching without it' % name, file=sys.stderr) + continue + try: + done.mkdir(parents=True, exist_ok=True) + marker.touch() + except OSError as error: + print('droiddeck-xbox: install action %s finished but could not be recorded (%s)' % (name, error), file=sys.stderr) + + def view_drive(prefix, exe): path = Path(exe) view = next((parent for parent in path.parents if parent.name.startswith('droiddeck-xbox-')), None) @@ -184,6 +297,7 @@ def wine(argv, source_env=None): target.unlink() shutil.copyfile(RUNTIME / 'windows' / name, target) register_classes(command[0], prefix, env) + run_install_actions(command[0], prefix, argv[0], env) overrides = ';'.join(name[:-4] + '=n' for name in DLLS if name != 'libnghttp2.dll') env['WINEDLLOVERRIDES'] = overrides + ';' + env.get('WINEDLLOVERRIDES', '') exe, drive = view_drive(prefix, argv[0]) diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index f082ba9a91..be2851fd31 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -178,6 +178,101 @@ class XboxLaunchTest(unittest.TestCase): self.assertEqual(sorted(p.name for p in devices.iterdir()), ['v:', 'w:', 'x:']) self.assertEqual(xbox['view_drive'](root / 'pfx', '/games/Game.exe'), ('/games/Game.exe', None)) + def test_package_install_actions_run_once_and_stay_inside_the_game(self): + with tempfile.TemporaryDirectory() as root: + game, prefix = Path(root) / 'game', Path(root) / 'pfx' + (game / 'Installers').mkdir(parents=True) + (game / 'Installers' / 'GameInputRedist.msi').write_bytes(b'msi') + (game / 'Emu.exe').write_bytes(b'exe') + (Path(root) / 'outside.msi').write_bytes(b'msi') + (game / 'MicrosoftGame.config').write_text( + 'Installers' + '' + '' + '') + with patch('subprocess.run', return_value=subprocess.CompletedProcess([], 0)) as child: + xbox['run_install_actions']('/selected/proton', prefix, str(game / 'Emu.exe'), {'A': '1'}) + xbox['run_install_actions']('/selected/proton', prefix, str(game / 'Emu.exe'), {'A': '1'}) + self.assertEqual(child.call_count, 1) + command = child.call_args.args[0] + self.assertEqual(command[:4], ['/selected/proton', 'run', 'msiexec', '/i']) + self.assertTrue(command[4].startswith('Z:') and command[4].endswith('GameInputRedist.msi')) + self.assertEqual(command[5:], ['/quiet']) + + def test_a_failed_install_action_is_retried_on_the_next_launch(self): + with tempfile.TemporaryDirectory() as root: + game, prefix = Path(root) / 'game', Path(root) / 'pfx' + game.mkdir() + (game / 'setup.exe').write_bytes(b'exe') + (game / 'MicrosoftGame.config').write_text( + '' + '') + with patch('subprocess.run', return_value=subprocess.CompletedProcess([], 1)) as child: + xbox['run_install_actions']('/p', prefix, str(game / 'setup.exe'), {}) + xbox['run_install_actions']('/p', prefix, str(game / 'setup.exe'), {}) + self.assertEqual(child.call_count, 2) + self.assertEqual(child.call_args.args[0][:2], ['/p', 'run']) + + def test_install_action_arguments_follow_windows_command_line_rules(self): + parse = xbox['windows_arguments'] + self.assertEqual(parse('/quiet /log "C:\\ProgramData\\Game Setup\\install.log"'), + ['/quiet', '/log', 'C:\\ProgramData\\Game Setup\\install.log']) + self.assertEqual(parse('a\\\\b "x\\"y" "\\\\" "" c""d "e""f"'), ['a\\\\b', 'x"y', '\\', '', 'cd', 'e"f']) + self.assertEqual(parse(' '), []) + with tempfile.TemporaryDirectory() as root: + game, prefix = Path(root) / 'game', Path(root) / 'pfx' + game.mkdir() + (game / 'setup.msi').write_bytes(b'msi') + (game / 'MicrosoftGame.config').write_text( + '' + '') + with patch('subprocess.run', return_value=subprocess.CompletedProcess([], 0)) as child: + xbox['run_install_actions']('/p', prefix, str(game / 'setup.msi'), {}) + self.assertEqual(child.call_args.args[0][5:], ['/quiet', '/log', 'C:\\ProgramData\\Game Setup\\install.log']) + + def test_actions_whose_names_differ_only_in_punctuation_each_run(self): + with tempfile.TemporaryDirectory() as root: + game, prefix = Path(root) / 'game', Path(root) / 'pfx' + game.mkdir() + (game / 'setup.exe').write_bytes(b'exe') + (game / 'MicrosoftGame.config').write_text( + '' + '' + '' + '') + with patch('subprocess.run', return_value=subprocess.CompletedProcess([], 0)) as child: + xbox['run_install_actions']('/p', prefix, str(game / 'setup.exe'), {}) + xbox['run_install_actions']('/p', prefix, str(game / 'setup.exe'), {}) + self.assertEqual([call.args[0][-1] for call in child.call_args_list], ['/a', '/b']) + + def test_an_install_action_error_never_stops_the_launch(self): + with tempfile.TemporaryDirectory() as root: + game, prefix = Path(root) / 'game', Path(root) / 'pfx' + game.mkdir() + (game / 'first.exe').write_bytes(b'exe') + (game / 'second.exe').write_bytes(b'exe') + (game / 'MicrosoftGame.config').write_text( + '' + '' + '') + real_open = Path.open + def unreadable(path, *args, **kwargs): + if path.name == 'first.exe': + raise PermissionError('denied') + return real_open(path, *args, **kwargs) + with patch.object(Path, 'open', unreadable), \ + patch('subprocess.run', return_value=subprocess.CompletedProcess([], 0)) as child: + xbox['run_install_actions']('/p', prefix, str(game / 'first.exe'), {}) + self.assertEqual(child.call_count, 1) + self.assertTrue(child.call_args.args[0][2].endswith('second.exe')) + with patch('subprocess.run', side_effect=OSError('no proton')): + xbox['run_install_actions']('/p', prefix, str(game / 'first.exe'), {}) + with patch.object(Path, 'touch', side_effect=OSError('read-only')), \ + patch('subprocess.run', return_value=subprocess.CompletedProcess([], 0)) as child: + xbox['run_install_actions']('/p', prefix / 'other', str(game / 'first.exe'), {}) + self.assertEqual(child.call_count, 2) + def test_missing_runtime_classes_are_registered_once(self): with tempfile.TemporaryDirectory() as root: prefix = Path(root) diff --git a/tools/xbox/README.md b/tools/xbox/README.md index fb8705b166..c0a6636aba 100644 --- a/tools/xbox/README.md +++ b/tools/xbox/README.md @@ -125,6 +125,15 @@ download plus two copies of the largest container, and each container is deleted The download has no control channel: cancelling kills it and the next attempt starts that container from zero. +`droiddeck-msixvc2.patch` installs MSIXVC2 packages, the format Xbox 360 backward-compatible +titles ship in. The package Windows Update serves is only an index (`XboxPackage.cbor`, chunk and +file tables); the files are encrypted, Brotli-compressed segments inside `.box` blobs on the Xbox +content hosts. `streaming` unpacks the index, licenses its content id, derives the package key from +the content key (SP800-108 HMAC-SHA256, label `MSIXVC2:PackageData:AES_256_CBC`), unwraps each +segment key with AES-256-CBC, fetches adjacent segments in one ranged request, and checks the +SHA-384 of every stored segment, decompressed segment and finished file before it is renamed into +place. Files already complete are skipped on a retry. + Cloud saves and in-game identity use the reused XGameRuntime/service interfaces; those are game-dependent. Entitlements distinguish purchases from Game Pass access, and the backend performs a fresh license check for downloads and launch. diff --git a/tools/xbox/droiddeck-legacy-install.patch b/tools/xbox/droiddeck-legacy-install.patch index bf2013fa8e..2d34e91679 100644 --- a/tools/xbox/droiddeck-legacy-install.patch +++ b/tools/xbox/droiddeck-legacy-install.patch @@ -2026,7 +2026,7 @@ index 0000000..7fec6e5 + } +} diff --git a/crates/xodus-cli/src/commands/streaming.rs b/crates/xodus-cli/src/commands/streaming.rs -index a0136f8..8637cab 100644 +index a0136f8..8e9d0e0 100644 --- a/crates/xodus-cli/src/commands/streaming.rs +++ b/crates/xodus-cli/src/commands/streaming.rs @@ -9,7 +9,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; @@ -2054,7 +2054,7 @@ index a0136f8..8637cab 100644 let remote_xvd = match XvdFile::parse(&mut remote_file).await { Ok(xvd) => xvd, Err(error) => { failure::report_metadata(error.as_ref()); return ExitCode::FAILURE; } -@@ -692,3 +701,337 @@ where +@@ -692,3 +701,369 @@ where } ExitCode::SUCCESS } @@ -2095,11 +2095,7 @@ index a0136f8..8637cab 100644 + Ok::<(), String>(()) + })(); + match result { -+ Ok(()) => { -+ std::fs::remove_file(previous.join(PENDING)).ok(); -+ std::fs::remove_dir_all(&previous).ok(); -+ Ok(()) -+ } ++ Ok(()) => release(&previous), + Err(error) => { + let stuck: Vec = placed + .iter() @@ -2125,7 +2121,22 @@ index a0136f8..8637cab 100644 + +/// Moves every entry kept in `previous` back into `out`, then removes `previous`. +/// On any failure `previous` stays, holding what has not been put back. ++fn release(previous: &Path) -> Result<(), String> { ++ std::fs::remove_file(previous.join(PENDING)) ++ .map_err(|error| format!("the replacement finished but its backup could not be released: {error}"))?; ++ std::fs::remove_dir_all(previous).ok(); ++ Ok(()) ++} ++ +fn restore(previous: &Path, out: &Path) -> Result<(), String> { ++ restore_with(previous, out, &mut |from, to| std::fs::rename(from, to)) ++} ++ ++fn restore_with( ++ previous: &Path, ++ out: &Path, ++ move_entry: &mut dyn FnMut(&Path, &Path) -> std::io::Result<()>, ++) -> Result<(), String> { + let placed = std::fs::read_to_string(previous.join(PENDING)).map_err(|error| error.to_string())?; + for name in placed.lines().filter(|name| !name.is_empty() && !name.contains(['/', '\\']) && *name != "." && *name != "..") { + let target = out.join(name); @@ -2146,7 +2157,7 @@ index a0136f8..8637cab 100644 + if std::fs::symlink_metadata(&target).is_ok() { + remove(&target).map_err(|error| format!("could not clear {}: {error}", target.display()))?; + } -+ std::fs::rename(entry.path(), &target).map_err(|error| format!("could not restore {}: {error}", target.display()))?; ++ move_entry(&entry.path(), &target).map_err(|error| format!("could not restore {}: {error}", target.display()))?; + } + std::fs::remove_file(previous.join(PENDING)).map_err(|error| error.to_string())?; + std::fs::remove_dir(previous).map_err(|error| error.to_string()) @@ -2312,21 +2323,42 @@ index a0136f8..8637cab 100644 + #[test] + fn a_restore_interrupted_after_its_removals_never_deletes_what_it_put_back() { + let root = tempfile::tempdir().unwrap(); -+ let (staging, out) = (root.path().join("staging"), root.path().join("out")); ++ let out = root.path().join("out"); + let previous = out.join(".xodus-plain-previous"); -+ std::fs::create_dir_all(&staging).unwrap(); + std::fs::create_dir_all(&previous).unwrap(); -+ std::fs::write(previous.join(".pending"), "a").unwrap(); -+ std::fs::write(previous.join("a"), b"old").unwrap(); -+ std::fs::write(out.join("a"), b"stray").unwrap(); -+ super::restore(&previous, &out).unwrap(); -+ assert_eq!(std::fs::read(out.join("a")).unwrap(), b"old"); -+ std::fs::create_dir_all(&previous).unwrap(); -+ std::fs::write(previous.join(".pending"), "").unwrap(); ++ std::fs::write(previous.join(".pending"), "a ++b").unwrap(); ++ std::fs::write(previous.join("a"), b"old-a").unwrap(); + std::fs::write(previous.join("b"), b"old-b").unwrap(); -+ super::publish(&staging, &out).unwrap(); -+ assert_eq!(std::fs::read(out.join("a")).unwrap(), b"old"); ++ std::fs::write(out.join("a"), b"new-a").unwrap(); ++ std::fs::write(out.join("b"), b"new-b").unwrap(); ++ let mut moves = 0; ++ let interrupted = super::restore_with(&previous, &out, &mut |from, to| { ++ moves += 1; ++ if moves == 2 { return Err(std::io::Error::other("interrupted")) } ++ std::fs::rename(from, to) ++ }); ++ assert!(interrupted.is_err()); ++ let restored = ["a", "b"].into_iter().find(|name| out.join(name).exists()).unwrap(); ++ super::restore(&previous, &out).unwrap(); ++ assert_eq!(std::fs::read(out.join(restored)).unwrap(), format!("old-{restored}").as_bytes()); ++ assert_eq!(std::fs::read(out.join("a")).unwrap(), b"old-a"); + assert_eq!(std::fs::read(out.join("b")).unwrap(), b"old-b"); ++ assert!(!previous.exists()); ++ } ++ ++ #[test] ++ fn a_backup_whose_marker_cannot_be_removed_is_kept_and_reported() { ++ let root = tempfile::tempdir().unwrap(); ++ let previous = root.path().join(".xodus-plain-previous"); ++ std::fs::create_dir_all(previous.join(".pending").join("held")).unwrap(); ++ std::fs::write(previous.join("kept"), b"old").unwrap(); ++ assert!(super::release(&previous).is_err()); ++ assert!(previous.join("kept").exists()); ++ std::fs::remove_dir_all(previous.join(".pending")).unwrap(); ++ std::fs::write(previous.join(".pending"), b"").unwrap(); ++ super::release(&previous).unwrap(); ++ assert!(!previous.exists()); + } + + #[test] diff --git a/tools/xbox/droiddeck-msixvc2.patch b/tools/xbox/droiddeck-msixvc2.patch new file mode 100644 index 0000000000..b02ec68bbb --- /dev/null +++ b/tools/xbox/droiddeck-msixvc2.patch @@ -0,0 +1,1131 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5dfc09a..15198af 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -83,6 +83,21 @@ dependencies = [ + "memchr", + ] + ++[[package]] ++name = "alloc-no-stdlib" ++version = "2.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" ++ ++[[package]] ++name = "alloc-stdlib" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" ++dependencies = [ ++ "alloc-no-stdlib", ++] ++ + [[package]] + name = "android_system_properties" + version = "0.1.6" +@@ -586,6 +601,16 @@ dependencies = [ + "objc2", + ] + ++[[package]] ++name = "brotli-decompressor" ++version = "5.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" ++dependencies = [ ++ "alloc-no-stdlib", ++ "alloc-stdlib", ++] ++ + [[package]] + name = "bstr" + version = "1.13.1" +@@ -728,6 +753,33 @@ dependencies = [ + "windows-link 0.2.1", + ] + ++[[package]] ++name = "ciborium" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" ++dependencies = [ ++ "ciborium-io", ++ "ciborium-ll", ++ "serde", ++] ++ ++[[package]] ++name = "ciborium-io" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" ++ ++[[package]] ++name = "ciborium-ll" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" ++dependencies = [ ++ "ciborium-io", ++ "half", ++] ++ + [[package]] + name = "cipher" + version = "0.4.4" +@@ -1055,6 +1107,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "crunchy" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" ++ + [[package]] + name = "crypto-bigint" + version = "0.5.5" +@@ -2370,6 +2428,17 @@ dependencies = [ + "tracing", + ] + ++[[package]] ++name = "half" ++version = "2.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" ++dependencies = [ ++ "cfg-if", ++ "crunchy", ++ "zerocopy", ++] ++ + [[package]] + name = "hash2curve" + version = "0.14.0" +@@ -7178,9 +7247,13 @@ dependencies = [ + name = "xodus-cli" + version = "0.1.0" + dependencies = [ ++ "aes 0.9.3", + "async-trait", + "base64 0.23.1", ++ "brotli-decompressor", ++ "cbc 0.2.1", + "chrono", ++ "ciborium", + "clap", + "console-subscriber", + "ctrlc", +@@ -7188,6 +7261,7 @@ dependencies = [ + "flate2", + "fs2", + "futures-util", ++ "hmac 0.13.0", + "indicatif", + "inquire", + "msixvc", +@@ -7196,6 +7270,7 @@ dependencies = [ + "reqwest 0.13.4", + "rustix", + "serde_json", ++ "sha2 0.11.0", + "tao", + "tempfile", + "tokio", +diff --git a/crates/xodus-cli/Cargo.toml b/crates/xodus-cli/Cargo.toml +index f49470b..3579838 100644 +--- a/crates/xodus-cli/Cargo.toml ++++ b/crates/xodus-cli/Cargo.toml +@@ -31,6 +31,12 @@ tempfile = "3.27.0" + rustix = "1.1.4" + ctrlc = "3.5.2" + nix = "0.31.3" ++aes = "0.9.2" ++cbc = "0.2.1" ++hmac = "0.13.0" ++sha2 = "0.11.0" ++ciborium = "0.2.2" ++brotli-decompressor = "5.0.0" + + [features] + default = ["native-webview"] +diff --git a/crates/xodus-cli/src/commands.rs b/crates/xodus-cli/src/commands.rs +index 825c24e..c23f637 100644 +--- a/crates/xodus-cli/src/commands.rs ++++ b/crates/xodus-cli/src/commands.rs +@@ -20,6 +20,7 @@ pub mod library; + #[cfg(unix)] + pub mod run; + pub mod splicense; ++pub mod msixvc2; + pub mod streaming; + + pub mod native_social; +diff --git a/crates/xodus-cli/src/commands/msixvc2.rs b/crates/xodus-cli/src/commands/msixvc2.rs +new file mode 100644 +index 0000000..5caab57 +--- /dev/null ++++ b/crates/xodus-cli/src/commands/msixvc2.rs +@@ -0,0 +1,820 @@ ++use std::collections::HashMap; ++use std::io::{ErrorKind, Read, Seek, SeekFrom, Write}; ++use std::path::{Component, Path, PathBuf}; ++ ++use aes::cipher::{BlockModeDecrypt, KeyIvInit, block_padding::NoPadding}; ++use ciborium::Value; ++use futures_util::{StreamExt, stream}; ++use hmac::{Hmac, Mac}; ++use sha2::{Digest, Sha256, Sha384}; ++ ++const HOSTS: [&str; 4] = ["assets1.xboxlive.com", "assets2.xboxlive.com", "xvcf1.xboxlive.com", "xvcf2.xboxlive.com"]; ++const KDF_LABEL: &[u8] = b"MSIXVC2:PackageData:AES_256_CBC"; ++const MAX_REQUEST: u64 = 16 * 1024 * 1024; ++const PARALLEL: usize = 6; ++const BROTLI: u64 = 2; ++const DEFLATE: u64 = 1; ++const STATE: &str = ".droiddeck-install"; ++const PARTIAL: &str = "partial"; ++const VERIFIED: &str = "verified"; ++ ++pub fn is_package(folder: &Path) -> bool { ++ folder.join("XboxPackage.cbor").is_file() ++} ++ ++pub fn content_id(folder: &Path) -> Result { ++ let package = read_cbor(&folder.join("XboxPackage.cbor"))?; ++ text(&package, 260).map(str::to_owned).ok_or_else(|| "The package names no content id".to_string()) ++} ++ ++#[derive(Clone)] ++pub struct Segment { ++ hash: Vec, ++ length: u64, ++ compression: u64, ++ stored: u64, ++ key: Option>, ++ wrapped: Option>, ++ wrap_iv: [u8; 16], ++ box_hash: Option>, ++ box_index: usize, ++ offset: u64, ++ span: u64, ++} ++ ++pub struct Entry { ++ pub path: PathBuf, ++ size: u64, ++ hash: Option>, ++ segments: Vec, ++} ++ ++pub struct Plan { ++ pub entries: Vec, ++ boxes: Vec, ++ package_key: [u8; 32], ++} ++ ++impl Plan { ++ pub fn total(&self) -> u64 { ++ self.entries.iter().map(|entry| entry.size).sum() ++ } ++ ++ pub fn remaining(&self, out: &Path) -> u64 { ++ let root = out.canonicalize().unwrap_or_else(|_| out.to_path_buf()); ++ let verified = verified(&root); ++ self.entries.iter().filter(|entry| !complete(&root, entry, &verified)).map(|entry| entry.size).sum() ++ } ++} ++ ++fn identity(entry: &Entry) -> String { ++ let mut digest = Sha384::new(); ++ digest.update(entry.path.to_string_lossy().as_bytes()); ++ digest.update([0]); ++ digest.update(entry.size.to_be_bytes()); ++ match &entry.hash { ++ Some(hash) => digest.update(hash), ++ None => entry.segments.iter().for_each(|segment| digest.update(&segment.hash)), ++ } ++ digest.finalize().iter().map(|byte| format!("{byte:02x}")).collect() ++} ++ ++fn key(path: &Path) -> String { ++ Sha256::digest(path.to_string_lossy().as_bytes()).iter().map(|byte| format!("{byte:02x}")).collect() ++} ++ ++fn verified(root: &Path) -> HashMap { ++ let record = root.join(STATE).join(VERIFIED); ++ if !std::fs::symlink_metadata(&record).is_ok_and(|meta| meta.is_file()) { ++ return HashMap::new(); ++ } ++ let text = std::fs::read_to_string(record).unwrap_or_default(); ++ text[..text.rfind('\n').map_or(0, |end| end + 1)] ++ .lines() ++ .filter_map(|line| line.split_once(' ')) ++ .map(|(path, identity)| (path.to_owned(), identity.to_owned())) ++ .collect() ++} ++ ++fn complete(root: &Path, entry: &Entry, verified: &HashMap) -> bool { ++ verified.get(&key(&entry.path)) == Some(&identity(entry)) ++ && std::fs::symlink_metadata(root.join(&entry.path)).is_ok_and(|meta| meta.is_file() && meta.len() == entry.size) ++} ++ ++fn note(record: &Path, path: &Path, identity: &str) -> Result<(), String> { ++ std::fs::OpenOptions::new() ++ .create(true) ++ .read(true) ++ .append(true) ++ .open(record) ++ .and_then(|mut file| { ++ let length = file.metadata()?.len(); ++ let mut last = [0u8; 1]; ++ if length > 0 { ++ file.seek(SeekFrom::Start(length - 1))?; ++ file.read_exact(&mut last)?; ++ } ++ if length > 0 && last[0] != b'\n' { ++ let mut end = length; ++ let mut keep = 0; ++ let mut chunk = vec![0u8; 4096]; ++ while end > 0 { ++ let start = end.saturating_sub(chunk.len() as u64); ++ let part = &mut chunk[..(end - start) as usize]; ++ file.seek(SeekFrom::Start(start))?; ++ file.read_exact(part)?; ++ if let Some(at) = part.iter().rposition(|byte| *byte == b'\n') { ++ keep = start + at as u64 + 1; ++ break; ++ } ++ end = start; ++ } ++ file.set_len(keep)?; ++ } ++ writeln!(file, "{} {identity}", key(path))?; ++ file.sync_all() ++ }) ++ .map_err(|error| format!("Could not record a finished game file: {error}")) ++} ++ ++fn folder(root: &Path, relative: &Path) -> Result { ++ let mut at = root.to_path_buf(); ++ for part in relative.components() { ++ at.push(part); ++ match std::fs::symlink_metadata(&at) { ++ Ok(meta) if meta.is_dir() => {} ++ Ok(_) => return Err("The game folder holds a link or file where a folder belongs".into()), ++ Err(error) if error.kind() == ErrorKind::NotFound => match std::fs::create_dir(&at) { ++ Ok(()) => {} ++ Err(error) if error.kind() == ErrorKind::AlreadyExists && std::fs::symlink_metadata(&at).is_ok_and(|meta| meta.is_dir()) => {} ++ Err(error) => return Err(format!("Could not create a game folder: {error}")), ++ }, ++ Err(error) => return Err(format!("Could not read the game folder: {error}")), ++ } ++ } ++ Ok(at) ++} ++ ++fn place(root: &Path, relative: &Path) -> Result { ++ let parent = folder(root, relative.parent().unwrap_or(Path::new("")))?; ++ let target = parent.join(relative.file_name().ok_or("The package names an unusable file path")?); ++ match std::fs::symlink_metadata(&target) { ++ Ok(meta) if !meta.is_file() => Err("The game folder holds a link or folder where a file belongs".into()), ++ _ => Ok(target), ++ } ++} ++ ++pub fn reclaim(out: &Path) -> Result<(), String> { ++ let root = out.canonicalize().map_err(|error| format!("Could not open the game folder: {error}"))?; ++ let state = root.join(STATE); ++ match std::fs::symlink_metadata(&state) { ++ Ok(meta) if meta.is_dir() => {} ++ Ok(_) => return Err("The game folder holds a link or file where the install state belongs".into()), ++ Err(_) => return Ok(()), ++ } ++ let partial = state.join(PARTIAL); ++ match std::fs::symlink_metadata(&partial) { ++ Ok(meta) if meta.is_dir() => std::fs::remove_dir_all(&partial), ++ Ok(_) => std::fs::remove_file(&partial), ++ Err(_) => Ok(()), ++ } ++ .map_err(|error| format!("Could not clear an unfinished download: {error}")) ++} ++ ++pub async fn plan(client: &reqwest::Client, folder: &Path, content_keys: &HashMap<[u8; 16], [u8; 32]>) -> Result { ++ let package = read_cbor(&folder.join("XboxPackage.cbor"))?; ++ let boxes: Vec = list(&package, 264) ++ .ok_or("The package lists no content boxes")? ++ .iter() ++ .map(|item| text(item, 25).map(str::to_owned).ok_or("A content box has no location".to_string())) ++ .collect::>()?; ++ for location in &boxes { ++ if !location.starts_with('/') || location.contains("..") || location.contains("://") { ++ return Err("The package lists an unusable box location".into()); ++ } ++ } ++ let package_key = package_key(&package, content_keys)?; ++ let initial = iv(&package, 27).unwrap_or([0; 16]); ++ let chunks = list(&package, 265).ok_or("The package lists no chunks")?; ++ let mut entries = Vec::new(); ++ for chunk in chunks { ++ let id = int(chunk, 24).ok_or("A chunk has no id")?; ++ let secret = get(chunk, 26).ok_or("A chunk has no details")?; ++ let details = secret_details(client, &boxes, secret, initial, &package_key, chunks.len()).await?; ++ let names: Vec = list(&details, 28) ++ .ok_or("A chunk's details list no files")? ++ .iter() ++ .map(|item| text(item, 25).map(str::to_owned).ok_or("A file has no name".to_string())) ++ .collect::>()?; ++ let layout = read_cbor(&folder.join("Chunks").join(format!("{id}.cbor")))?; ++ let files = list(&layout, 28).ok_or("A chunk lists no files")?; ++ if files.len() != names.len() { ++ return Err("A chunk's names and files disagree".into()); ++ } ++ let mut rolling = iv(&layout, 27).unwrap_or([0; 16]); ++ for (file, name) in files.iter().zip(names) { ++ let size = int(file, 2).ok_or("A file has no size")?; ++ let hash = hash(file, 1); ++ let segments = match list(file, 29) { ++ Some(items) => segments(items, &mut rolling)?, ++ None => { ++ let file_id = int(file, 24).ok_or("A file has no id")?; ++ let detail = read_cbor(&folder.join("Files").join(format!("{file_id}.cbor")))?; ++ let mut own = iv(&detail, 27).unwrap_or([0; 16]); ++ segments(list(&detail, 29).ok_or("A file lists no segments")?, &mut own)? ++ } ++ }; ++ if segments.iter().map(|segment| segment.length).sum::() != size { ++ return Err("A file's segments do not add up to its size".into()); ++ } ++ entries.push(Entry { path: relative(&name)?, size, hash, segments }); ++ } ++ } ++ Ok(Plan { entries, boxes, package_key }) ++} ++ ++pub async fn install(client: &reqwest::Client, plan: &Plan, out: &Path, progress: &(dyn Fn(u64) + Sync)) -> Result<(), String> { ++ let root = out.canonicalize().map_err(|error| format!("Could not open the game folder: {error}"))?; ++ let verified = verified(&root); ++ let record = place(&root, &Path::new(STATE).join(VERIFIED))?; ++ for (index, entry) in plan.entries.iter().enumerate() { ++ if complete(&root, entry, &verified) { ++ progress(entry.size); ++ continue; ++ } ++ let target = place(&root, &entry.path)?; ++ let partial = folder(&root, &Path::new(STATE).join(PARTIAL))?.join(index.to_string()); ++ match std::fs::remove_file(&partial) { ++ Err(error) if error.kind() != ErrorKind::NotFound => return Err(format!("Could not clear an unfinished download: {error}")), ++ _ => {} ++ } ++ let mut file = std::fs::OpenOptions::new() ++ .write(true) ++ .create_new(true) ++ .open(&partial) ++ .map_err(|error| format!("Could not write a game file: {error}"))?; ++ let mut digest = Sha384::new(); ++ let mut results = stream::iter(requests(&entry.segments)) ++ .map(|request| fetch_request(client, plan, request)) ++ .buffered(PARALLEL); ++ while let Some(result) = results.next().await { ++ for plain in result? { ++ digest.update(&plain); ++ file.write_all(&plain).map_err(|error| format!("Could not write a game file: {error}"))?; ++ progress(plain.len() as u64); ++ } ++ } ++ file.sync_all().map_err(|error| format!("Could not write a game file: {error}"))?; ++ drop(file); ++ if let Some(expected) = &entry.hash ++ && digest.finalize().as_slice() != expected.as_slice() ++ { ++ std::fs::remove_file(&partial).ok(); ++ return Err("A downloaded game file failed verification".into()); ++ } ++ if place(&root, &entry.path)? != target { ++ return Err("The game folder changed during the install".into()); ++ } ++ note(&record, &entry.path, "-")?; ++ std::fs::rename(&partial, &target).map_err(|error| format!("Could not finish a game file: {error}"))?; ++ note(&record, &entry.path, &identity(entry))?; ++ } ++ reclaim(&root) ++} ++ ++struct Request<'a> { ++ box_index: usize, ++ offset: u64, ++ length: u64, ++ segments: &'a [Segment], ++} ++ ++fn requests(segments: &[Segment]) -> Vec> { ++ let mut found: Vec> = Vec::new(); ++ let mut start = 0; ++ while start < segments.len() { ++ let first = &segments[start]; ++ let mut end = start + 1; ++ let mut length = first.span; ++ while end < segments.len() { ++ let next = &segments[end]; ++ if next.box_index != first.box_index || next.offset != first.offset + length || length + next.span > MAX_REQUEST { ++ break; ++ } ++ length += next.span; ++ end += 1; ++ } ++ found.push(Request { box_index: first.box_index, offset: first.offset, length, segments: &segments[start..end] }); ++ start = end; ++ } ++ found ++} ++ ++async fn fetch_request(client: &reqwest::Client, plan: &Plan, request: Request<'_>) -> Result>, String> { ++ let bytes = fetch(client, &plan.boxes[request.box_index], request.offset, request.length).await?; ++ let mut at = 0usize; ++ let mut plain = Vec::with_capacity(request.segments.len()); ++ for segment in request.segments { ++ let stored = &bytes[at..at + segment.span as usize]; ++ at += segment.span as usize; ++ plain.push(open(segment, stored, &plan.package_key)?); ++ } ++ Ok(plain) ++} ++ ++async fn fetch(client: &reqwest::Client, location: &str, offset: u64, length: u64) -> Result, String> { ++ let mut last = String::new(); ++ for attempt in 0..HOSTS.len() * 2 { ++ let host = HOSTS[attempt % HOSTS.len()]; ++ let response = client ++ .get(format!("http://{host}{location}")) ++ .header("Range", format!("bytes={}-{}", offset, offset + length - 1)) ++ .send() ++ .await; ++ match response { ++ Ok(response) if response.status().as_u16() == 206 => match response.bytes().await { ++ Ok(body) if body.len() as u64 == length => return Ok(body.to_vec()), ++ Ok(_) => last = "the content host sent a short range".into(), ++ Err(error) => last = error.to_string(), ++ }, ++ Ok(response) => last = format!("the content host answered HTTP {}", response.status().as_u16()), ++ Err(error) => last = error.to_string(), ++ } ++ tokio::time::sleep(std::time::Duration::from_millis(500 * (attempt as u64 + 1))).await; ++ } ++ Err(format!("Could not download game data: {last}")) ++} ++ ++fn open(segment: &Segment, stored: &[u8], package_key: &[u8; 32]) -> Result, String> { ++ if let Some(expected) = &segment.box_hash ++ && Sha384::digest(stored).as_slice() != expected.as_slice() ++ { ++ return Err("Downloaded game data failed verification".into()); ++ } ++ let key = match (&segment.key, &segment.wrapped) { ++ (Some(key), _) => Some(key32(key)?), ++ (None, Some(wrapped)) => Some(key32(&cbc(package_key, &segment.wrap_iv, wrapped)?)?), ++ (None, None) => None, ++ }; ++ let decrypted = match key { ++ Some(key) => { ++ let mut iv = [0u8; 16]; ++ iv.copy_from_slice(segment.hash.get(..16).ok_or("A segment hash is too short")?); ++ cbc(&key, &iv, stored)? ++ } ++ None => stored.to_vec(), ++ }; ++ let body = decrypted.get(..segment.stored as usize).ok_or("A segment is shorter than its stored size")?; ++ let plain = match segment.compression { ++ 0 => body.to_vec(), ++ BROTLI => { ++ let mut out = Vec::with_capacity(segment.length as usize); ++ brotli_decompressor::Decompressor::new(body, 4096) ++ .take(segment.length + 1) ++ .read_to_end(&mut out) ++ .map_err(|_| "A segment could not be decompressed".to_string())?; ++ out ++ } ++ DEFLATE => { ++ let mut out = Vec::with_capacity(segment.length as usize); ++ flate2::read::DeflateDecoder::new(body) ++ .take(segment.length + 1) ++ .read_to_end(&mut out) ++ .map_err(|_| "A segment could not be decompressed".to_string())?; ++ out ++ } ++ _ => return Err("A segment uses an unsupported compression".into()), ++ }; ++ if plain.len() as u64 != segment.length || Sha384::digest(&plain).as_slice() != segment.hash.as_slice() { ++ return Err("A game data segment failed verification".into()); ++ } ++ Ok(plain) ++} ++ ++async fn secret_details( ++ client: &reqwest::Client, ++ boxes: &[String], ++ secret: &Value, ++ initial: [u8; 16], ++ package_key: &[u8; 32], ++ chunks: usize, ++) -> Result { ++ let mut base = initial; ++ let segment = segment(secret, &mut base)?; ++ let stored = fetch(client, boxes.get(segment.box_index).ok_or("A chunk refers to a missing box")?, segment.offset, segment.span).await?; ++ for step in 0..=chunks as u128 { ++ let mut candidate = segment.clone(); ++ if get(secret, 7).is_none() { ++ candidate.wrap_iv = (u128::from_be_bytes(initial).wrapping_add(step)).to_be_bytes(); ++ } ++ if let Ok(plain) = open(&candidate, &stored, package_key) { ++ return ciborium::de::from_reader::(plain.as_slice()) ++ .map(untag) ++ .map_err(|_| "A chunk's details are not readable".to_string()); ++ } ++ if candidate.wrapped.is_none() { ++ break; ++ } ++ } ++ Err("Could not decrypt a chunk's details with this license".into()) ++} ++ ++fn package_key(package: &Value, content_keys: &HashMap<[u8; 16], [u8; 32]>) -> Result<[u8; 32], String> { ++ let groups = list(package, 262).ok_or("The package lists no keys")?; ++ for group in groups { ++ let sources = match group { ++ Value::Array(items) => items.as_slice(), ++ _ => continue, ++ }; ++ for source in sources { ++ let Some(id) = text(source, 288).and_then(|id| hex(id).ok()) else { continue }; ++ let Some(short) = id.get(..16).and_then(|bytes| <[u8; 16]>::try_from(bytes).ok()) else { continue }; ++ let Some(master) = content_keys.get(&short) else { continue }; ++ let context = bytes(source, 286).ok_or("A package key has no derivation context")?; ++ let wrap_iv = iv(source, 7).ok_or("A package key has no wrapping IV")?; ++ let wrapped = bytes(source, 6).ok_or("A package key is missing")?; ++ let kek = derive(master, context); ++ return key32(&cbc(&kek, &wrap_iv, wrapped)?); ++ } ++ } ++ Err("The license holds no key for this package".into()) ++} ++ ++fn derive(master: &[u8; 32], context: &[u8]) -> [u8; 32] { ++ let mut message = Vec::with_capacity(4 + KDF_LABEL.len() + 1 + context.len() + 4); ++ message.extend_from_slice(&1u32.to_be_bytes()); ++ message.extend_from_slice(KDF_LABEL); ++ message.push(0); ++ message.extend_from_slice(context); ++ message.extend_from_slice(&256u32.to_be_bytes()); ++ let mut mac = as hmac::KeyInit>::new_from_slice(master).expect("HMAC takes any key length"); ++ mac.update(&message); ++ mac.finalize().into_bytes().into() ++} ++ ++fn cbc(key: &[u8; 32], iv: &[u8; 16], data: &[u8]) -> Result, String> { ++ if data.len() % 16 != 0 { ++ return Err("Encrypted game data is not block aligned".into()); ++ } ++ let mut out = data.to_vec(); ++ cbc::Decryptor::::new(key.into(), iv.into()) ++ .decrypt_padded::(&mut out) ++ .map_err(|_| "Game data could not be decrypted".to_string())?; ++ Ok(out) ++} ++ ++fn segments(items: &[Value], rolling: &mut [u8; 16]) -> Result, String> { ++ items.iter().map(|item| segment(item, rolling)).collect() ++} ++ ++fn segment(item: &Value, rolling: &mut [u8; 16]) -> Result { ++ let length = int(item, 2).ok_or("A segment has no length")?; ++ let segment = Segment { ++ hash: hash(item, 1).ok_or("A segment has no hash")?, ++ length, ++ compression: int(item, 3).unwrap_or(0), ++ stored: int(item, 4).unwrap_or(length), ++ key: bytes(item, 5).map(<[u8]>::to_vec), ++ wrapped: bytes(item, 6).map(<[u8]>::to_vec), ++ wrap_iv: iv(item, 7).unwrap_or(*rolling), ++ box_hash: hash(item, 8), ++ box_index: int(item, 9).unwrap_or(0) as usize, ++ offset: int(item, 10).unwrap_or(0), ++ span: int(item, 11).unwrap_or(length), ++ }; ++ if segment.stored > segment.span { ++ return Err("A segment is larger than its stored range".into()); ++ } ++ *rolling = u128::from_be_bytes(*rolling).wrapping_add(1).to_be_bytes(); ++ Ok(segment) ++} ++ ++fn relative(name: &str) -> Result { ++ let path = PathBuf::from(name.replace('\\', "/")); ++ if name.is_empty() ++ || name.contains(':') ++ || !path.components().all(|part| matches!(part, Component::Normal(_))) ++ || path.components().next().is_some_and(|part| part.as_os_str().to_string_lossy().eq_ignore_ascii_case(STATE)) ++ { ++ return Err("The package names an unusable file path".into()); ++ } ++ Ok(path) ++} ++ ++fn read_cbor(path: &Path) -> Result { ++ let file = std::fs::File::open(path).map_err(|_| "The package index is incomplete".to_string())?; ++ ciborium::de::from_reader::(std::io::BufReader::new(file)) ++ .map(untag) ++ .map_err(|_| "The package index is not readable".to_string()) ++} ++ ++fn untag(value: Value) -> Value { ++ match value { ++ Value::Tag(_, inner) => untag(*inner), ++ other => other, ++ } ++} ++ ++fn get(value: &Value, key: u64) -> Option<&Value> { ++ let Value::Map(entries) = value else { return None }; ++ entries.iter().find_map(|(k, v)| match k { ++ Value::Integer(number) if u64::try_from(*number).ok() == Some(key) => Some(v), ++ _ => None, ++ }) ++} ++ ++fn int(value: &Value, key: u64) -> Option { ++ match get(value, key)? { ++ Value::Integer(number) => u64::try_from(*number).ok(), ++ _ => None, ++ } ++} ++ ++fn text(value: &Value, key: u64) -> Option<&str> { ++ match get(value, key)? { ++ Value::Text(text) => Some(text), ++ _ => None, ++ } ++} ++ ++fn bytes(value: &Value, key: u64) -> Option<&[u8]> { ++ match get(value, key)? { ++ Value::Bytes(bytes) => Some(bytes), ++ Value::Tag(_, inner) => match inner.as_ref() { ++ Value::Bytes(bytes) => Some(bytes), ++ _ => None, ++ }, ++ _ => None, ++ } ++} ++ ++fn hash(value: &Value, key: u64) -> Option> { ++ bytes(value, key).filter(|bytes| bytes.len() == 48).map(<[u8]>::to_vec) ++} ++ ++fn iv(value: &Value, key: u64) -> Option<[u8; 16]> { ++ bytes(value, key).and_then(|bytes| <[u8; 16]>::try_from(bytes).ok()) ++} ++ ++fn list(value: &Value, key: u64) -> Option<&[Value]> { ++ match get(value, key)? { ++ Value::Array(items) => Some(items), ++ _ => None, ++ } ++} ++ ++fn key32(bytes: &[u8]) -> Result<[u8; 32], String> { ++ <[u8; 32]>::try_from(bytes.get(..32).ok_or("A key is too short")?).map_err(|_| "A key is too short".to_string()) ++} ++ ++fn hex(text: &str) -> Result, ()> { ++ if text.len() % 2 != 0 { ++ return Err(()); ++ } ++ (0..text.len()).step_by(2).map(|at| u8::from_str_radix(&text[at..at + 2], 16).map_err(|_| ())).collect() ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ use aes::cipher::BlockModeEncrypt; ++ ++ fn encrypt(key: &[u8; 32], iv: &[u8; 16], data: &[u8]) -> Vec { ++ let mut out = data.to_vec(); ++ cbc::Encryptor::::new(key.into(), iv.into()).encrypt_padded::(&mut out, data.len()).unwrap(); ++ out ++ } ++ ++ fn sealed(plain: &[u8], segment_key: &[u8; 32]) -> (Segment, Vec) { ++ let hash = Sha384::digest(plain).to_vec(); ++ let mut padded = plain.to_vec(); ++ padded.resize(plain.len().div_ceil(16) * 16, 0); ++ let mut iv = [0u8; 16]; ++ iv.copy_from_slice(&hash[..16]); ++ let stored = encrypt(segment_key, &iv, &padded); ++ let segment = Segment { ++ hash, ++ length: plain.len() as u64, ++ compression: 0, ++ stored: plain.len() as u64, ++ key: Some(segment_key.to_vec()), ++ wrapped: None, ++ wrap_iv: [0; 16], ++ box_hash: Some(Sha384::digest(&stored).to_vec()), ++ box_index: 0, ++ offset: 0, ++ span: stored.len() as u64, ++ }; ++ (segment, stored) ++ } ++ ++ #[test] ++ fn a_segment_opens_only_with_its_key_and_hashes() { ++ let (segment, stored) = sealed(b"game data that is not block aligned", &[7; 32]); ++ assert_eq!(open(&segment, &stored, &[0; 32]).unwrap(), b"game data that is not block aligned"); ++ let mut tampered = stored.clone(); ++ tampered[3] ^= 1; ++ assert!(open(&segment, &tampered, &[0; 32]).is_err()); ++ let wrong = Segment { key: Some(vec![8; 32]), box_hash: None, ..segment }; ++ assert!(open(&wrong, &stored, &[0; 32]).is_err()); ++ } ++ ++ #[test] ++ fn a_wrapped_segment_key_is_unwrapped_with_the_package_key() { ++ let package_key = [3u8; 32]; ++ let segment_key = [9u8; 32]; ++ let wrap_iv = [5u8; 16]; ++ let (segment, stored) = sealed(b"wrapped", &segment_key); ++ let wrapped = Segment { key: None, wrapped: Some(encrypt(&package_key, &wrap_iv, &segment_key)), wrap_iv, ..segment }; ++ assert_eq!(open(&wrapped, &stored, &package_key).unwrap(), b"wrapped"); ++ } ++ ++ #[test] ++ fn adjacent_segments_in_one_box_share_a_request() { ++ let (segment, _) = sealed(b"x", &[1; 32]); ++ let at = |box_index: usize, offset: u64| Segment { box_index, offset, span: 16, ..segment.clone() }; ++ let parts = [at(0, 0), at(0, 16), at(0, 48), at(1, 64)]; ++ let shape: Vec<(usize, u64, u64, usize)> = ++ requests(&parts).iter().map(|r| (r.box_index, r.offset, r.length, r.segments.len())).collect(); ++ assert_eq!(shape, [(0, 0, 32, 2), (0, 48, 16, 1), (1, 64, 16, 1)]); ++ } ++ ++ #[test] ++ fn the_rolling_wrap_iv_advances_per_segment_and_an_explicit_one_wins() { ++ let item = |explicit: bool| { ++ let mut map = vec![ ++ (Value::Integer(1.into()), Value::Bytes(vec![0; 48])), ++ (Value::Integer(2.into()), Value::Integer(4.into())), ++ ]; ++ if explicit { ++ map.push((Value::Integer(7.into()), Value::Bytes(vec![0xee; 16]))); ++ } ++ Value::Map(map) ++ }; ++ let mut rolling = [0u8; 16]; ++ rolling[15] = 0xff; ++ let found = segments(&[item(false), item(true), item(false)], &mut rolling).unwrap(); ++ assert_eq!(found[0].wrap_iv[14..], [0x00, 0xff]); ++ assert_eq!(found[1].wrap_iv, [0xee; 16]); ++ assert_eq!(found[2].wrap_iv[14..], [0x01, 0x01]); ++ } ++ ++ fn empty(path: &str) -> Entry { ++ Entry { path: PathBuf::from(path), size: 0, hash: Some(Sha384::digest(b"").to_vec()), segments: vec![] } ++ } ++ ++ fn plan_of(entries: Vec) -> Plan { ++ Plan { entries, boxes: vec![], package_key: [0; 32] } ++ } ++ ++ async fn run(plan: &Plan, out: &Path) -> Result<(), String> { ++ install(&reqwest::Client::new(), plan, out, &|_| {}).await ++ } ++ ++ #[test] ++ fn only_files_verified_by_an_install_count_as_complete() { ++ let root = tempfile::tempdir().unwrap(); ++ let (segment, _) = sealed(b"x", &[1; 32]); ++ let entry = |path: &str, size: u64| Entry { path: PathBuf::from(path), size, hash: None, segments: vec![segment.clone()] }; ++ let plan = plan_of(vec![entry("done.bin", 4), entry("partial.bin", 10), entry("missing.bin", 7)]); ++ std::fs::write(root.path().join("done.bin"), b"abcd").unwrap(); ++ std::fs::write(root.path().join("partial.bin"), b"abc").unwrap(); ++ assert_eq!(plan.total(), 21); ++ assert_eq!(plan.remaining(root.path()), 21); ++ std::fs::create_dir(root.path().join(STATE)).unwrap(); ++ let record = root.path().join(STATE).join(VERIFIED); ++ note(&record, Path::new("done.bin"), &identity(&plan.entries[0])).unwrap(); ++ assert_eq!(plan.remaining(root.path()), 17); ++ std::fs::write(root.path().join("done.bin"), b"abcde").unwrap(); ++ assert_eq!(plan.remaining(root.path()), 21); ++ } ++ ++ #[test] ++ fn an_interrupted_record_never_swallows_the_next_one() { ++ let root = tempfile::tempdir().unwrap(); ++ let (older, _) = sealed(b"old", &[1; 32]); ++ let (newer, _) = sealed(b"new", &[1; 32]); ++ let entry = |segment: &Segment| Entry { path: PathBuf::from("game.bin"), size: 3, hash: None, segments: vec![segment.clone()] }; ++ let (old, new) = (plan_of(vec![entry(&older)]), plan_of(vec![entry(&newer)])); ++ let (kept, _) = sealed(b"keep", &[1; 32]); ++ let other = plan_of(vec![Entry { path: PathBuf::from("other.bin"), size: 4, hash: None, segments: vec![kept] }]); ++ std::fs::write(root.path().join("game.bin"), b"new").unwrap(); ++ std::fs::write(root.path().join("other.bin"), b"keep").unwrap(); ++ std::fs::create_dir(root.path().join(STATE)).unwrap(); ++ let record = root.path().join(STATE).join(VERIFIED); ++ note(&record, Path::new("other.bin"), &identity(&other.entries[0])).unwrap(); ++ note(&record, Path::new("game.bin"), &identity(&old.entries[0])).unwrap(); ++ let mut torn = std::fs::read(&record).unwrap(); ++ torn.extend_from_slice(&key(Path::new("game.bin")).as_bytes()[..20]); ++ std::fs::write(&record, &torn).unwrap(); ++ assert_eq!(old.remaining(root.path()), 0); ++ note(&record, Path::new("game.bin"), "-").unwrap(); ++ assert_eq!(old.remaining(root.path()), 3); ++ assert_eq!(new.remaining(root.path()), 3); ++ assert_eq!(other.remaining(root.path()), 0); ++ assert!(std::fs::read(&record).unwrap().ends_with(b"\n")); ++ } ++ ++ #[test] ++ fn only_the_latest_record_for_a_path_describes_its_file() { ++ let root = tempfile::tempdir().unwrap(); ++ let (older, _) = sealed(b"old", &[1; 32]); ++ let (newer, _) = sealed(b"new", &[1; 32]); ++ let entry = |segment: &Segment| Entry { path: PathBuf::from("game.bin"), size: 3, hash: None, segments: vec![segment.clone()] }; ++ let (old, new) = (plan_of(vec![entry(&older)]), plan_of(vec![entry(&newer)])); ++ std::fs::write(root.path().join("game.bin"), b"new").unwrap(); ++ std::fs::create_dir(root.path().join(STATE)).unwrap(); ++ let record = root.path().join(STATE).join(VERIFIED); ++ note(&record, Path::new("game.bin"), &identity(&old.entries[0])).unwrap(); ++ note(&record, Path::new("game.bin"), "-").unwrap(); ++ assert_eq!(old.remaining(root.path()), 3); ++ note(&record, Path::new("game.bin"), &identity(&new.entries[0])).unwrap(); ++ assert_eq!(new.remaining(root.path()), 0); ++ assert_eq!(old.remaining(root.path()), 3); ++ } ++ ++ #[tokio::test] ++ async fn a_planned_name_never_serves_as_another_files_partial() { ++ let root = tempfile::tempdir().unwrap(); ++ let plan = plan_of(vec![empty("data.bin.part"), empty("data.bin")]); ++ run(&plan, root.path()).await.unwrap(); ++ assert!(root.path().join("data.bin.part").is_file()); ++ assert!(root.path().join("data.bin").is_file()); ++ assert_eq!(plan.remaining(root.path()), 0); ++ assert!(!root.path().join(STATE).join(PARTIAL).exists()); ++ } ++ ++ #[cfg(unix)] ++ #[tokio::test] ++ async fn a_linked_folder_inside_the_install_is_refused_and_a_linked_root_is_followed() { ++ let root = tempfile::tempdir().unwrap(); ++ let outside = tempfile::tempdir().unwrap(); ++ std::os::unix::fs::symlink(outside.path(), root.path().join("Data")).unwrap(); ++ assert!(run(&plan_of(vec![empty("Data/game.bin")]), root.path()).await.is_err()); ++ assert_eq!(std::fs::read_dir(outside.path()).unwrap().count(), 0); ++ std::fs::create_dir_all(root.path().join(STATE).join(PARTIAL)).unwrap(); ++ std::fs::write(outside.path().join("victim"), b"keep").unwrap(); ++ std::os::unix::fs::symlink(outside.path().join("victim"), root.path().join(STATE).join(PARTIAL).join("0")).unwrap(); ++ run(&plan_of(vec![empty("game.bin")]), root.path()).await.unwrap(); ++ assert_eq!(std::fs::read(outside.path().join("victim")).unwrap(), b"keep"); ++ let real = tempfile::tempdir().unwrap(); ++ let link = root.path().join("linked-root"); ++ std::os::unix::fs::symlink(real.path(), &link).unwrap(); ++ run(&plan_of(vec![empty("Bin/game.bin")]), &link).await.unwrap(); ++ assert!(real.path().join("Bin/game.bin").is_file()); ++ } ++ ++ #[test] ++ fn reclaiming_clears_only_unfinished_downloads() { ++ let root = tempfile::tempdir().unwrap(); ++ std::fs::create_dir_all(root.path().join(STATE).join(PARTIAL)).unwrap(); ++ std::fs::write(root.path().join(STATE).join(PARTIAL).join("0"), vec![0; 4096]).unwrap(); ++ std::fs::write(root.path().join(STATE).join(VERIFIED), b"x y\n").unwrap(); ++ std::fs::write(root.path().join("game.bin"), b"done").unwrap(); ++ reclaim(root.path()).unwrap(); ++ assert!(!root.path().join(STATE).join(PARTIAL).exists()); ++ assert!(root.path().join(STATE).join(VERIFIED).is_file()); ++ assert!(root.path().join("game.bin").is_file()); ++ reclaim(root.path()).unwrap(); ++ } ++ ++ #[cfg(unix)] ++ #[test] ++ fn reclaiming_never_follows_a_linked_state_folder() { ++ let root = tempfile::tempdir().unwrap(); ++ let outside = tempfile::tempdir().unwrap(); ++ std::fs::create_dir(outside.path().join(PARTIAL)).unwrap(); ++ std::fs::write(outside.path().join(PARTIAL).join("keep"), b"keep").unwrap(); ++ std::os::unix::fs::symlink(outside.path(), root.path().join(STATE)).unwrap(); ++ assert!(reclaim(root.path()).is_err()); ++ assert!(outside.path().join(PARTIAL).join("keep").is_file()); ++ let linked_root = tempfile::tempdir().unwrap(); ++ let real = tempfile::tempdir().unwrap(); ++ std::fs::create_dir_all(real.path().join(STATE).join(PARTIAL)).unwrap(); ++ let link = linked_root.path().join("game"); ++ std::os::unix::fs::symlink(real.path(), &link).unwrap(); ++ reclaim(&link).unwrap(); ++ assert!(!real.path().join(STATE).join(PARTIAL).exists()); ++ } ++ ++ #[test] ++ fn package_paths_stay_inside_the_install_folder() { ++ assert_eq!(relative("EmuMenu\\EmuMenu.exe").unwrap(), PathBuf::from("EmuMenu/EmuMenu.exe")); ++ for bad in ["", "..\\x", "/abs", "a\\..\\..\\b", "C:\\x", ".DroidDeck-Install\\verified"] { ++ assert!(relative(bad).is_err(), "{bad}"); ++ } ++ } ++ ++ #[test] ++ fn the_key_derivation_matches_sp800_108_counter_mode() { ++ let derived = derive(&[0x42; 32], b"ctx"); ++ let mut message = 1u32.to_be_bytes().to_vec(); ++ message.extend_from_slice(KDF_LABEL); ++ message.push(0); ++ message.extend_from_slice(b"ctx"); ++ message.extend_from_slice(&256u32.to_be_bytes()); ++ let mut mac = as hmac::KeyInit>::new_from_slice(&[0x42; 32]).unwrap(); ++ mac.update(&message); ++ assert_eq!(derived.as_slice(), mac.finalize().into_bytes().as_slice()); ++ } ++} +diff --git a/crates/xodus-cli/src/commands/store_delivery.rs b/crates/xodus-cli/src/commands/store_delivery.rs +index 7fec6e5..d34b402 100644 +--- a/crates/xodus-cli/src/commands/store_delivery.rs ++++ b/crates/xodus-cli/src/commands/store_delivery.rs +@@ -363,16 +363,6 @@ async fn download_url( + Err(format!("No download location was issued for {}", revision.name)) + } + +-/// Resolves the legacy packages of a Store product through Windows Update. +-pub async fn resolve( +- client: &reqwest::Client, +- product: &str, +- market: &str, +-) -> Result { +- let category = category(client, product, market).await?; +- resolve_category(client, &category).await +-} +- + /// Every build of a Store product Windows Update lists, newest first. Each build + /// has its own content id, and Microsoft can refuse keys for one but not another. + pub struct Builds { +@@ -438,16 +428,6 @@ fn builds_newest_first(revisions: Vec) -> Vec> { + groups.into_iter().filter(|group| !group.is_empty()).collect() + } + +-/// The packages a Windows Update category lists, in the containers a title is +-/// packed in. +-pub async fn resolve_category(client: &reqwest::Client, category: &str) -> Result { +- resolve_wanted(client, category, true, |name| { +- let lower = name.to_ascii_lowercase(); +- lower.ends_with(".eappx") || lower.ends_with(".eappxbundle") +- }) +- .await +-} +- + /// The plain `.appx` packages a category lists, which is how a framework ships. + pub async fn resolve_frameworks(client: &reqwest::Client, category: &str) -> Result { + resolve_wanted(client, category, false, |name| name.to_ascii_lowercase().ends_with(".appx")).await +diff --git a/crates/xodus-cli/src/commands/streaming.rs b/crates/xodus-cli/src/commands/streaming.rs +index 8e9d0e0..426de96 100644 +--- a/crates/xodus-cli/src/commands/streaming.rs ++++ b/crates/xodus-cli/src/commands/streaming.rs +@@ -361,7 +361,11 @@ where + return ExitCode::FAILURE; + } + if plain { +- return plain_package(remote_file, l, out).await; ++ let code = plain_package(remote_file, l, out).await; ++ if code != ExitCode::SUCCESS || !crate::commands::msixvc2::is_package(out) { ++ return code; ++ } ++ return boxed_package(client, tokens, out, market, tx).await; + } + let remote_xvd = match XvdFile::parse(&mut remote_file).await { + Ok(xvd) => xvd, +@@ -853,6 +857,82 @@ async fn plain_package(mut remote: R, length: u64, out: &P + } + } + ++async fn boxed_package( ++ client: &reqwest::Client, ++ tokens: &TokenManager, ++ out: &Path, ++ market: Option, ++ tx: &Sender, ++) -> ExitCode { ++ let fail = |message: &str| { ++ eprintln!("NEXUS_TRANSFER_DIAGNOSTIC_V1 boxed-package-failed 0"); ++ eprintln!("{message}"); ++ ExitCode::FAILURE ++ }; ++ let content_id = match crate::commands::msixvc2::content_id(out) { ++ Ok(id) => id, ++ Err(error) => return fail(&error), ++ }; ++ let (device_key, license) = match get_license(client, tokens, content_id, market.unwrap_or("neutral".to_string()), None, false).await { ++ Ok(found) => found, ++ Err(error) => { ++ eprintln!("{error}"); ++ return ExitCode::FAILURE; ++ } ++ }; ++ let mut keys = HashMap::new(); ++ for (id, packed) in license.content_keys { ++ let Ok(key) = packed.unpack(&device_key) else { ++ return fail("The content key could not be authenticated. Retry the installation or sign in again."); ++ }; ++ if let Ok(key) = <[u8; 32]>::try_from(&key[..]) { ++ keys.insert(id.to_bytes_le(), key); ++ } ++ } ++ tx.send(ProgressEvent::UpdateStatus { name: "Preparing".to_owned() }).await.ok(); ++ let plan = match crate::commands::msixvc2::plan(client, out, &keys).await { ++ Ok(plan) => plan, ++ Err(error) => return fail(&error), ++ }; ++ if let Err(error) = crate::commands::msixvc2::reclaim(out) { ++ return fail(&error); ++ } ++ let total = plan.total(); ++ let needed = plan.remaining(out); ++ if let Ok(free) = available_space(out) ++ && free < needed ++ { ++ eprintln!("NEXUS_LEGACY_INSTALL_DIAGNOSTIC_V1 insufficient-space"); ++ eprintln!( ++ "NEXUS_LEGACY_INSTALL_DETAIL_V1 an install this size needs about {} GB free, and {} GB is available", ++ needed.div_ceil(1_000_000_000), ++ free / 1_000_000_000 ++ ); ++ return ExitCode::FAILURE; ++ } ++ tx.send(ProgressEvent::UpdateRemaining { name: "Downloading".to_owned(), total }).await.ok(); ++ tx.send(ProgressEvent::Started { id: 0, name: "Game files".to_owned(), total }).await.ok(); ++ let pending = std::sync::atomic::AtomicU64::new(0); ++ let report = |written: u64| { ++ let delta = pending.fetch_add(written, std::sync::atomic::Ordering::Relaxed) + written; ++ if tx.try_send(ProgressEvent::Advanced { id: 0, delta }).is_ok() { ++ pending.fetch_sub(delta, std::sync::atomic::Ordering::Relaxed); ++ } ++ }; ++ let installed = crate::commands::msixvc2::install(client, &plan, out, &report).await; ++ let rest = pending.swap(0, std::sync::atomic::Ordering::Relaxed); ++ if rest > 0 { ++ tx.send(ProgressEvent::Advanced { id: 0, delta: rest }).await.ok(); ++ } ++ match installed { ++ Ok(()) => { ++ tx.send(ProgressEvent::Finished { id: 0 }).await.ok(); ++ ExitCode::SUCCESS ++ } ++ Err(error) => fail(&error), ++ } ++} ++ + #[cfg(test)] + mod plain_tests { + fn stored_zip(name: &str, data: &[u8]) -> Vec { diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index cb243221b2..5ff45b9c64 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -11,7 +11,8 @@ lock = json.loads((recipe / 'backend.lock.json').read_text()) local_patches = ['droiddeck-credentials.patch', 'droiddeck-launch-view.patch', 'droiddeck-library-subscriptions.patch', 'droiddeck-credential-fallback.patch', 'droiddeck-credential-diagnostics.patch', 'droiddeck-cloud-token.patch', 'droiddeck-licensing-device-ticket.patch', 'droiddeck-dlc-mount.patch', - 'droiddeck-legacy-packages.patch', 'droiddeck-legacy-install.patch', 'droiddeck-legacy-run.patch'] + 'droiddeck-legacy-packages.patch', 'droiddeck-legacy-install.patch', 'droiddeck-legacy-run.patch', + 'droiddeck-msixvc2.patch'] identity = hashlib.sha256((recipe / 'backend.lock.json').read_bytes() + b''.join((recipe / name).read_bytes() for name in local_patches)).hexdigest() source = cache / ('source-' + identity[:16]) if not (source / '.prepared').is_file(): From 123c431b8eece6146e2e2c191c1652884d33661b Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 18:32:06 -0500 Subject: [PATCH 42/60] feat(ea, ubisoft): cloud saves and a kept Ubisoft Denuvo token (#2824) * feat(ubisoft): keep Denuvo game tokens per account and product until the game invalidates them * feat(ubisoft): sync cloud saves through Ubisoft's cloud save service * fix(xbox): turning cloud saves off passes the offline mode the game save runtime reads * fix(ubisoft): Ubisoft games list their shared prefix, so they get a saves and cloud tab * feat(ea): sync cloud saves through EA's cloud sync service * fix(ea): sync at EA launch and exit, keep one rule snapshot, and check the cloud copy under the write lock * fix(ubisoft): exact slot versions, scoped save export, and a Denuvo cache bound to its account * fix(ea): fresh rules per sync, checksums required, backup before restore, and sign-in shown on the saves tab * fix(ubisoft): launch-time sync on the shared prefix, saves scoped to the game, and Denuvo bound to each launch's account * fix(ea): back up only the saves a restore replaces, refuse truncated manifests, and need a master title id * fix(ubisoft): treat a slot whose bytes changed since the last sync as a conflict before uploading over it * fix(ea): one resolved save folder per sync, refuse case collisions, and walk each folder once * fix(ubisoft): sync only identified slots, keep live saves and backups safe, and tie a pending eviction to its account * fix(cloud): a forced download fetches every saved conflict and keeps the ones it could not write * test(ea): keep the cloud save cases in EaTest * fix(ubisoft): report only written slots, keep drift conflicts, read whole headers, and never rename a named eviction * fix(ea): keep real save folders in the inventory, back up any restored file, refuse duplicate or malformed cloud listings * fix(cloud): commit Ubisoft slots one at a time and stop on a newer cloud write, name skipped and blocked slots, keep unsent conflicts * fix(ubisoft): acknowledge an invalidation only once its marker is published and never serve a kept token after it * fix(cloud): a cloud request the launcher cannot write still starts the game and keeps the exit upload * fix(cloud): scope Ubisoft sync state to the account and product, compare alike slots, keep committed progress, and name partial slots * fix(ea): ask for sign-in after a rejected refresh, upload saves reached through folder aliases * fix(cloud): a launch that stops waiting for the cloud download claims it back, so no save is written once the game starts * fix(ubisoft): name the account in an invalidation marker and never hold the token lock across a pipe write * fix(ea): only invalid_grant asks for sign-in again, and case collisions count only among synced saves * test(epic): let the launcher's ask doubles take the claim flag * fix(ea): apply save rules in their order, match bare patterns inside the save folder, and resolve LocalLow and install folders * fix(ubisoft): stamp a fresh identifier into a new save that has none, so it can sync * fix(ubisoft): answer a burn ticket request as unavailable instead of leaving the game waiting * fix(cloud): read EA manifests with the XML parser, clear conflicts whose sides match, and bound the claim and stall tests --- .../droiddeck/launcher/FrontEndActivity.kt | 4 +- .../droiddeck/launcher/frontend/Library.kt | 1 + .../droiddeck/launcher/session/GameSaves.kt | 44 ++- .../launcher/session/SessionPrefs.kt | 2 + .../droiddeck/launcher/stores/CloudSaves.kt | 311 ++++++++++++++---- .../launcher/stores/CloudTransport.kt | 6 + .../launcher/stores/StoreLaunchRequests.kt | 15 +- .../droiddeck/launcher/stores/ea/EaAuth.kt | 25 +- .../droiddeck/launcher/stores/ea/EaCloud.kt | 265 +++++++++++++++ .../launcher/stores/ea/EaSaveRules.kt | 84 +++++ .../stores/ubisoft/UbisoftActivation.kt | 67 +++- .../launcher/stores/ubisoft/UbisoftCloud.kt | 220 +++++++++++++ .../launcher/stores/ubisoft/UbisoftLaunch.kt | 2 +- .../droiddeck/launcher/ui/FrontEndGames.kt | 6 + .../com/droiddeck/launcher/ui/GameDetail.kt | 24 +- app/src/main/res/values/strings.xml | 2 + app/src/main/rust/stores/src/ubisoft/ffi.rs | 28 ++ .../main/rust/stores/src/ubisoft/service.rs | 45 +++ .../launcher/stores/CloudSavesTest.kt | 211 +++++++++++- .../droiddeck/launcher/stores/ea/EaTest.kt | 187 +++++++++++ .../launcher/stores/ubisoft/MemorySlots.kt | 43 +++ .../launcher/stores/ubisoft/UbisoftTest.kt | 71 ++++ .../droiddeck/launcher/ui/CloudMessageTest.kt | 10 + .../usr/local/bin/droiddeck-store-launch | 61 ++-- .../overlay/usr/local/bin/droiddeck-xbox | 2 +- tools/tests/test_droiddeck_epic.py | 8 +- tools/tests/test_store_launch.py | 109 +++++- tools/tests/test_store_launch_ea.py | 2 +- tools/ubisoft-launcher/src/bridge.rs | 161 +++++++++ tools/ubisoft-launcher/src/launcher.rs | 45 ++- tools/ubisoft-launcher/src/main.rs | 70 +++- 31 files changed, 1999 insertions(+), 132 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt create mode 100644 tools/ubisoft-launcher/src/bridge.rs diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 284970c9c6..a8f165bc42 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1513,7 +1513,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onComponents = { focusContent -> openComponents(focusContent) }, onGameComponents = { game -> openComponents(gameKey = game.profileKey) }, onComponentsTab = { tab -> openComponents(focusContent = true, tab = tab) }, - onSaveImport = { sg -> importSaves(sg.name) { GameSaves.game(sg) } }, + onSaveImport = { sg -> importSaves(sg.name) { GameSaves.game(this@FrontEndActivity, sg) } }, onAddonImport = { sg, target -> importAddons(sg.name, target) }, onAddonDelete = { target, name -> saveAction(getString(R.string.main_addons_deleting, name)) { @@ -1521,7 +1521,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet getString(R.string.main_addons_deleted, name) } }, - onSaveExport = { sg, layout -> exportSaves(sg.name, layout) { GameSaves.game(sg) } }, + onSaveExport = { sg, layout -> exportSaves(sg.name, layout) { GameSaves.game(this@FrontEndActivity, sg) } }, onPerformance = { refreshCores(); showComponents = false; showMapping = false; showPerformance = true }, performancePanel = { PerformanceHost(embedded = true) }, onRoms = { showRoms = true }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 7cc8051774..26c9c99813 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -293,6 +293,7 @@ object Library { g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId, hero = art.hero ?: art.header, lastPlayed = maxOf(lastPlayed, recordedPlay(context, g.gameId)), gameFiles = g.folder, protonPrefix = if (g.source == com.droiddeck.launcher.stores.Store.BATTLENET.id) File(com.droiddeck.launcher.runtime.BattleNet.prefix(context), "pfx").takeIf { it.isDirectory } + else if (g.source == com.droiddeck.launcher.stores.Store.UBISOFT.id) File(com.droiddeck.launcher.stores.ubisoft.UbisoftConnect.prefix(context), "pfx").takeIf { it.isDirectory } else protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), icon = art.icon?.takeIf { it.extension.lowercase() != "ico" }, source = g.source, storeId = g.storeId, diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt index 3a31da0113..a1491ff85a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameSaves.kt @@ -25,7 +25,7 @@ object GameSaves { fun label(context: Context): String = context.getString(R.string.saves_layout_zip, app) } - data class Game(val game: Library.SteamGame, val prefix: File?, val saves: List) { + data class Game(val game: Library.SteamGame, val prefix: File?, val saves: List, val root: String? = null) { val launched get() = prefix?.let { File(it, "drive_c").isDirectory } == true } @@ -36,7 +36,28 @@ object GameSaves { fun savesDir(): File = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "DroidDeck/Saves") private fun backupsDir(): File = File(savesDir(), "backups") - fun game(game: Library.SteamGame): Game = Game(game, game.protonPrefix, game.protonPrefix?.let { locate(it, game) } ?: emptyList()) + fun game(context: Context, game: Library.SteamGame): Game { + val root = if (ubisoft(game)) ubisoftRoot(context, game) else null + val saves = game.protonPrefix?.let { prefix -> if (ubisoft(game)) root?.let { ubisoftSaves(prefix, it) }.orEmpty() else locate(prefix, game) }.orEmpty() + return Game(game, game.protonPrefix, saves, root) + } + + fun saves(context: Context, prefix: File, game: Library.SteamGame): List = + if (ubisoft(game)) ubisoftRoot(context, game)?.let { ubisoftSaves(prefix, it) }.orEmpty() else locate(prefix, game) + + private fun ubisoftRoot(context: Context, game: Library.SteamGame): String? { + val product = game.gameFiles?.let { com.droiddeck.launcher.stores.StoreGameSidecar.read(it) }?.extra?.get("productId")?.toLongOrNull() ?: return null + val user = com.droiddeck.launcher.stores.ubisoft.UbisoftAuth.load(context)?.userId + if (user.isNullOrEmpty() || user.contains('/') || user.contains("..")) return null + return "Saved Games/Ubisoft/$user/$product" + } + + private fun ubisoft(game: Library.SteamGame) = game.source == com.droiddeck.launcher.stores.Store.UBISOFT.id + + private fun ubisoftSaves(prefix: File, rel: String): List { + val files = File(profile(prefix), rel).walkTopDown().filter { it.isFile }.toList() + return if (files.isEmpty()) emptyList() else listOf(SaveDir(rel, files.size, files.sumOf { it.length() })) + } private val SAVE_ROOTS = listOf("Documents/My Games", "Saved Games", "AppData/Roaming", "Documents", "AppData/Local", "AppData/LocalLow") @@ -109,9 +130,11 @@ object GameSaves { fun export(context: Context, game: Game, layout: Layout, dir: File): Pair { val prefix = game.prefix ?: error(context.getString(R.string.saves_not_launched, game.game.name)) + val roots = game.saves.map { it.relPath } + if (roots.isEmpty() && ubisoft(game.game)) error(context.getString(R.string.saves_none_found, game.game.name)) dir.mkdirs() val out = File(dir, "${safe(game.game.name)}_${stamp()}.zip") - val count = zipProfile(profile(prefix), game.saves.map { it.relPath }.ifEmpty { null }, layout, out) + val count = zipProfile(profile(prefix), roots.ifEmpty { null }, layout, out) if (count == 0) { out.delete(); error(context.getString(R.string.saves_none_found, game.game.name)) } return out to count } @@ -142,12 +165,21 @@ object GameSaves { if (!driveC.isDirectory) error(context.getString(R.string.saves_not_launched, game.game.name)) if (!looksLikeSaveZip(zip)) error(context.getString(R.string.saves_not_save_zip, zip.name)) + val scoped = if (ubisoft(game.game)) game.root ?: error(context.getString(R.string.saves_none_found, game.game.name)) else null + if (scoped != null) { + val base = File(profile(prefix), scoped).canonicalFile + val eligible = ZipInputStream(BufferedInputStream(zip.inputStream())).use { zis -> + generateSequence { zis.nextEntry }.any { e -> !e.isDirectory && remap(e.name)?.let { File(driveC, it).canonicalFile.path.startsWith(base.path + File.separator) } == true } + } + if (!eligible) error(context.getString(R.string.saves_not_save_zip, zip.name)) + } backupsDir().mkdirs() - val backup = File(backupsDir(), "${safe(game.game.name)}_${stamp()}.zip") - val backedUp = zipProfile(profile(prefix), null, Layout.GAMEHUB, backup) + val backup = File(backupsDir(), "${safe(game.game.name)}_${stamp()}_${System.currentTimeMillis()}.zip") + val backedUp = if (scoped != null && File(profile(prefix), scoped).walkTopDown().none { it.isFile }) 0 + else zipProfile(profile(prefix), scoped?.let(::listOf), Layout.GAMEHUB, backup) if (backedUp == 0) backup.delete() - val base = driveC.canonicalFile + val base = (if (scoped != null) File(profile(prefix), scoped) else driveC).canonicalFile var written = 0 ZipInputStream(BufferedInputStream(zip.inputStream())).use { zis -> var e = zis.nextEntry diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index d0da893c7d..ed23e31bc3 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1484,6 +1484,8 @@ object SessionPrefs { (id and 0xFFFFFFFFL) to key.removePrefix("addedAppId:") }.toMap() + fun storeGameFolder(context: Context, key: String): String? = prefs(context).getString("storeFolder:$key", null) + fun followStoreGame(context: Context, key: String, folderPath: String, gone: (String) -> Boolean) = synchronized(addedGameLock) { val p = prefs(context) val previous = p.getString("storeFolder:$key", null) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 45b1be5429..c2fd9890d5 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -5,11 +5,20 @@ import android.content.SharedPreferences import android.util.Log import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.ea.EaAuth +import com.droiddeck.launcher.stores.ea.EaCloud +import com.droiddeck.launcher.stores.ea.EaLibrary +import com.droiddeck.launcher.stores.ea.EaPrefs +import com.droiddeck.launcher.stores.ea.EaSaveRules import com.droiddeck.launcher.stores.epic.EpicApiClient import com.droiddeck.launcher.stores.epic.EpicCredentialStore import com.droiddeck.launcher.stores.epic.EpicPrefs import com.droiddeck.launcher.stores.gog.GogAuth import com.droiddeck.launcher.stores.gog.GogPrefs +import com.droiddeck.launcher.stores.ubisoft.UbisoftAuth +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloud +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloudTransport +import com.droiddeck.launcher.stores.ubisoft.UbisoftConnect import java.io.File import java.net.HttpURLConnection import java.net.URL @@ -32,19 +41,27 @@ object CloudSaves { if (detail.isNotEmpty()) " detail=\"$detail\"" else "" } - class Status(val supported: Boolean, val folder: File?, val lastSync: Long, val reason: String, val conflicts: List = emptyList()) + class Status(val supported: Boolean, val folder: File?, val lastSync: Long, val reason: String, val conflicts: List = emptyList(), val signedIn: Boolean = true) - private fun game(context: Context, store: Store, id: String): Pair? = - StoreInstallRoot.gameFolders(context).firstNotNullOfOrNull { f -> - StoreGameSidecar.read(f)?.takeIf { it.store == store && it.id == id && it.isInstalled }?.let { f to it } - } + private fun game(context: Context, store: Store, id: String): Pair? { + fun match(f: File) = StoreGameSidecar.read(f)?.takeIf { it.store == store && it.id == id && it.isInstalled }?.let { f to it } + return StoreInstallRoot.gameFolders(context).firstNotNullOfOrNull(::match) + ?: if (store != Store.UBISOFT) null + else com.droiddeck.launcher.session.SessionPrefs.storeGameFolder(context, "${store.id}:$id")?.let { match(File(it)) } + } + + fun supports(store: Store?): Boolean = store == Store.GOG || store == Store.EPIC || store == Store.EA || store == Store.UBISOFT fun prefix(context: Context, folder: File): File? { val appId = AddedGames.scan(context).firstOrNull { it.folder.absolutePath == folder.absolutePath }?.appId ?: return null return Library.protonPrefix(context, appId and 0xFFFFFFFFL) } - private fun prefs(context: Context, store: Store) = if (store == Store.GOG) GogPrefs.get(context) else EpicPrefs.get(context) + private fun prefs(context: Context, store: Store) = when (store) { + Store.GOG -> GogPrefs.get(context) + Store.EA -> EaPrefs.get(context) + else -> EpicPrefs.get(context) + } fun lastSync(context: Context, store: Store, id: String): Long = prefs(context, store).getLong("cloud_sync_$id", 0L) @@ -52,6 +69,7 @@ object CloudSaves { private const val TEMPLATE_NONE = "none" + private const val UBISOFT_TEMPLATE = "ubisoft" internal const val TEMPLATE_NONE_TTL_MS = 24 * 60 * 60 * 1000L internal fun noneTemplateIsCurrent(storedAtMs: Long, nowMs: Long) = @@ -64,6 +82,10 @@ object CloudSaves { fun template(context: Context, store: Store, id: String, folder: File, sidecar: StoreGameSidecar): String? { val p = prefs(context, store) + if (store == Store.EA) eaRules(context, id)?.let { fresh -> + if (fresh.isEmpty()) rememberNoCloud(p, id) else p.edit().putString("cloud_template_$id", fresh).remove("cloud_template_at_$id").apply() + return fresh + } var retryNone = false if (p.contains("cloud_template_$id")) { val cached = p.getString("cloud_template_$id", "") ?: "" @@ -89,7 +111,9 @@ object CloudSaves { val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> "" + Store.UBISOFT -> UBISOFT_TEMPLATE + Store.EA -> eaRules(context, id) ?: return null + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.ROCKSTAR -> "" } ?: return null p.edit() .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) @@ -146,18 +170,25 @@ object CloudSaves { val (folder, sidecar) = game(context, store, id) ?: return null to "not-installed" val template = template(context, store, id, folder, sidecar) ?: return null to "store-unreachable" if (template.isEmpty()) return null to "no-cloud-saves" + if (store == Store.UBISOFT) { + val user = UbisoftAuth.load(context)?.userId?.takeIf { it.isNotEmpty() } ?: return null to "not-signed-in" + val product = sidecar.extra["productId"]?.toLongOrNull() ?: return null to "unresolved" + return File(UbisoftConnect.prefix(context), "pfx/drive_c/users/steamuser/Saved Games/Ubisoft/$user/$product") to "ok" + } val pfx = prefix(context, folder) ?: return null to "no-prefix" val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null + Store.EA -> if (sidecar.extra["masterTitleId"].isNullOrEmpty()) null + else EaSaveRules.parse(template)?.base()?.let(EaSaveRules::template)?.let { CloudSavePaths.gog(it, pfx, folder) } + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.UBISOFT, Store.ROCKSTAR -> null } return dir to (if (dir == null) "unresolved" else "ok") } fun status(context: Context, store: Store, id: String): Status { val (dir, reason) = saveFolder(context, store, id) - return Status(reason != "no-cloud-saves" && reason != "not-installed", dir, lastSync(context, store, id), reason, conflicts(context, store, id)) + return Status(reason != "no-cloud-saves" && reason != "not-installed", dir, lastSync(context, store, id), reason, conflicts(context, store, id, dir), signedIn(context, store)) } @@ -175,7 +206,33 @@ object CloudSaves { val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.EA, Store.UBISOFT, Store.ROCKSTAR -> null + Store.UBISOFT -> { + val session = UbisoftAuth.current(context) + val product = StoreGameSidecar.read(folder)?.extra?.get("productId")?.toLongOrNull() + if (session == null || product == null) null else UbisoftCloudTransport(UbisoftCloud(session, product), session.userId) + } + Store.EA -> { + val sidecar = StoreGameSidecar.read(folder) + val rules = sidecar?.let { template(context, store, id, folder, it) }?.let(EaSaveRules::parse) + val base = rules?.base() + val token = EaAuth.accessToken(context) + val uid = EaAuth.load(context)?.userId.orEmpty() + val master = sidecar?.extra?.get("masterTitleId").orEmpty() + if (rules == null || base == null || token == null || uid.isEmpty() || master.isEmpty()) null + else EaCloud(token, uid, EaCloud.keys(master, sidecar?.extra?.get("multiplayerId").orEmpty()), base, rules, saveFolder(context, store, id).first) + } + Store.AMAZON, Store.ITCH, Store.GAMEJOLT, Store.XBOX, Store.BATTLENET, Store.ROCKSTAR -> null + } + + private fun signedIn(context: Context, store: Store): Boolean = when (store) { + Store.EA -> EaAuth.signedIn(context) + else -> true + } + + private fun eaRules(context: Context, id: String): String? { + val games = EaLibrary.cached(context) + if (games.isEmpty()) return null + return games.firstOrNull { it.offerId == id }?.cloudSaves.orEmpty() } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { @@ -184,11 +241,15 @@ object CloudSaves { } - private fun baseline(context: Context, store: Store, id: String): Map? = - CloudPlan.fromJson(prefs(context, store).getString("cloud_baseline_$id", null)) + /** Ubisoft saves belong to an account and product, so their sync state is kept per save folder. */ + internal fun scope(store: Store, id: String, dir: File): String = + if (store == Store.UBISOFT) "$id:${dir.parentFile?.name.orEmpty()}:${dir.name}" else id - private fun saveBaseline(context: Context, store: Store, id: String, b: Map) = - prefs(context, store).edit().putString("cloud_baseline_$id", CloudPlan.toJson(b)).apply() + internal fun baseline(context: Context, store: Store, key: String): Map? = + CloudPlan.fromJson(prefs(context, store).getString("cloud_baseline_$key", null)) + + private fun saveBaseline(context: Context, store: Store, key: String, b: Map) = + prefs(context, store).edit().putString("cloud_baseline_$key", CloudPlan.toJson(b)).apply() internal class Migration(val baseline: Map, val moved: Int, val cleaned: Int, val failed: Int) @@ -260,30 +321,45 @@ object CloudSaves { if (result == null || result.failed == 0) p.edit().putInt("cloud_layout_$id", CLOUD_LAYOUT).apply() } - fun conflicts(context: Context, store: Store, id: String): List = - prefs(context, store).getString("cloud_conflicts_$id", "").orEmpty().split('\n').filter { it.isNotEmpty() } + fun conflicts(context: Context, store: Store, id: String, dir: File? = null): List = + if (store == Store.UBISOFT && dir == null) emptyList() else savedConflicts(context, store, dir?.let { scope(store, id, it) } ?: id) - private fun saveConflicts(context: Context, store: Store, id: String, names: Collection) = - prefs(context, store).edit().putString("cloud_conflicts_$id", names.joinToString("\n")).apply() + private fun savedConflicts(context: Context, store: Store, key: String): List = + prefs(context, store).getString("cloud_conflicts_$key", "").orEmpty().split('\n').filter { it.isNotEmpty() } - fun download(context: Context, store: Store, id: String, force: Boolean = false): Result = - sync(context, store, id, "down") { dir, cloud -> downWith(context, store, id, dir, cloud, force) } + private fun saveConflicts(context: Context, store: Store, key: String, names: Collection) = + prefs(context, store).edit().putString("cloud_conflicts_$key", names.joinToString("\n")).apply() + + private fun alike(cloud: CloudTransport, conflicts: List, local: Map, remote: Map): List = + if (cloud.contentDigests) emptyList() + else conflicts.filter { name -> + val r = remote[name] ?: return@filter false + val l = local[name] ?: return@filter false + runCatching { md5(cloud.get(r).first) }.getOrNull()?.equals(l.md5, ignoreCase = true) == true + } + + private fun settled(plan: CloudPlan.Plan, alike: List): CloudPlan.Plan = + if (alike.isEmpty()) plan else CloudPlan.Plan(plan.transfer, plan.conflicts - alike.toSet(), plan.same + alike, plan.refused) + + fun download(context: Context, store: Store, id: String, force: Boolean = false, claim: () -> Boolean = { true }): Result = + sync(context, store, id, "down") { dir, cloud -> downWith(context, store, id, dir, cloud, force, claim) } fun upload(context: Context, store: Store, id: String, force: Boolean = false): Result = sync(context, store, id, "up") { dir, cloud -> upWith(context, store, id, dir, cloud, force) } - fun downloadOrDefer(context: Context, store: Store, id: String): Result = - downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }) + fun downloadOrDefer(context: Context, store: Store, id: String, claim: () -> Boolean): Result = + downloadOrDefer(context, store, id, Executor { Thread(it, "cloud-deferred").start() }, claim) - internal fun downloadOrDefer(context: Context, store: Store, id: String, executor: Executor): Result { + internal fun downloadOrDefer(context: Context, store: Store, id: String, executor: Executor, claim: () -> Boolean = { true }): Result { val app = context.applicationContext val g = game(app, store, id) ?: return done(store, id, "down", Result("skipped", 0, 0, "not-installed")) if (!g.second.cloud) return done(store, id, "down", Result("skipped", 0, 0, "off")) - if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) return download(app, store, id) + val ready = { (if (store == Store.UBISOFT) File(UbisoftConnect.prefix(app), "pfx") else prefix(app, g.first))?.let { CloudSavePaths.profile(it).isDirectory } == true } + if (ready()) return download(app, store, id, claim = claim) executor.execute { val end = System.currentTimeMillis() + PREFIX_WAIT_MS while (System.currentTimeMillis() < end) { - if (prefix(app, g.first)?.let { CloudSavePaths.profile(it).isDirectory } == true) { download(app, store, id); return@execute } + if (ready()) { download(app, store, id); return@execute } Thread.sleep(2000) } done(store, id, "down", Result("skipped", 0, 0, "no-prefix")) @@ -304,8 +380,12 @@ object CloudSaves { if (dir != null && store == Store.GOG) migrateGogNested(context, id, g.first, dir) val cloud = if (dir != null) transport(context, store, id, g.first) else null when { + cloud is UbisoftCloudTransport && dir?.parentFile?.name != cloud.user -> Result("skipped", 0, 0, "account-changed") dir == null -> Result("skipped", 0, 0, reason) + cloud == null && store == Store.EA && signedIn(context, store) -> Result("failed", 0, 0, "sign-in-unreachable") cloud == null -> Result("skipped", 0, 0, "not-signed-in") + cloud is EaCloud && cloud.localDir?.canonicalPath != dir.canonicalPath -> Result("skipped", 0, 0, "rules-changed") + cloud is EaCloud && caseCollision(localFiles(dir).keys, cloud::wants) -> Result("failed", 0, 0, "case-collision") else -> body(dir, cloud).also { if (it.result == "ok") markSynced(context, store, id) } } } @@ -319,15 +399,32 @@ object CloudSaves { return done(store, id, way, result) } + internal fun caseCollision(names: Collection, wants: (String) -> Boolean): Boolean = + names.filter(wants).groupBy { it.lowercase() }.any { it.value.size > 1 } + private fun done(store: Store, id: String, way: String, r: Result): Result { Log.i(TAG, "cloud ${store.id} $id $way ${r.line}") StoresState.logLine("cloud ${store.id} $id $way ${r.line}") return r } - private fun localFiles(dir: File): Map = - if (!dir.isDirectory) emptyMap() - else dir.walkTopDown().filter { it.isFile }.associateBy { it.relativeTo(dir).path.replace(File.separatorChar, '/') } + private fun localFiles(dir: File): Map { + if (!dir.isDirectory) return emptyMap() + val root = runCatching { dir.toPath().toRealPath() }.getOrNull() ?: return emptyMap() + val found = LinkedHashMap() + fun walk(d: File, prefix: String, ancestry: Set) { + for (child in d.listFiles().orEmpty()) { + val real = runCatching { child.toPath().toRealPath() }.getOrNull() ?: continue + if (!real.startsWith(root)) continue + val name = prefix + child.name + if (child.isDirectory) { + if (real !in ancestry) walk(child, "$name/", ancestry + real) + } else if (child.isFile) found[name] = child + } + } + walk(dir, "", setOf(root)) + return found + } internal fun md5(f: File): String = md5(f.readBytes()) @@ -341,46 +438,85 @@ object CloudSaves { return files.associateBy { it.name } } - internal fun downWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean): Result { - val files = localFiles(dir) + internal fun downWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean, claim: () -> Boolean = { true }): Result { + val files = localFiles(dir).filterKeys(cloud::wants) val remote = remote(cloud) { it in files } val local = files.mapValues { CloudPlan.Local(md5(it.value)) } - val base = baseline(context, store, id) - val plan = CloudPlan.down(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) - val take = if (force) plan.transfer + plan.conflicts else plan.transfer - if (take.isNotEmpty() && files.isNotEmpty()) backup(context, store, id, dir, "local") + val key = scope(store, id, dir) + val base = baseline(context, store, key) + val planned = CloudPlan.down(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) + val alike = alike(cloud, planned.conflicts, local, remote) + val plan = settled(planned, alike) + val saved = savedConflicts(context, store, key).filter { it in remote && it !in alike && it !in plan.same } + val take = if (force) (plan.transfer + plan.conflicts + saved).distinct() else plan.transfer val next = HashMap(base.orEmpty()) var bytes = 0L + val written = HashSet() + val changed = ArrayList() + val blocked = ArrayList() + val fetched = LinkedHashMap>>() for (name in take) { val f = remote[name] ?: continue - val (data, modified) = cloud.get(f) + if (!File(dir, name).canonicalPath.startsWith(dir.canonicalPath + File.separator)) { blocked += name; continue } + fetched[name] = f to cloud.get(f) + } + if (fetched.isNotEmpty() && !claim()) return Result("skipped", 0, 0, "launch-moved-on") + val replaced = fetched.keys.mapNotNull { name -> files[name] ?: File(dir, name).takeIf { it.isFile } } + if (!backupReplaced(context, store, id, dir, replaced)) return Result("failed", 0, 0, "backup-failed") + for ((name, got) in fetched) { + val (f, content) = got + val (data, modified) = content val dest = File(dir, name) - if (!dest.canonicalPath.startsWith(dir.canonicalPath + File.separator)) continue + if ((if (dest.isFile) md5(dest) else null) != local[name]?.md5) { changed += name; continue } dest.parentFile?.mkdirs() dest.writeBytes(data) if (modified > 0) dest.setLastModified(modified) bytes += data.size + written += name next[name] = CloudPlan.Entry(md5(data), f.md5, if (modified > 0) modified else f.modifiedMs) } for (name in plan.same) remote[name]?.let { r -> next[name] = CloudPlan.Entry(local.getValue(name).md5, r.md5, r.modifiedMs) } - saveBaseline(context, store, id, next) - val left = if (force) emptyList() else plan.conflicts - saveConflicts(context, store, id, left) - return Result("ok", take.size, bytes, if (take.isEmpty()) "up-to-date" else "downloaded", left.size) + saveBaseline(context, store, key, next) + val left = (if (force) take.filter { it !in written } else plan.conflicts + saved.filter { it !in written } + changed) + .filter { it !in blocked }.distinct() + saveConflicts(context, store, key, left) + val reason = when { + take.isEmpty() -> "up-to-date" + changed.isNotEmpty() -> "changed-locally" + blocked.isNotEmpty() -> "blocked-path" + else -> "downloaded" + } + val detail = listOfNotNull( + changed.takeIf { it.isNotEmpty() }?.joinToString(prefix = "changed locally: "), + blocked.takeIf { it.isNotEmpty() }?.joinToString(prefix = "outside the save folder: "), + ).joinToString("; ") + return Result(if (written.size < take.size) "partial" else "ok", written.size, bytes, reason, left.size, detail) } internal fun upWith(context: Context, store: Store, id: String, dir: File, cloud: CloudTransport, force: Boolean): Result { - val base = baseline(context, store, id) ?: return Result("skipped", 0, 0, "no-baseline") - val files = localFiles(dir) + val key = scope(store, id, dir) + val base = baseline(context, store, key) ?: return Result("skipped", 0, 0, "no-baseline") + val files = localFiles(dir).filterKeys(cloud::wants).let { all -> if (cloud is UbisoftCloudTransport) all.filterValues(::markUbisoftSave) else all } if (files.isEmpty()) return Result("skipped", 0, 0, "nothing-local") val remote = remote(cloud) { it in files } val local = files.mapValues { CloudPlan.Local(md5(it.value)) } - val plan = CloudPlan.up(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) - val send = CloudPlan.upSend(plan, force, cloud is GogCloud, files.keys) + val planned = CloudPlan.up(local, remote.mapValues { CloudPlan.Remote(it.value.md5, it.value.modifiedMs) }, base) + val alike = alike(cloud, planned.conflicts, local, remote) + val plan = settled(planned, alike) + val saved = savedConflicts(context, store, key).filter { it !in alike && it !in plan.same } + var send = CloudPlan.upSend(plan, force, cloud is GogCloud, files.keys) val next = HashMap(base) for (name in plan.same) remote[name]?.let { r -> next[name] = CloudPlan.Entry(local.getValue(name).md5, r.md5, r.modifiedMs) } + var drifted = emptyList() + var raced = emptyList() + if (send.isNotEmpty()) { + val copies = backupCloud(context, store, id, cloud, send.mapNotNull { remote[it] }) + if (cloud is UbisoftCloudTransport && !force) { + drifted = send.filter { name -> val synced = base[name]?.localMd5; synced != null && copies[name]?.let { it != synced } == true } + send = send - drifted.toSet() + } + } if (send.isNotEmpty()) { - backupCloud(context, store, id, cloud, send.mapNotNull { remote[it] }) val stamped = HashMap() val sentMd5 = HashMap() if (cloud is GogCloud) { @@ -394,19 +530,40 @@ object CloudSaves { } else { val data = send.associateWith { files.getValue(it).readBytes() } for ((name, bytes) in data) sentMd5[name] = md5(bytes) - stamped += cloud.put(data, send.associateWith { files.getValue(it).lastModified() }) + stamped += try { + cloud.put(data, send.associateWith { files.getValue(it).lastModified() }) + } catch (e: CloudChanged) { + raced = e.unsent + e.sent + } catch (e: Exception) { + val kept = send.mapNotNull { name -> cloud.committed(name)?.let { name to it } } + if (kept.isNotEmpty()) { + for ((name, r) in kept) next[name] = CloudPlan.Entry(sentMd5.getValue(name), r.md5, r.modifiedMs) + saveBaseline(context, store, key, next) + saveConflicts(context, store, key, saved - kept.map { it.first }.toSet()) + } + throw e + } + send = send.filter { it in stamped } for ((name, t) in stamped) if (t > 0) files[name]?.setLastModified(t) } - val after = remote(cloud) { it in send } + val after = if (send.all { cloud.committed(it) != null }) emptyMap() else remote(cloud) { it in send && cloud.committed(it) == null } for (name in send) { - val r = after[name] + val r = cloud.committed(name) ?: after[name] next[name] = CloudPlan.Entry(sentMd5.getValue(name), r?.md5, r?.modifiedMs ?: stamped[name] ?: -1L) } } - saveBaseline(context, store, id, next) - val left = if (force) emptyList() else plan.conflicts - saveConflicts(context, store, id, left) - return Result("ok", send.size, send.sumOf { files.getValue(it).length() }, if (send.isEmpty()) "up-to-date" else "uploaded", left.size) + saveBaseline(context, store, key, next) + val left = (if (force) (plan.conflicts + saved).filter { it !in send } + raced + else plan.conflicts + drifted + raced + saved.filter { it !in send && it in files }).distinct() + saveConflicts(context, store, key, left) + val reason = when { + raced.isNotEmpty() -> "changed-in-cloud" + send.isEmpty() -> "up-to-date" + else -> "uploaded" + } + return Result(if (raced.isEmpty()) "ok" else "partial", send.size, send.sumOf { files.getValue(it).length() }, reason, left.size, + if (raced.isEmpty()) "" else raced.joinToString(prefix = "changed in the cloud: ")) } @@ -441,23 +598,59 @@ object CloudSaves { private fun backupRoot(context: Context, store: Store, id: String) = File(context.filesDir, "stores/cloud-backups/${store.id}-${id.replace(Regex("[^A-Za-z0-9._-]"), "_")}") - private fun backup(context: Context, store: Store, id: String, dir: File, kind: String) { - val root = backupRoot(context, store, id) - runCatching { dir.copyRecursively(File(root, "$kind-${System.currentTimeMillis()}"), overwrite = true) } - prune(root, kind) + private fun markUbisoftSave(file: File): Boolean { + val head = ByteArray(40) + var filled = 0 + file.inputStream().use { input -> + while (filled < head.size) { + val n = input.read(head, filled, head.size - filled) + if (n < 0) break + filled += n + } + } + if (filled < head.size) return false + if (UbisoftCloud.mark(head) != null) return true + if (head.copyOfRange(8, 40).any { it != 0.toByte() }) return false + java.io.RandomAccessFile(file, "rw").use { it.seek(8); it.write(UbisoftCloud.freshMark().toByteArray(Charsets.ISO_8859_1)) } + return true } - private fun backupCloud(context: Context, store: Store, id: String, cloud: CloudTransport, files: List) { - if (files.isEmpty()) return + private fun backupCloud(context: Context, store: Store, id: String, cloud: CloudTransport, files: List): Map { + if (files.isEmpty()) return emptyMap() val root = backupRoot(context, store, id) val target = File(root, "cloud-${System.currentTimeMillis()}") + val copies = HashMap() for (f in files) { val dest = File(target, f.name) if (!dest.canonicalPath.startsWith(target.canonicalPath + File.separator)) continue dest.parentFile?.mkdirs() - dest.writeBytes(cloud.get(f).first) + val data = cloud.get(f).first + dest.writeBytes(data) + copies[f.name] = md5(data) } prune(root, "cloud") + return copies + } + + private fun backupReplaced(context: Context, store: Store, id: String, dir: File, replaced: List): Boolean { + if (replaced.isEmpty()) return true + val base = runCatching { dir.canonicalPath + File.separator }.getOrNull() ?: return false + val root = backupRoot(context, store, id) + val stamp = "${System.currentTimeMillis()}-${java.util.UUID.randomUUID().toString().take(8)}" + val staging = File(root, "staging-$stamp") + val copied = runCatching { + for (f in replaced) { + check(f.canonicalPath.startsWith(base)) + f.copyTo(File(staging, f.relativeTo(dir).path), overwrite = true) + } + check(staging.renameTo(File(root, "local-$stamp"))) + }.isSuccess + if (!copied) { + staging.deleteRecursively() + return false + } + prune(root, "local") + return true } private fun prune(root: File, kind: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 2971bb61ca..9e0ad99196 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -27,6 +27,10 @@ class CloudFile(val name: String, var modifiedMs: Long, var md5: String? = null, class CloudPut(val modifiedMs: Long, val md5: String?) interface CloudTransport { + /** False when [CloudFile.md5] is a version the service assigns rather than a digest of the content. */ + val contentDigests: Boolean get() = true + fun committed(name: String): CloudFile? = null + fun wants(name: String): Boolean = true fun list(): List fun details(file: CloudFile) {} fun get(file: CloudFile): Pair @@ -182,6 +186,8 @@ internal fun isoDate(s: String?): Long { class NoCloudSaves : Exception("no cloud saves") +class CloudChanged(val sent: Map, val unsent: List) : Exception("cloud saves changed since they were read") + internal fun splitGogName(name: String): Pair { val slash = name.indexOf('/') return if (slash <= 0 || slash == name.length - 1) null to name diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index 9ec0dad5fd..cc231dfcb8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -46,11 +46,18 @@ object StoreLaunchRequests { } private fun answer(app: Context, file: File) { + val resp = File(dir(app), "resp").apply { mkdirs() } + val rid = file.name.removeSuffix(".json") + val taken = File(resp, "$rid.taken") + val writing = File(resp, "$rid.writing") + if (!file.renameTo(taken)) return val request = try { - JSONObject(file.readText()).also { file.delete() } + JSONObject(taken.readText()) } catch (e: Exception) { + taken.delete() return } + val claim = { taken.renameTo(writing) } val reply = when (request.optString("op")) { "xbox-released" -> { com.droiddeck.launcher.stores.xbox.XboxRuntime.released(request.optString("lease")) @@ -108,7 +115,7 @@ object StoreLaunchRequests { else { lastLaunched = store to id CloudSaves.markDirty(app, store, id) - CloudSaves.downloadOrDefer(app, store, id).let { JSONObject().put("ok", it.ok).put("result", it.result).put("files", it.files).put("reason", it.reason) } + CloudSaves.downloadOrDefer(app, store, id, claim).let { JSONObject().put("ok", it.ok).put("result", it.result).put("files", it.files).put("reason", it.reason) } } } "cloud-up" -> { @@ -167,12 +174,14 @@ object StoreLaunchRequests { else -> JSONObject().put("ok", false).put("reason", "unknown-op") } try { - val resp = File(dir(app), "resp").apply { mkdirs() } val tmp = File(resp, file.name + ".tmp") tmp.writeText(reply.toString()) tmp.renameTo(File(resp, file.name)) } catch (e: Exception) { Log.w(TAG, "could not answer ${file.name}: ${e.message}") + } finally { + taken.delete() + writing.delete() } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt index 67fb8e655e..a600c905bc 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaAuth.kt @@ -17,7 +17,7 @@ object EaAuth { const val CLIENT_ID = "JUNO_PC_CLIENT" private const val CLIENT_SECRET = "4mRLtYMb6vq9qglomWEaT4ChxsXWcyqbQpuBNfMPOYOiDmYYQmjuaBsF2Zp0RyVeWkfqhE9TuGgAw7te" const val AUTH_URL = "https://accounts.ea.com/connect/auth" - private const val TOKEN_URL = "https://accounts.ea.com/connect/token" + internal var tokenUrl = "https://accounts.ea.com/connect/token" const val REDIRECT = "qrc:///html/login_successful.html" private const val REFRESH_MARGIN_MS = 5 * 60 * 1000L private val refreshLock = Any() @@ -41,8 +41,11 @@ object EaAuth { val personaId: String, val displayName: String, val eaId: String, + val rejected: Boolean = false, ) + private class Rejected(message: String) : IllegalStateException(message) + class Pending(val url: String, val verifier: String) internal fun fromJson(o: JSONObject): Account? { @@ -55,6 +58,7 @@ object EaAuth { personaId = o.optString("persona_id"), displayName = o.optString("display_name"), eaId = o.optString("ea_id"), + rejected = o.optBoolean("refresh_rejected"), ) } @@ -122,14 +126,15 @@ object EaAuth { private fun tokenCall(values: List>): JSONObject { val reply = EaHttp.request( - TOKEN_URL, "POST", + tokenUrl, "POST", mapOf("Content-Type" to "application/x-www-form-urlencoded"), EaHttp.form(values + listOf("client_id" to CLIENT_ID, "client_secret" to CLIENT_SECRET)).toByteArray(), follow = false, ) val json = runCatching { JSONObject(reply.text) }.getOrNull() if (!reply.ok || json == null || json.optString("access_token").isEmpty()) { - throw IllegalStateException("EA token request failed (${reply.status}): ${json?.optString("error_description")?.ifEmpty { json.optString("error") } ?: ""}") + val message = "EA token request failed (${reply.status}): ${json?.optString("error_description")?.ifEmpty { json.optString("error") } ?: ""}" + throw if (json?.optString("error") == "invalid_grant") Rejected(message) else IllegalStateException(message) } return json } @@ -162,6 +167,7 @@ object EaAuth { tokenCall(listOf("grant_type" to "refresh_token", "refresh_token" to a.refreshToken)) } catch (e: Exception) { Log.w(TAG, "refresh: ${e.message}") + if (e is Rejected) markRejected(context, a.refreshToken) return null } val access = token.getString("access_token") @@ -176,11 +182,24 @@ object EaAuth { val record = StoreAccounts.read(app, Store.EA) ?: return false record.put("access_token", access).put("expires_at", System.currentTimeMillis() + expiresIn * 1000) refresh.takeIf { it.isNotEmpty() }?.let { record.put("refresh_token", it) } + record.remove("refresh_rejected") player?.let { record.put("user_id", it.userId).put("persona_id", it.personaId).put("display_name", it.displayName).put("ea_id", it.eaId) } StoreAccounts.write(app, Store.EA, record) true } + private fun markRejected(context: Context, refresh: String) = synchronized(refreshLock) { + val app = context.applicationContext + val record = StoreAccounts.read(app, Store.EA) ?: return@synchronized + if (record.optString("refresh_token") != refresh) return@synchronized + StoreAccounts.write(app, Store.EA, record.put("refresh_rejected", true)) + } + + fun signedIn(context: Context): Boolean { + val a = load(context) ?: return false + return a.userId.isNotEmpty() && !(a.rejected && a.expiresAt <= System.currentTimeMillis()) + } + fun accessToken(context: Context): String? { val current = load(context) ?: return null if (fresh(current)) return current.accessToken diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt new file mode 100644 index 0000000000..6c5242474e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaCloud.kt @@ -0,0 +1,265 @@ +package com.droiddeck.launcher.stores.ea + +import android.util.Base64 +import android.util.Xml +import com.droiddeck.launcher.stores.CloudFile +import com.droiddeck.launcher.stores.CloudTransport +import java.io.File +import java.io.StringReader +import java.security.MessageDigest +import java.time.Instant +import org.xmlpull.v1.XmlPullParser + +internal class EaCloud( + private val token: String, + private val uid: String, + private val keys: List, + private val base: String, + private val rules: EaSaveRules, + val localDir: File? = null, +) : CloudTransport { + class Entry(val size: Long, val href: String, val md5: String, val created: String, val modified: String, val localName: String) + + class Manifest(val lineage: String, val files: List, val snapshots: List) + + private class Signed(val url: String, val headers: Map) + + private class Request(val verb: String, val resource: String, val md5: String? = null, val type: String? = null) + + private var key: String? = null + private var found = false + private var listed: Map? = null + private val committed = HashMap() + + override fun wants(name: String): Boolean = rules.matches(base + name) + + override fun committed(name: String): CloudFile? = committed[name] + + override fun list(): List { + val manifest = pick() + val files = manifest?.files.orEmpty().mapNotNull { e -> + val path = EaSaveRules.normalize(e.localName) + if (!path.startsWith(base, ignoreCase = true) || !rules.matches(path)) return@mapNotNull null + val md5 = hex(e.md5) ?: error("EA listed ${path.substring(base.length)} without a valid checksum") + CloudFile(localName(path.substring(base.length)), parseTime(e.modified), md5, readLink = e.href) + } + val twins = files.groupBy { it.name.lowercase() }.values.firstOrNull { it.size > 1 } + check(twins == null) { "EA lists more than one save named ${twins!!.first().name} in different cases" } + listed = files.associate { it.name.lowercase() to it.md5 } + return files + } + + private fun localName(name: String): String { + var dir = localDir ?: return name + val parts = name.split('/') + val out = ArrayList() + for (part in parts) { + val match = dir.listFiles()?.filter { it.name.equals(part, ignoreCase = true) }.orEmpty() + check(match.size <= 1) { "The save folder holds more than one file named $part in different cases" } + val pick = match.singleOrNull() + if (pick == null) return (out + parts.drop(out.size)).joinToString("/") + out += pick.name + dir = pick + } + return out.joinToString("/") + } + + override fun get(file: CloudFile): Pair { + val href = file.readLink ?: error("EA has no data for ${file.name}") + return locked("read", key ?: keys.first()) { lock, _ -> + val signed = authorize(lock, listOf(Request("GET", href))).single() + val reply = EaHttp.request(signed.url, headers = signed.headers) + check(reply.ok) { "EA cloud save download answered ${reply.status}" } + val want = file.md5 ?: error("EA listed ${file.name} without a valid checksum") + check(hex(b64(md5(reply.body))) == want) { "EA cloud save ${file.name} failed its checksum" } + reply.body to file.modifiedMs + } + } + + override fun put(files: Map, modifiedMs: Map): Map { + if (key == null) pick() + check(found || keys.size == 1) { "EA has no cloud save record for this game yet; play it once in the EA app" } + val target = key ?: keys.first() + val seen = listed + return locked("write", target) { lock, body -> + val locked = manifestUrl(body)?.let { fetchManifest(it) } + check(locked != null || !found) { "EA's cloud save record disappeared" } + val current = locked ?: Manifest("{00000000-0000-0000-0000-000000000000}", emptyList(), emptyList()) + if (seen != null) for (name in files.keys) { + val entry = current.files.firstOrNull { EaSaveRules.normalize(it.localName).equals(base + name, ignoreCase = true) } + val now = entry?.let { hex(it.md5) ?: error("EA lists $name without a valid checksum") } + check(now == seen[name.lowercase()]) { "EA's cloud saves changed since they were read" } + } + val now = System.currentTimeMillis() + val added = files.map { (name, data) -> + val sum = md5(data) + val stamp = stamp(modifiedMs[name]?.takeIf { it > 0 } ?: now) + val old = current.files.firstOrNull { EaSaveRules.normalize(it.localName).equals(base + name, ignoreCase = true) } + Entry(data.size.toLong(), "content/${data.size}-${hexOf(sum)}", b64(sum), old?.created ?: stamp, stamp, base + name) to data + } + val names = added.map { it.first.localName.lowercase() }.toSet() + val next = Manifest(current.lineage, current.files.filter { EaSaveRules.normalize(it.localName).lowercase() !in names } + added.map { it.first }, current.snapshots) + val xml = write(next).toByteArray() + val xmlMd5 = b64(md5(xml)) + val requests = added.map { Request("PUT", it.first.href, it.first.md5, "application/octet-stream") } + Request("PUT", "manifest.xml", xmlMd5, "text/xml") + val signed = authorize(lock, requests) + for ((i, pair) in added.withIndex()) upload(signed[i], pair.second) + upload(signed.last(), xml) + found = true + for ((entry, _) in added) { + val name = entry.localName.substring(base.length) + committed[name] = CloudFile(name, parseTime(entry.modified), hex(entry.md5), readLink = entry.href) + } + listed = null + files.mapValues { (name, _) -> modifiedMs[name]?.takeIf { it > 0 } ?: now } + } + } + + private fun pick(): Manifest? { + for (candidate in keys) { + val manifest = locked("read", candidate, missing = { null }) { _, body -> manifestUrl(body)?.let { fetchManifest(it) } } + if (manifest != null) { + key = candidate + found = true + return manifest + } + } + key = keys.first() + found = false + return null + } + + private fun upload(signed: Signed, data: ByteArray) { + val reply = EaHttp.request(signed.url, "PUT", signed.headers, data) + check(reply.ok) { "EA cloud save upload answered ${reply.status}" } + } + + private fun fetchManifest(url: String): Manifest? { + val reply = EaHttp.request(url) + if (reply.status == 404) return null + check(reply.ok) { "EA cloud save manifest answered ${reply.status}" } + return parse(reply.text) + } + + private fun locked(kind: String, key: String, missing: (() -> T)? = null, body: (String, String) -> T): T { + val reply = EaHttp.request("$HOST/lock/$kind/$uid/$key", "POST", mapOf(AUTH to token, "Content-Type" to "application/xml"), ByteArray(0)) + if (reply.status == 404 && missing != null) return missing() + check(reply.ok) { "EA cloud saves answered ${reply.status}" } + val lock = reply.header(LOCK) ?: error("EA did not grant a cloud save lock") + try { + return body(lock, reply.text) + } finally { + runCatching { EaHttp.request("$HOST/lock/delete/$uid", "DELETE", mapOf(AUTH to token, LOCK to lock)) } + } + } + + private fun authorize(lock: String, requests: List): List { + val body = buildString { + append("") + for ((i, r) in requests.withIndex()) { + append("").append(r.verb).append("").append(escape(r.resource)).append("") + r.md5?.let { append("").append(it).append("") } + r.type?.let { append("").append(it).append("") } + append("") + } + append("") + } + val reply = EaHttp.request("$HOST/lock/authorize/$uid", "PUT", mapOf(AUTH to token, LOCK to lock, "Content-Type" to "application/xml"), body.toByteArray()) + check(reply.ok) { "EA cloud saves refused the transfer (${reply.status})" } + return signedRequests(reply.text, requests.size) + } + + companion object { + private const val HOST = "https://cloudsync.juno.ea.com" + private const val AUTH = "X-Origin-AuthToken" + private const val LOCK = "X-Origin-Sync-Lock" + private val REQUEST = Regex("]*\\bid=\"(\\d+)\"[^>]*>(.*?)", RegexOption.DOT_MATCHES_ALL) + private val HEADER = Regex("]*)/?>") + + fun keys(masterTitleId: String, multiplayerId: String): List = + if (multiplayerId.isNotEmpty()) listOf("${masterTitleId}_$multiplayerId") else listOf(masterTitleId, "${masterTitleId}_$masterTitleId") + + fun manifestUrl(lockBody: String): String? = Regex("([^<]+)").find(lockBody)?.groupValues?.get(1)?.let(::unescape) + + fun parse(xml: String): Manifest { + val p = Xml.newPullParser().apply { setInput(StringReader(xml)) } + var root: String? = null + var lineage: String? = null + var depth = 0 + var closed = false + val files = ArrayList() + val snapshots = ArrayList() + var file: Array? = null + var local: Entry? = null + runCatching { + while (p.next() != XmlPullParser.END_DOCUMENT) when (p.eventType) { + XmlPullParser.START_TAG -> { + depth++ + val at = { name: String -> p.getAttributeValue(null, name).orEmpty() } + when { + root == null -> { root = p.name; lineage = p.getAttributeValue(null, "lineage") } + depth == 2 && p.name == "file" -> { file = arrayOf(at("size"), at("href"), at("md5")); local = null } + depth == 3 && p.name == "localName" && file != null -> { + val f = file!! + val created = at("created") + val modified = at("lastModified") + local = Entry(f[0].toLongOrNull() ?: 0, f[1], f[2], created, modified, p.nextText()) + depth-- + } + depth == 2 && p.name == "snapshot" -> { snapshots += p.nextText(); depth-- } + } + } + XmlPullParser.END_TAG -> { + if (depth == 2 && p.name == "file") { local?.let(files::add); file = null } + depth-- + if (depth == 0) closed = true + } + } + }.onFailure { error("EA sent an incomplete cloud save manifest") } + check(root == "manifest" && depth == 0 && closed) { "EA sent an incomplete cloud save manifest" } + return Manifest(lineage ?: "{00000000-0000-0000-0000-000000000000}", files, snapshots) + } + + fun write(m: Manifest): String = buildString { + append("\n") + for (f in m.files) { + append(" \n") + append(" ") + append(escape(f.localName)).append("\n \n") + } + for (s in m.snapshots) append(" ").append(escape(s)).append("\n") + append("\n") + } + + private fun signedRequests(xml: String, count: Int): List { + val byId = REQUEST.findAll(xml).associate { m -> + val inner = m.groupValues[2] + val url = Regex("([^<]+)").find(inner)?.groupValues?.get(1)?.let(::unescape) ?: error("EA sent no transfer URL") + val headers = HEADER.findAll(inner).mapNotNull { h -> + val k = attr(h.groupValues[1], "key") ?: return@mapNotNull null + k to (attr(h.groupValues[1], "value") ?: "") + }.toMap() + m.groupValues[1].toInt() to Signed(url, headers) + } + return (0 until count).map { byId[it] ?: error("EA signed ${byId.size} of $count cloud save transfers") } + } + + fun stamp(ms: Long): String = Instant.ofEpochMilli(ms / 1000 * 1000).toString() + "Z" + + fun parseTime(s: String): Long = runCatching { Instant.parse(s.trimEnd('Z') + "Z").toEpochMilli() }.getOrDefault(-1L) + + private fun attr(attrs: String, name: String): String? = Regex("\\b$name=\"([^\"]*)\"").find(attrs)?.groupValues?.get(1)?.let(::unescape) + + private fun md5(data: ByteArray) = MessageDigest.getInstance("MD5").digest(data) + + private fun b64(sum: ByteArray) = Base64.encodeToString(sum, Base64.NO_WRAP) + + private fun hexOf(sum: ByteArray) = sum.joinToString("") { "%02x".format(it) } + + fun hex(b64: String): String? = runCatching { hexOf(Base64.decode(b64, Base64.DEFAULT)) }.getOrNull()?.takeIf { it.length == 32 } + + private fun escape(s: String) = s.replace("&", "&").replace("<", "<").replace(">", ">").replace("\"", """) + + private fun unescape(s: String) = EaSaveRules.unescape(s) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt new file mode 100644 index 0000000000..b103473eb8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ea/EaSaveRules.kt @@ -0,0 +1,84 @@ +package com.droiddeck.launcher.stores.ea + +internal class EaSaveRules(private val rules: List>) { + val includes get() = rules.filter { it.first }.map { it.second } + val excludes get() = rules.filterNot { it.first }.map { it.second } + + fun base(): String? { + val dirs = includes.filterNot(::bare).map { pattern -> + val wild = pattern.indexOfFirst { it == '*' || it == '?' } + val fixed = if (wild < 0) pattern else pattern.substring(0, wild) + if (fixed.endsWith('/')) fixed else fixed.substringBeforeLast('/', "") + "/" + } + val parts = dirs.map { it.trimEnd('/').split('/') } + if (parts.isEmpty()) return null + val common = ArrayList() + for (i in parts.minOf { it.size }.let { 0 until it }) { + val seg = parts[0][i] + if (parts.all { it[i].equals(seg, ignoreCase = true) }) common += seg else break + } + if (common.isEmpty() || !VARIABLE.matches(common[0])) return null + return common.joinToString("/") + "/" + } + + fun matches(path: String): Boolean { + val p = normalize(path) + val inside = base()?.let { p.startsWith(it, ignoreCase = true) } ?: false + return rules.firstOrNull { (_, pattern) -> if (bare(pattern)) inside && hit(pattern, p.substringAfterLast('/')) else hit(pattern, p) }?.first ?: false + } + + private fun bare(pattern: String) = !pattern.startsWith('%') && '/' !in pattern + + private fun hit(pattern: String, path: String): Boolean = when { + pattern.endsWith('/') -> path.startsWith(pattern, ignoreCase = true) + pattern.any { it == '*' || it == '?' } -> glob(pattern).matches(path) + else -> path.equals(pattern, ignoreCase = true) + } + + private fun glob(pattern: String): Regex = Regex( + pattern.split('*').joinToString("[^/]*") { part -> part.split('?').joinToString("[^/]") { Regex.escape(it) } }, + RegexOption.IGNORE_CASE, + ) + + companion object { + private val VARIABLE = Regex("%[A-Za-z]+%") + private val RULE = Regex("<(include|exclude)\\b([^>]*)>([^<]*)", RegexOption.IGNORE_CASE) + private val ORDER = Regex("\\border\\s*=\\s*[\"']?(\\d+)") + private val TOKENS = mapOf( + "documents" to "%DOCUMENTS%", "savedgames" to "%SAVED_GAMES%", "appdata" to "%APPDATA%", + "localappdata" to "%LOCALAPPDATA%", "programdata" to "%PROGRAMDATA%", "userprofile" to "%USERPROFILE%", + "locallowappdata" to "%APPLICATION_DATA_LOCAL_LOW%", "installdir" to "%INSTALL%", + ) + + private val COMMENT = Regex("", RegexOption.DOT_MATCHES_ALL) + private val ENTITY = Regex("&(#x[0-9a-fA-F]+|#[0-9]+|lt|gt|quot|apos|amp);") + + fun normalize(path: String) = path.replace('\\', '/') + + fun parse(xml: String): EaSaveRules? { + val rules = RULE.findAll(COMMENT.replace(xml, "")).mapIndexed { index, rule -> + val order = ORDER.find(rule.groupValues[2])?.groupValues?.get(1)?.toIntOrNull() ?: index + Triple(order, rule.groupValues[1].equals("include", true), normalize(unescape(rule.groupValues[3]).trim())) + }.filter { it.third.isNotEmpty() }.sortedBy { it.first }.map { it.second to it.third }.toList() + if (rules.none { it.first }) return null + return EaSaveRules(rules) + } + + fun template(base: String): String? { + val variable = VARIABLE.find(base)?.takeIf { it.range.first == 0 } ?: return null + val token = TOKENS[variable.value.trim('%').lowercase()] ?: return null + return token + base.substring(variable.value.length) + } + + fun unescape(s: String): String = ENTITY.replace(s) { m -> + when (val e = m.groupValues[1]) { + "lt" -> "<" + "gt" -> ">" + "quot" -> "\"" + "apos" -> "'" + "amp" -> "&" + else -> runCatching { String(Character.toChars(if (e.startsWith("#x")) e.substring(2).toInt(16) else e.substring(1).toInt())) }.getOrDefault(m.value) + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt index d11fde4210..06075ca15d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftActivation.kt @@ -15,23 +15,44 @@ object UbisoftActivation { private const val POLL_MS = 250L private const val IDLE_MS = 60_000L private val watching = HashMap() + private val owners = HashMap() + + private const val INVALIDATE = "denuvo-invalidate" fun bridge(context: Context, product: Long) = File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/ubisoft/bridge-$product") /** Starts answering the product's activations; stale requests are cleared before this returns. */ - fun watch(app: Context, product: Long) { + fun watch(app: Context, product: Long, owner: String?) { val dir = bridge(app, product) synchronized(watching) { val running = watching.containsKey(product) watching[product] = System.currentTimeMillis() + if (owner.isNullOrEmpty()) owners.remove(product) else owners[product] = owner if (running) return dir.mkdirs() - dir.listFiles()?.forEach { it.delete() } + dir.listFiles()?.forEach { if (it.name != INVALIDATE) it.delete() } } Thread({ var idleSince = 0L while (true) { - runCatching { dir.listFiles { f -> f.name.startsWith("denuvo-") && f.name.endsWith(".req") }?.forEach { answer(app, product, it) } } + runCatching { + val marker = File(dir, INVALIDATE) + val (owner, requests) = synchronized(watching) { + owners[product] to dir.listFiles { f -> f.name.startsWith("denuvo-") && f.name.endsWith(".req") }.orEmpty() + } + if (marker.exists()) { + val named = runCatching { marker.readText().trim() }.getOrNull()?.takeIf { it.isNotEmpty() } + val issuer = named ?: owner + if (invalidate(app, product, issuer)) marker.delete() + else if (named == null && issuer != null) runCatching { + val part = File(dir, "$INVALIDATE.part") + part.writeText(issuer) + check(part.renameTo(marker)) + } + } + val pending = marker.exists() + requests.forEach { answer(app, product, it, owner, pending) } + } .onFailure { StoresState.logLine("Ubisoft: activation for $product: ${it.javaClass.simpleName}") } val now = System.currentTimeMillis() if (SessionState.running) idleSince = 0L @@ -44,18 +65,31 @@ object UbisoftActivation { }, "ubisoft-activation-$product").start() } - private fun answer(app: Context, product: Long, request: File) { + private fun answer(app: Context, product: Long, request: File, owner: String?, pending: Boolean) { val challenge = runCatching { request.readBytes() }.getOrNull() ?: return request.delete() - val reply = File(request.parentFile, request.name.removeSuffix(".req") + ".rsp") - val token = activate(app, product, challenge) + val reply = File(request.parentFile, request.name.removeSuffix(".req").removeSuffix(".cache") + ".rsp") + val token = activate(app, product, challenge, owner, cached = request.name.endsWith(".cache.req") && !pending) val part = File(reply.path + ".part") part.writeBytes(token ?: ByteArray(0)) part.renameTo(reply) } - private fun activate(app: Context, product: Long, challenge: ByteArray): ByteArray? { + private fun invalidate(app: Context, product: Long, owner: String?): Boolean { + val user = owner ?: return false + val gone = TokenCache(cacheDir(app)).drop(user, product) + if (gone) StoresState.logLine("Ubisoft: activation for $product: kept game token dropped") + return gone + } + + private fun activate(app: Context, product: Long, challenge: ByteArray, owner: String?, cached: Boolean): ByteArray? { val s = UbisoftAuth.current(app) ?: return null.also { StoresState.logLine("Ubisoft: activation for $product: signed out") } + if (owner == null || s.userId != owner) return null.also { StoresState.logLine("Ubisoft: activation for $product: the signed-in account changed") } + val cache = TokenCache(cacheDir(app)) + if (cached) cache.get(s.userId, product)?.let { + StoresState.logLine("Ubisoft: activation for $product: kept ${it.size} B game token") + return it + } val answer = UbisoftNative.call("denuvo", JSONObject().put("ticket", s.ticket).put("sessionId", s.sessionId) .put("productId", product).put("challenge", hex(challenge))) answer?.optString("error")?.takeIf { it.isNotEmpty() }?.let { @@ -64,9 +98,28 @@ object UbisoftActivation { } val token = answer?.optString("token")?.takeIf { it.isNotEmpty() }?.let(::unhex) StoresState.logLine("Ubisoft: activation for $product: ${token?.size ?: 0} B game token") + if (token != null && !cache.put(s.userId, product, token)) StoresState.logLine("Ubisoft: activation for $product: game token not kept") return token } + private fun cacheDir(app: Context) = File(app.filesDir, "ubisoft/denuvo") + + internal class TokenCache(private val dir: File) { + private fun file(user: String, product: Long) = File(dir, "${user.filter { it.isLetterOrDigit() || it == '-' }}-$product.token") + + fun get(user: String, product: Long): ByteArray? = runCatching { file(user, product).readBytes() }.getOrNull()?.takeIf { it.isNotEmpty() } + + fun put(user: String, product: Long, token: ByteArray): Boolean = runCatching { + dir.mkdirs() + val target = file(user, product) + val part = File(target.path + ".part") + part.writeBytes(token) + check(part.renameTo(target)) + }.isSuccess + + fun drop(user: String, product: Long): Boolean = file(user, product).let { it.delete() || !it.exists() } + } + internal fun hex(b: ByteArray): String = b.joinToString("") { "%02x".format(it) } internal fun unhex(s: String): ByteArray? = diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt new file mode 100644 index 0000000000..26001da37a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftCloud.kt @@ -0,0 +1,220 @@ +package com.droiddeck.launcher.stores.ubisoft + +import android.os.Build +import android.util.Base64 +import com.droiddeck.launcher.stores.CloudChanged +import com.droiddeck.launcher.stores.CloudFile +import com.droiddeck.launcher.stores.CloudTransport +import org.json.JSONArray +import org.json.JSONObject +import java.io.ByteArrayOutputStream +import java.net.HttpURLConnection +import java.net.URL +import java.security.MessageDigest +import java.time.Instant +import java.util.zip.Deflater +import java.util.zip.Inflater + +internal interface UbisoftSlots { + fun entity(): UbisoftCloud.Entity? + fun upload(slot: String, data: ByteArray) + fun update(entity: UbisoftCloud.Entity, slots: JSONArray) + fun download(slot: String): ByteArray? +} + +internal class UbisoftCloud(private val session: UbisoftAuth.Session, val product: Long) : UbisoftSlots { + class Slot(val id: Int, val filename: String, val hash: String, val size: Long, val modifiedMs: Long) + + class Entity(val json: JSONObject) { + val id: String get() = json.optString("entityId") + val revision: Int get() = json.optInt("revision") + val slots: List get() { + val list = json.optJSONObject("obj")?.optJSONArray("slots") ?: JSONArray() + return (0 until list.length()).mapNotNull { list.optJSONObject(it) }.map { + Slot(it.optInt("id"), it.optString("filename"), it.optString("hash"), it.optLong("size"), UbisoftAuth.parseTime(it.optString("lastModified"))) + } + } + } + + private val authorization get() = "ubi_v1 t=${session.ticket}" + + override fun entity(): Entity? { + val url = "https://public-ubiservices.ubi.com/v1/profiles/${session.profileId}/entities?name=${entityName(product)}" + val reply = UbisoftAuth.request(url, authorization = authorization, sessionId = session.sessionId) + check(reply.ok) { "Ubisoft cloud saves answered ${reply.status}" } + val list = JSONObject(reply.body).optJSONArray("entities") ?: return null + return (0 until list.length()).mapNotNull { list.optJSONObject(it) }.firstOrNull { it.optString("name") == entityName(product) }?.let(::Entity) + } + + override fun upload(slot: String, data: ByteArray) { + val packed = deflate(data) + val md5 = Base64.encodeToString(MessageDigest.getInstance("MD5").digest(packed), Base64.NO_WRAP) + val signed = signed("put", JSONArray().put(JSONObject().put("name", slot).put("size", packed.size).put("md5", md5))).single() + val c = URL(signed.getString("url")).openConnection() as HttpURLConnection + c.connectTimeout = 15_000 + c.readTimeout = 60_000 + c.requestMethod = "PUT" + c.doOutput = true + c.setFixedLengthStreamingMode(packed.size) + c.setRequestProperty("Content-MD5", md5) + try { + c.outputStream.use { it.write(packed) } + check(c.responseCode in 200..299) { "Ubisoft cloud save upload answered ${c.responseCode}" } + } finally { + c.disconnect() + } + } + + override fun update(entity: Entity, slots: JSONArray) { + val obj = JSONObject(entity.json.optJSONObject("obj")?.toString() ?: "{}") + .put("slots", slots).put("timestamp", (System.currentTimeMillis() / 1000).toString()).put("pc_name", Build.MODEL ?: "Android") + val body = JSONObject().put("revision", entity.revision).put("name", entity.json.optString("name")).put("type", "cloudSave") + .put("spaceId", entity.json.optString("spaceId")).put("tags", entity.json.optJSONArray("tags") ?: JSONArray()).put("obj", obj) + val reply = UbisoftAuth.request("https://public-ubiservices.ubi.com/v1/profiles/entities/${entity.id}", "PUT", + authorization, session.sessionId, body.toString()) + check(reply.ok) { "Ubisoft cloud save record answered ${reply.status}" } + } + + override fun download(slot: String): ByteArray? { + val signed = signed("get", JSONArray().put(JSONObject().put("name", slot))).single() + val c = URL(signed.getString("url")).openConnection() as HttpURLConnection + c.connectTimeout = 15_000 + c.readTimeout = 60_000 + return try { + when (c.responseCode) { + 404 -> null + in 200..299 -> c.inputStream.use(::inflate) + else -> error("Ubisoft cloud save download answered ${c.responseCode}") + } + } finally { + c.disconnect() + } + } + + private fun signed(method: String, items: JSONArray): List { + val answer = UbisoftNative.call("cloud-urls", JSONObject().put("ticket", session.ticket).put("sessionId", session.sessionId) + .put("productId", product).put("method", method).put("items", items)) ?: error("Ubisoft cloud saves are unavailable") + answer.optString("error").takeIf { it.isNotEmpty() }?.let { error(it) } + val requests = answer.getJSONArray("requests") + return (0 until requests.length()).map { requests.getJSONObject(it) } + } + + companion object { + private const val MAX_SAVE = 256L * 1024 * 1024 + + fun entityName(product: Long) = "upcCloudSaveUplayId_$product" + + private val MARK = Regex("[0-9a-f]{32}") + + internal fun freshMark(): String = java.util.UUID.randomUUID().toString().replace("-", "") + + internal fun mark(save: ByteArray): String? = + if (save.size < 40) null else String(save, 8, 32, Charsets.ISO_8859_1).takeIf { MARK.matches(it) } + + internal fun deflate(data: ByteArray): ByteArray { + val deflater = Deflater(Deflater.BEST_COMPRESSION) + deflater.setInput(data) + deflater.finish() + val out = ByteArrayOutputStream(data.size / 2 + 64) + val buffer = ByteArray(64 * 1024) + try { + while (!deflater.finished()) out.write(buffer, 0, deflater.deflate(buffer)) + } finally { + deflater.end() + } + return out.toByteArray() + } + + internal fun inflate(data: ByteArray): ByteArray = inflate(data.inputStream()) + + internal fun inflate(input: java.io.InputStream): ByteArray { + val inflater = Inflater() + val out = ByteArrayOutputStream(64 * 1024) + val buffer = ByteArray(64 * 1024) + val chunk = ByteArray(64 * 1024) + try { + while (!inflater.finished()) { + if (inflater.needsInput()) { + val read = input.read(chunk) + if (read < 0) error("Ubisoft cloud save is truncated") + inflater.setInput(chunk, 0, read) + continue + } + if (inflater.needsDictionary()) error("Ubisoft cloud save is truncated") + val n = inflater.inflate(buffer) + check(out.size().toLong() + n <= MAX_SAVE) { "Ubisoft cloud save is too large" } + out.write(buffer, 0, n) + } + } finally { + inflater.end() + } + return out.toByteArray() + } + + internal fun version(slot: Slot): String = "${slot.size}:${slot.modifiedMs}:${slot.hash}" + } +} + +internal class UbisoftCloudTransport(private val cloud: UbisoftSlots, val user: String) : CloudTransport { + private var listed: UbisoftCloud.Entity? = null + private val committed = HashMap() + + override val contentDigests: Boolean get() = false + + override fun committed(name: String): CloudFile? = committed[name] + + override fun wants(name: String): Boolean = name.endsWith(SUFFIX) && !name.contains('/') + + override fun list(): List { + val entity = cloud.entity() + listed = entity + return entity?.slots.orEmpty().map { CloudFile(it.filename + SUFFIX, it.modifiedMs, UbisoftCloud.version(it)) } + } + + override fun get(file: CloudFile): Pair { + val data = cloud.download(file.name.removeSuffix(SUFFIX)) ?: error("Ubisoft has no data for ${file.name}") + return data to file.modifiedMs + } + + override fun put(files: Map, modifiedMs: Map): Map { + var expected = listed ?: cloud.entity() ?: error("Ubisoft has no cloud save record for this game yet; play it once in Ubisoft Connect") + val marks = files.mapValues { (name, data) -> + check(name.endsWith(SUFFIX) && !name.contains('/')) { "$name is not a Ubisoft save slot" } + UbisoftCloud.mark(data) ?: error("$name has no save identifier for Ubisoft Connect") + } + val sent = LinkedHashMap() + try { + for ((name, data) in files) { + val slot = name.removeSuffix(SUFFIX) + val live = cloud.entity() ?: error("Ubisoft's cloud save record disappeared") + if (live.revision != expected.revision) throw CloudChanged(sent, files.keys.filter { it !in sent }) + val now = System.currentTimeMillis() + cloud.upload(slot, data) + val slots = JSONArray(live.json.optJSONObject("obj")?.optJSONArray("slots")?.toString() ?: "[]") + val entry = (0 until slots.length()).map { slots.getJSONObject(it) }.firstOrNull { it.optString("filename") == slot } + ?: JSONObject().put("filename", slot).also { if (slot.toIntOrNull() != null) it.put("id", slot.toInt()); slots.put(it) } + entry.put("hash", marks.getValue(name)).put("size", data.size).put("lastModified", Instant.ofEpochMilli(now).toString()) + cloud.update(live, slots) + val after = cloud.entity() + val mine = after?.let { committedSlot(live, it, slot, marks.getValue(name), data.size.toLong()) } + ?: throw CloudChanged(sent, files.keys.filter { it !in sent }) + sent[name] = now + committed[name] = CloudFile(name, mine.modifiedMs, UbisoftCloud.version(mine)) + expected = after + } + } finally { + listed = null + } + return sent + } + + companion object { + const val SUFFIX = ".save" + + internal fun committedSlot(before: UbisoftCloud.Entity, after: UbisoftCloud.Entity, filename: String, hash: String, size: Long): UbisoftCloud.Slot? { + fun others(e: UbisoftCloud.Entity) = e.slots.filter { it.filename != filename }.associate { it.filename to UbisoftCloud.version(it) } + if (others(before) != others(after)) return null + return after.slots.firstOrNull { it.filename == filename && it.hash == hash && it.size == size } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt index 279d3b3e43..4f284f77b4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftLaunch.kt @@ -58,7 +58,7 @@ object UbisoftLaunch { } } ?: cached setup?.let { StoresState.logLine("Ubisoft: setup for $product: ${it.toString().take(1500)}") } - UbisoftActivation.watch(app, product) + UbisoftActivation.watch(app, product, s.userId) return JSONObject().put("ok", true) .put("productId", product) .put("ticket", native.optString("ticket")) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index a276eb91e5..ab0a80940b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -82,6 +82,12 @@ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.lau r.files == 0 -> context.getString(R.string.cloud_up_to_date) else -> context.getString(R.string.cloud_done, r.files) } + "partial" -> when { + r.conflicts > 0 && r.detail.isNotEmpty() -> context.getString(R.string.cloud_conflict_files_detail, r.conflicts, r.detail) + r.conflicts > 0 -> context.getString(R.string.cloud_conflict_files, r.conflicts) + r.detail.isNotEmpty() -> context.getString(R.string.cloud_partial, r.detail) + else -> context.getString(R.string.cloud_not_synced) + } "skipped" -> context.getString(when (r.reason) { "not-signed-in" -> R.string.cloud_signed_out "no-cloud-saves" -> R.string.cloud_none diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index b99a4331bb..edd95faab4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -258,7 +258,7 @@ internal fun GameDetail( stringResource(R.string.game_tab_achievements_count, stringResource(R.string.achievements_title), achievementState.done, list.size) } ?: stringResource(R.string.achievements_title) GameTab.LAUNCH -> stringResource(R.string.game_tab_launch) - GameTab.SAVES -> stringResource(if (Store.byId(source).let { it == Store.GOG || it == Store.EPIC }) R.string.game_tab_saves_cloud else R.string.games_saves) + GameTab.SAVES -> stringResource(if (CloudSaves.supports(Store.byId(source))) R.string.game_tab_saves_cloud else R.string.games_saves) GameTab.ADDONS -> stringResource(R.string.game_tab_addons) GameTab.INSTALL -> stringResource(R.string.game_tab_install) } @@ -892,8 +892,10 @@ private fun ShortcutFields(game: Library.SteamGame, folder: File) { @Composable private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { - val saves by produceState?>(null, g.gameId) { - value = withContext(Dispatchers.IO) { runCatching { GameSaves.locate(prefix, g) }.getOrDefault(emptyList()) } + val context = LocalContext.current.applicationContext + var synced by remember(g.gameId) { mutableStateOf(0) } + val saves by produceState?>(null, g.gameId, synced) { + value = withContext(Dispatchers.IO) { runCatching { GameSaves.saves(context, prefix, g) }.getOrDefault(emptyList()) } } val found = saves val summary = when { @@ -911,9 +913,9 @@ private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { } Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { Text(summary, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(bottom = 6.dp).readable().padding(4.dp)) - if (Store.byId(g.source).let { it == Store.GOG || it == Store.EPIC }) { + if (CloudSaves.supports(Store.byId(g.source))) { SectionLabel(stringResource(R.string.store_cloud_saves)) - CloudRows(g) + CloudRows(g) { synced++ } SectionLabel(stringResource(R.string.games_saves)) } MenuItem(stringResource(R.string.games_import_saves), checked = false) { a.onSaveImport(g) } @@ -969,14 +971,16 @@ private fun AddonRow(name: String, target: WowAddons.Target, a: FrontEndActions) } @Composable -private fun CloudRows(g: Library.SteamGame) { - val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON && it != Store.EA } ?: return +private fun CloudRows(g: Library.SteamGame, onSynced: () -> Unit = {}) { + val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON } ?: return val id = g.storeId ?: return val context = LocalContext.current.applicationContext var busy by remember(g.gameId) { mutableStateOf(null) } var tick by remember(g.gameId) { mutableStateOf(0) } + var refreshing by remember(g.gameId) { mutableStateOf(false) } val status by produceState(null, g.gameId, tick) { value = withContext(Dispatchers.IO) { runCatching { CloudSaves.status(context, store, id) }.getOrNull() } + refreshing = false } val folder = g.gameFiles var enabled by remember(g.gameId) { mutableStateOf(folder?.let { StoreGameSidecar.read(it)?.cloud } ?: true) } @@ -988,7 +992,7 @@ private fun CloudRows(g: Library.SteamGame) { busy = if (up) "up" else "down" Thread({ val r = if (up) CloudSaves.upload(context, store, id, force) else CloudSaves.download(context, store, id, force) - StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } + StoresState.post { refreshing = true; busy = null; tick++; onSynced(); android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } }, "cloud-manual").start() } MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, @@ -1000,11 +1004,13 @@ private fun CloudRows(g: Library.SteamGame) { StoresState.post { enabled = written?.cloud ?: enabled } }, "cloud-switch").start() } - val ready = st != null && supported && enabled && busy == null + val ready = st != null && supported && enabled && busy == null && !refreshing && st.folder != null && st.signedIn val pending = stringResource(R.string.cloud_pending) val summary = when { st == null || busy != null -> pending !supported -> stringResource(R.string.cloud_none) + !st.signedIn || st.reason == "not-signed-in" -> stringResource(R.string.cloud_signed_out) + st.folder == null -> stringResource(R.string.cloud_not_synced) conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size) st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) else -> stringResource(R.string.cloud_never) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 44e51c682c..e697c0bb00 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2898,6 +2898,8 @@ Already up to date Sign in to the store to sync saves Saves were not synced + Some saves were not synced · %1$s + Cloud conflict · %1$d files · %2$s installed in your library store diff --git a/app/src/main/rust/stores/src/ubisoft/ffi.rs b/app/src/main/rust/stores/src/ubisoft/ffi.rs index 30df1ccd4f..9cfbb97801 100644 --- a/app/src/main/rust/stores/src/ubisoft/ffi.rs +++ b/app/src/main/rust/stores/src/ubisoft/ffi.rs @@ -75,6 +75,33 @@ fn denuvo(ticket: &str, session: &str, product: u32, challenge: &str) -> Result< }) } +fn cloud_urls(request: &serde_json::Value) -> Result { + let s = |k: &str| request.get(k).and_then(|v| v.as_str()).unwrap_or("").to_string(); + let product = request.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32; + let method = match s("method").as_str() { + "put" => super::service::CLOUD_PUT, + "get" => super::service::CLOUD_GET, + other => return Err(format!("unknown cloud save method {other}")), + }; + let items: Vec = request.get("items").and_then(|v| v.as_array()).ok_or("no items")?.iter().map(|i| super::service::CloudItem { + name: i.get("name").and_then(|v| v.as_str()).unwrap_or("").to_string(), + size: i.get("size").and_then(|v| v.as_u64()).unwrap_or(0), + md5_base64: i.get("md5").and_then(|v| v.as_str()).unwrap_or("").to_string(), + }).collect(); + if items.is_empty() || items.iter().any(|i| i.name.is_empty()) { + return Err("cloud save items need names".into()); + } + let (ticket, session) = (s("ticket"), s("sessionId")); + let rt = tokio::runtime::Builder::new_current_thread().enable_all().build().map_err(|e| e.to_string())?; + rt.block_on(async { + let mut d = super::demux::Demux::connect(&ticket).await?; + let (mut ownership, _) = super::service::Ownership::open(&mut d, &ticket, &session).await?; + let token = ownership.token(&mut d, product).await?; + let signed = super::service::cloudsave_urls(&mut d, &token, product, method, &items).await?; + Ok(json!({ "requests": signed.iter().map(|r| json!({ "url": r.url, "header": r.header })).collect::>() })) + }) +} + fn call(op: &str, request: &str) -> String { let parsed: serde_json::Value = serde_json::from_str(request).unwrap_or(serde_json::Value::Null); let s = |k: &str| parsed.get(k).and_then(|v| v.as_str()).unwrap_or("").to_string(); @@ -86,6 +113,7 @@ fn call(op: &str, request: &str) -> String { .and_then(|r| install::chunks(&r)) .map(|m| json!({ "chunks": install::chunks_json(&m.chunks), "setup": install::setup_json(&m) })) .unwrap_or_else(|e| json!({ "error": e })), + "cloud-urls" => cloud_urls(&parsed).unwrap_or_else(|e| json!({ "error": e })), "launch" => launch(&s("ticket"), &s("sessionId"), parsed.get("productId").and_then(|v| v.as_u64()).unwrap_or(0) as u32) .unwrap_or_else(|e| json!({ "error": e })), _ => json!({ "error": format!("unknown operation {op}") }), diff --git a/app/src/main/rust/stores/src/ubisoft/service.rs b/app/src/main/rust/stores/src/ubisoft/service.rs index bfdddc29a9..de8e724d09 100644 --- a/app/src/main/rust/stores/src/ubisoft/service.rs +++ b/app/src/main/rust/stores/src/ubisoft/service.rs @@ -204,3 +204,48 @@ pub async fn denuvo_token(d: &mut Demux, ownership_token: &str, challenge: &[u8] let t = pb::fields(pb::sub(&rsp, 3).ok_or("no game token answer")?)?; pb::sub(&t, 1).filter(|b| !b.is_empty()).map(<[u8]>::to_vec).ok_or_else(|| "Ubisoft sent an empty game token".into()) } + +pub struct CloudItem { + pub name: String, + pub size: u64, + pub md5_base64: String, +} + +pub struct SignedRequest { + pub header: String, + pub url: String, +} + +pub const CLOUD_PUT: u64 = 1; +pub const CLOUD_GET: u64 = 2; + +pub async fn cloudsave_urls(d: &mut Demux, ownership_token: &str, product_id: u32, method: u64, items: &[CloudItem]) -> Result, String> { + let conn = d.open("cloudsave_service").await?; + let mut req = Msg::new().text(1, ownership_token).uint(2, product_id as u64).uint(3, method); + for item in items { + let mut entry = Msg::new().text(1, &item.name); + if method == CLOUD_PUT { + entry = entry.msg(2, Msg::new().uint(1, item.size).text(2, &item.md5_base64)); + } + req = req.msg(4, entry); + } + let raw = d.call(conn, Msg::new().msg(1, Msg::new().uint(1, 1).msg(2, req))).await?; + let rsp = pb::fields(pb::sub(&pb::fields(&raw)?, 1).ok_or("no cloud save answer")?)?; + let urls = pb::fields(pb::sub(&rsp, 2).ok_or("no cloud save URLs")?)?; + let status = pb::num(&urls, 1).unwrap_or(0); + if status != 1 { + return Err(format!("Ubisoft's cloud save service refused the request (status {status})")); + } + let mut out = Vec::new(); + for r in pb::subs(&urls, 2) { + let r = pb::fields(r)?; + out.push(SignedRequest { + header: pb::string(&r, 1).unwrap_or_default(), + url: pb::string(&r, 2).ok_or("cloud save URL missing")?, + }); + } + if out.len() != items.len() { + return Err(format!("Ubisoft signed {} of {} cloud save requests", out.len(), items.len())); + } + Ok(out) +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt index 9f1dcd2b0d..f3944a8034 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.stores +import com.droiddeck.launcher.stores.ubisoft.MemorySlots +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloud +import com.droiddeck.launcher.stores.ubisoft.UbisoftCloudTransport import java.io.File import java.util.concurrent.Executor import org.junit.Assert.assertArrayEquals @@ -20,10 +23,18 @@ class CloudSavesTest { private class Memory : CloudTransport { val files = HashMap>() val puts = ArrayList() + var onGet: (CloudFile) -> Unit = {} + var raceAfter = Int.MAX_VALUE override fun list() = files.map { (k, v) -> CloudFile(k, v.second, CloudSaves.md5(v.first)) } - override fun get(file: CloudFile) = files.getValue(file.name) - override fun put(files: Map, modifiedMs: Map): Map = - files.mapValues { (k, v) -> puts += k; this.files[k] = v to 99_000L; 99_000L } + override fun get(file: CloudFile) = files.getValue(file.name).also { onGet(file) } + override fun put(files: Map, modifiedMs: Map): Map { + val sent = LinkedHashMap() + for ((k, v) in files) { + if (sent.size >= raceAfter) throw CloudChanged(sent, files.keys.filter { it !in sent }) + puts += k; this.files[k] = v to 99_000L; sent[k] = 99_000L + } + return sent + } } private fun dir() = File(app.filesDir, "saves-${System.nanoTime()}").apply { mkdirs() } @@ -50,6 +61,72 @@ class CloudSavesTest { assertEquals("v1", File(kept, "slot0.sav").readText()) } + @Test fun aFolderAliasNeverHidesTheRealSaveFromARestore() { + val game = id; val dir = dir() + File(dir, "SaveData").mkdirs(); File(dir, "SaveData/slot.sav").writeText("local") + val link = runCatching { java.nio.file.Files.createSymbolicLink(File(dir, "Cache").toPath(), File(dir, "SaveData").toPath()) } + org.junit.Assume.assumeTrue(link.isSuccess) + val memory = Memory().apply { files["SaveData/slot.sav"] = "cloud".toByteArray() to 1000L } + val cloud = object : CloudTransport by memory { + override fun wants(name: String) = name.startsWith("SaveData/") + } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true) + assertEquals("cloud", File(dir, "SaveData/slot.sav").readText()) + val kept = File(app.filesDir, "stores/cloud-backups/gog-$game").listFiles { f -> f.name.startsWith("local-") }!!.single() + assertEquals("local", File(kept, "SaveData/slot.sav").readText()) + } + + @Test fun aSaveReachedOnlyThroughAFolderAliasStillGoesUp() { + val game = id; val dir = dir() + File(dir, "Actual").mkdirs(); File(dir, "Actual/slot.sav").writeText("played") + val link = runCatching { java.nio.file.Files.createSymbolicLink(File(dir, "SaveData").toPath(), File(dir, "Actual").toPath()) } + org.junit.Assume.assumeTrue(link.isSuccess) + java.nio.file.Files.createSymbolicLink(File(dir, "Actual/loop").toPath(), dir.toPath()) + val memory = Memory() + val cloud = object : CloudTransport by memory { + override fun wants(name: String) = name.startsWith("SaveData/") + } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + val r = CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("uploaded", r.reason) + assertEquals(listOf("SaveData/slot.sav"), memory.puts) + assertEquals("played", String(memory.files.getValue("SaveData/slot.sav").first)) + } + + @Test fun onlySelectedSavesCanCollideByCase() { + val names = listOf("Logs/A.txt", "Logs/a.txt", "SaveGame/1") + assertFalse(CloudSaves.caseCollision(names) { !it.startsWith("Logs/") }) + assertTrue(CloudSaves.caseCollision(names) { true }) + assertTrue(CloudSaves.caseCollision(listOf("SaveGame/1", "savegame/1")) { it.lowercase().startsWith("savegame/") }) + } + + @Test fun aSavedConflictWhoseSidesNowMatchIsCleared() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + cloud.files["slot0.sav"] = "v2".toByteArray() to 50_000L + File(dir, "slot0.sav").writeText("v2") + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav").apply() + assertEquals("up-to-date", CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false).reason) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav").apply() + CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + } + + @Test fun aDownloadTheLaunchStoppedWaitingForWritesNothing() { + val game = id; val dir = dir() + File(dir, "slot0.sav").writeText("local") + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true, claim = { false }) + assertEquals("skipped", r.result); assertEquals("launch-moved-on", r.reason) + assertEquals("local", File(dir, "slot0.sav").readText()) + assertFalse(File(app.filesDir, "stores/cloud-backups/gog-$game").exists()) + var claimed = 0 + assertEquals("ok", CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = true, claim = { claimed++; true }).result) + assertEquals(1, claimed); assertEquals("v1", File(dir, "slot0.sav").readText()) + } + @Test fun aFileChangedOnBothSidesIsLeftForTheUser() { val game = id; val dir = dir() val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } @@ -65,6 +142,134 @@ class CloudSavesTest { assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) } + @Test fun aSlotTheGameRewritesDuringADownloadIsKeptAndNamedAsAConflict() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + cloud.files["slot0.sav"] = "cloud v2".toByteArray() to 50_000L + cloud.onGet = { File(dir, "slot0.sav").writeText("game wrote") } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("changed-locally", r.reason); assertEquals(1, r.conflicts) + assertTrue(r.detail.contains("slot0.sav")) + assertEquals("game wrote", File(dir, "slot0.sav").readText()) + assertEquals(listOf("slot0.sav"), CloudSaves.conflicts(app, Store.GOG, game)) + } + + @Test fun aCloudNameOutsideTheSaveFolderIsBlockedNotAConflict() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["../escape.sav"] = "x".toByteArray() to 1000L } + val r = CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("blocked-path", r.reason); assertEquals(0, r.conflicts) + assertTrue(r.detail.contains("../escape.sav")) + assertFalse(File(dir.parentFile, "escape.sav").exists()) + assertTrue(CloudSaves.conflicts(app, Store.GOG, game).isEmpty()) + } + + @Test fun anUploadStoppedByANewerCloudWriteKeepsTheRestAsConflicts() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["a.sav"] = "a1".toByteArray() to 1000L; files["b.sav"] = "b1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + File(dir, "a.sav").writeText("a2"); File(dir, "b.sav").writeText("b2") + cloud.raceAfter = 1 + val r = CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = false) + assertEquals("partial", r.result); assertEquals("changed-in-cloud", r.reason); assertEquals(1, r.files) + val unsent = listOf("a.sav", "b.sav").single { it !in cloud.puts } + assertEquals(listOf(unsent), CloudSaves.conflicts(app, Store.GOG, game)) + } + + @Test fun aForcedUploadKeepsConflictsForSlotsItDidNotSend() { + val game = id; val dir = dir() + val cloud = Memory().apply { files["slot0.sav"] = "v1".toByteArray() to 1000L; files["slot1.sav"] = "w1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.GOG, game, dir, cloud, force = false) + File(dir, "slot0.sav").writeText("local v2"); File(dir, "slot1.sav").delete() + cloud.files["slot0.sav"] = "cloud v2".toByteArray() to 50_000L + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.sav\nslot1.sav").apply() + CloudSaves.upWith(app, Store.GOG, game, dir, cloud, force = true) + assertEquals("local v2", String(cloud.files.getValue("slot0.sav").first)) + assertEquals(listOf("slot1.sav"), CloudSaves.conflicts(app, Store.GOG, game)) + } + + private fun ubisoftDir(user: String, root: File = File(app.filesDir, "ubi-${System.nanoTime()}")) = File(root, "$user/77").apply { mkdirs() } + + @Test fun aSlotBothSidesSavedAlikeIsNotAConflictWhenTheCloudNamesOnlyAVersion() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + assertEquals("ok", CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false).result) + File(dir, "1.save").writeBytes(MemorySlots.save("a2")) + slots.store("1", MemorySlots.save("a2")) + val down = CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals(0, down.conflicts) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, dir).isEmpty()) + val up = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("up-to-date", up.reason); assertEquals(0, up.conflicts) + File(dir, "1.save").writeBytes(MemorySlots.save("a3 local")) + slots.store("1", MemorySlots.save("a3 cloud")) + assertEquals(1, CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false).conflicts) + } + + @Test fun aNewUbisoftSaveWithAnEmptyIdentifierIsStampedAndUploaded() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + File(dir, "2.save").writeBytes("UBISAVE0".toByteArray() + ByteArray(32) + "fresh slot".toByteArray()) + File(dir, "3.save").writeBytes("UBISAVE0".toByteArray() + "not-an-identifier-but-not-empty!".toByteArray()) + val up = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("uploaded", up.reason) + val stamped = UbisoftCloud.mark(File(dir, "2.save").readBytes()) + assertTrue(stamped != null) + assertEquals("fresh slot", String(File(dir, "2.save").readBytes().copyOfRange(40, 50))) + assertEquals(stamped, UbisoftCloud.mark(slots.data.getValue("2"))) + assertFalse("3" in slots.data) + assertEquals("not-an-identifier-but-not-empty!", String(File(dir, "3.save").readBytes().copyOfRange(8, 40))) + } + + @Test fun aSlotCommittedBeforeALaterOneFailsReachesTheBaseline() { + val game = id; val dir = ubisoftDir("u1") + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")); store("2", MemorySlots.save("b1")) } + CloudSaves.downWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + File(dir, "1.save").writeBytes(MemorySlots.save("a2")); File(dir, "2.save").writeBytes(MemorySlots.save("b2")) + slots.uploadsLeft = 1 + assertTrue(runCatching { CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) } + .exceptionOrNull() is java.io.IOException) + val base = CloudSaves.baseline(app, Store.UBISOFT, CloudSaves.scope(Store.UBISOFT, game, dir))!! + val sent = listOf("1", "2").single { slots.data.getValue(it).contentEquals(MemorySlots.save(if (it == "1") "a2" else "b2")) } + val kept = if (sent == "1") "2" else "1" + assertEquals(CloudSaves.md5(File(dir, "$sent.save")), base.getValue("$sent.save").localMd5) + assertEquals(CloudSaves.md5(MemorySlots.save(if (kept == "1") "a1" else "b1")), base.getValue("$kept.save").localMd5) + slots.uploadsLeft = Int.MAX_VALUE + val r = CloudSaves.upWith(app, Store.UBISOFT, game, dir, UbisoftCloudTransport(slots, "u1"), force = false) + assertEquals("ok", r.result); assertEquals(1, r.files); assertEquals(0, r.conflicts) + } + + @Test fun ubisoftConflictsBelongToTheAccountAndProductThatHadThem() { + val game = id; val root = File(app.filesDir, "ubi-${System.nanoTime()}") + val a = ubisoftDir("uA", root); val b = ubisoftDir("uB", root) + val cloudB = Memory().apply { files["slot0.save"] = "b1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.UBISOFT, game, b, cloudB, force = false) + File(b, "slot0.save").writeText("b local") + val cloudA = Memory().apply { files["slot0.save"] = "a1".toByteArray() to 1000L } + CloudSaves.downWith(app, Store.UBISOFT, game, a, cloudA, force = false) + File(a, "slot0.save").writeText("a local") + cloudA.files["slot0.save"] = "a2".toByteArray() to 50_000L + assertEquals(1, CloudSaves.downWith(app, Store.UBISOFT, game, a, cloudA, force = false).conflicts) + assertEquals(listOf("slot0.save"), CloudSaves.conflicts(app, Store.UBISOFT, game, a)) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, b).isEmpty()) + CloudSaves.downWith(app, Store.UBISOFT, game, b, cloudB, force = true) + assertEquals("b local", File(b, "slot0.save").readText()) + com.droiddeck.launcher.stores.epic.EpicPrefs.get(app).edit().putString("cloud_conflicts_$game", "slot0.save").apply() + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game, ubisoftDir("uC", root)).isEmpty()) + assertTrue(CloudSaves.conflicts(app, Store.UBISOFT, game).isEmpty()) + } + + @Test fun aUbisoftGameAddedFromAnotherFolderIsFoundForCloudSaves() { + val game = id + val folder = File(app.filesDir, "Elsewhere/Anno-$game").apply { mkdirs() } + File(folder, "Anno.exe").writeText("MZ") + StoreGameSidecar(Store.UBISOFT, game, "Anno", "Anno.exe", extra = mapOf("productId" to "77")).write(folder) + com.droiddeck.launcher.session.SessionPrefs.followStoreGame(app, "ubisoft:$game", folder.path) { true } + assertEquals("not-signed-in", CloudSaves.status(app, Store.UBISOFT, game).reason) + } + @Test fun aDirtyMarkStaysUntilAnUploadGoesThroughOrIsSkippedForGood() { val gameId = "1207664643" val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "ELDERBORN-mark").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt index b9deb11a11..2a3ed5ce63 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ea/EaTest.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.stores.ea import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.CloudSaves import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch @@ -413,4 +414,190 @@ class EaTest { assertTrue(!EaAuth.storeRefreshed(app, "late", 3600, "r3")) assertNull(EaAuth.load(app)) } + + private fun tokenServer(status: String, error: String = "invalid_grant"): java.net.ServerSocket { + val server = java.net.ServerSocket(0) + Thread { + runCatching { + server.accept().use { socket -> + val input = socket.getInputStream() + val head = StringBuilder() + while (!head.endsWith("\r\n\r\n")) head.append(input.read().takeIf { it >= 0 }?.toChar() ?: break) + val length = Regex("(?i)content-length: *(\\d+)").find(head)?.groupValues?.get(1)?.toInt() ?: 0 + repeat(length) { input.read() } + val body = """{"error":"$error"}""".toByteArray() + socket.getOutputStream().apply { + write("HTTP/1.1 $status\r\nContent-Type: application/json\r\nContent-Length: ${body.size}\r\nConnection: close\r\n\r\n".toByteArray()) + write(body) + flush() + } + } + } + }.apply { isDaemon = true; start() } + return server + } + + @Test fun aRejectedRefreshAsksForSignInWhileAnUnreachableOneKeepsTheSessionForARetry() { + val app = org.robolectric.RuntimeEnvironment.getApplication() + val real = EaAuth.tokenUrl + try { + com.droiddeck.launcher.stores.StoreAccounts.write(app, Store.EA, + JSONObject().put("access_token", "old").put("refresh_token", "r").put("expires_at", 1L).put("user_id", "1")) + EaAuth.tokenUrl = "http://127.0.0.1:1/" + assertNull(EaAuth.accessToken(app)) + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("503 Service Unavailable", "temporarily_unavailable").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("400 Bad Request", "invalid_client").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + tokenServer("400 Bad Request").use { server -> + EaAuth.tokenUrl = "http://127.0.0.1:${server.localPort}/" + assertNull(EaAuth.accessToken(app)) + } + assertFalse(CloudSaves.status(app, Store.EA, "x").signedIn) + assertTrue(EaAuth.storeRefreshed(app, "new", 3600, "r2")) + assertTrue(CloudSaves.status(app, Store.EA, "x").signedIn) + } finally { + EaAuth.tokenUrl = real + EaAuth.signOut(app) + } + } + + private val heat = """ +%Documents%/Need for Speed Heat/SaveGame/savegame/ +%Documents%/Need for Speed Heat/SaveGame/wraps/ +%Documents%/Need for Speed Heat/settings/PROFILEOPTIONS +""" + + @Test fun rulesFindTheFolderTheyShareAndPickOnlyTheirFiles() { + val rules = EaSaveRules.parse(heat)!! + assertEquals("%Documents%/Need for Speed Heat/", rules.base()) + assertEquals("%DOCUMENTS%/Need for Speed Heat/", EaSaveRules.template(rules.base()!!)) + assertTrue(rules.matches("%Documents%/Need for Speed Heat/SaveGame/savegame/1")) + assertTrue(rules.matches("%documents%\\need for speed heat\\settings\\PROFILEOPTIONS")) + assertFalse(rules.matches("%Documents%/Need for Speed Heat/settings/PROFILEOPTIONS.bak")) + assertFalse(rules.matches("%Documents%/Need for Speed Heat/Logs/crash.txt")) + } + + @Test fun globsStayInsideTheirFolderAndExcludesWin() { + val bf = EaSaveRules.parse("""%Documents%/Battlefield 6/settings/*.xml + %Documents%/Battlefield 6/settings/*.sav""")!! + assertEquals("%Documents%/Battlefield 6/settings/", bf.base()) + assertTrue(bf.matches("%Documents%/Battlefield 6/settings/a.sav")) + assertFalse(bf.matches("%Documents%/Battlefield 6/settings/sub/a.sav")) + val le = EaSaveRules.parse(""" + %Documents%/BioWare/Mass Effect Legendary Edition/Config/ + %Documents%/BioWare/Mass Effect Legendary Edition/""")!! + assertTrue(le.matches("%Documents%/BioWare/Mass Effect Legendary Edition/Save/ME1/x.pcsav")) + assertFalse(le.matches("%Documents%/BioWare/Mass Effect Legendary Edition/Config/GamerSettings.ini")) + assertNull(EaSaveRules.parse("")) + assertNull(EaSaveRules.parse("""C:/Games/x/""")!!.base()) + } + + @Test fun rulesApplyInTheirOrderAndTheFirstMatchDecides() { + val rules = EaSaveRules.parse(""" +%Documents%/Game/Config/ +%Documents%/Game/Config/keys.ini +%Documents%/Game/""")!! + assertTrue(rules.matches("%Documents%/Game/Config/keys.ini")) + assertFalse(rules.matches("%Documents%/Game/Config/video.ini")) + assertTrue(rules.matches("%Documents%/Game/Save/1.sav")) + } + + @Test fun aBarePatternMatchesFileNamesInsideTheSaveFolder() { + val dig = EaSaveRules.parse(""" +%Documents%/My Games/SteamWorld Dig/controls.cfg +%Documents%/My Games/SteamWorld Dig/settings.xml +*.xml +%Documents%/My Games/SteamWorld Dig/profile.dat""")!! + assertEquals("%Documents%/My Games/SteamWorld Dig/", dig.base()) + assertTrue(dig.matches("%Documents%/My Games/SteamWorld Dig/profile1.xml")) + assertFalse(dig.matches("%Documents%/My Games/SteamWorld Dig/settings.xml")) + assertFalse(dig.matches("%Documents%/Other Game/profile1.xml")) + val witness = EaSaveRules.parse("""%AppData%/The Witness/**.png""")!! + assertEquals("%AppData%/The Witness/", witness.base()) + assertTrue(witness.matches("%AppData%/The Witness/shot.png")) + } + + @Test fun localLowAndInstallFoldersResolveToTheirTemplates() { + val fe = EaSaveRules.parse("""%LocalLowAppData%/Zoink Games/Fe/SystemSettings.sav +%LocalLowAppData%/Zoink Games/Fe/Save1.sav""")!! + assertEquals("%APPLICATION_DATA_LOCAL_LOW%/Zoink Games/Fe/", EaSaveRules.template(fe.base()!!)) + val castle = EaSaveRules.parse("""%InstallDir%/x86/Lost_Castle_Data/lc_game_data +%InstallDir%/x64/Lost_Castle_Data/lc_game_data""")!! + assertEquals("%INSTALL%/", EaSaveRules.template(castle.base()!!)) + assertTrue(castle.matches("%InstallDir%/x64/Lost_Castle_Data/lc_game_data")) + assertFalse(castle.matches("%InstallDir%/x64/Lost_Castle_Data/other")) + } + + @Test fun aManifestWithSingleQuotedAttributesKeepsEveryField() { + val m = EaCloud.parse(""" + %Documents%/A & B/1 + s1""") + val f = m.files.single() + assertEquals(12L, f.size); assertEquals("content/12-ab", f.href); assertEquals("q+w==", f.md5) + assertEquals("2022-10-17T23:51:04ZZ", f.created); assertEquals("2022-10-18T00:00:00ZZ", f.modified) + assertEquals("%Documents%/A & B/1", f.localName) + assertEquals("{1}", m.lineage); assertEquals(listOf("s1"), m.snapshots) + assertTrue(runCatching { EaCloud.parse("") }.isFailure) + } + + @Test fun aManifestKeepsItsFilesSnapshotsAndEaTimestampsThroughAWrite() { + val xml = """ + + %Documents%/Need for Speed Heat/SaveGame/savegame/1 + + 80cmnqT/rIKQRmciINSVhQ== +""" + val m = EaCloud.parse(xml) + assertEquals(1, m.files.size) + assertEquals("c7996be80a6e38d1f8ef28866b114f8b", EaCloud.hex(m.files[0].md5)) + assertEquals(1666050664000L, EaCloud.parseTime(m.files[0].modified)) + assertEquals("2022-10-17T23:51:04ZZ", EaCloud.stamp(1666050664123L)) + val again = EaCloud.parse(EaCloud.write(m)) + assertEquals(m.files.single().localName, again.files.single().localName) + assertEquals(m.files.single().href, again.files.single().href) + assertEquals(m.files.single().created, again.files.single().created) + assertEquals(m.files.single().modified, again.files.single().modified) + assertEquals(m.files.single().size, again.files.single().size) + assertEquals(m.files.single().md5, again.files.single().md5) + assertEquals(listOf("80cmnqT/rIKQRmciINSVhQ=="), again.snapshots) + assertEquals(m.lineage, again.lineage) + } + + @Test fun commentedRulesAreIgnoredAndNamesKeepTheirSpaces() { + val rules = EaSaveRules.parse(""" + + %Documents%/Game/ """)!! + assertEquals(listOf("%Documents%/Game/"), rules.includes) + assertTrue(rules.excludes.isEmpty()) + assertTrue(rules.matches("%Documents%/Game/Config/a.ini")) + assertEquals("%Documents%/Game/slot.sav ", EaSaveRules.normalize("%Documents%\\Game\\slot.sav ")) + } + + @Test fun aTruncatedManifestIsRefused() { + val cut = runCatching { EaCloud.parse("""""") } + assertTrue(cut.isFailure) + val open = runCatching { EaCloud.parse("""%Documents%/a""") } + assertTrue(open.isFailure) + } + + @Test fun snapshotEntitiesAreDecodedOnceAndWrittenBackTheSame() { + val m = EaCloud.parse("""abc+def""") + assertEquals(listOf("abc+def"), m.snapshots) + assertEquals(listOf("abc+def"), EaCloud.parse(EaCloud.write(m)).snapshots) + } + + @Test fun cloudKeysFollowTheMultiplayerId() { + assertEquals(listOf("195133_195133"), EaCloud.keys("195133", "195133")) + assertEquals(listOf("52209", "52209_52209"), EaCloud.keys("52209", "")) + assertEquals("https://x/y?a=1&b=2", EaCloud.manifestUrl("https://x/y?a=1&b=2")) + assertTrue(CloudSaves.supports(Store.EA)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt new file mode 100644 index 0000000000..e32909ee71 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/MemorySlots.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.stores.ubisoft + +import com.droiddeck.launcher.stores.CloudSaves +import org.json.JSONArray +import org.json.JSONObject +import java.time.Instant + +internal class MemorySlots : UbisoftSlots { + private var record = JSONObject().put("entityId", "e1").put("name", UbisoftCloud.entityName(77L)).put("revision", 1) + .put("obj", JSONObject().put("slots", JSONArray())) + private var clock = 1_700_000_000_000L + val data = HashMap() + var uploadsLeft = Int.MAX_VALUE + var afterUpdate: (JSONArray) -> Unit = {} + + override fun entity() = UbisoftCloud.Entity(JSONObject(record.toString())) + + override fun upload(slot: String, data: ByteArray) { + if (uploadsLeft-- <= 0) throw java.io.IOException("upload failed") + this.data[slot] = data + } + + override fun update(entity: UbisoftCloud.Entity, slots: JSONArray) { + afterUpdate(slots) + record = JSONObject(record.toString()).put("revision", record.getInt("revision") + 1).put("obj", JSONObject().put("slots", slots)) + } + + override fun download(slot: String) = data[slot] + + fun store(slot: String, bytes: ByteArray) { + data[slot] = bytes + val slots = JSONArray(record.getJSONObject("obj").getJSONArray("slots").toString()) + val entry = (0 until slots.length()).map { slots.getJSONObject(it) }.firstOrNull { it.optString("filename") == slot } + ?: JSONObject().put("filename", slot).put("id", slot.toInt()).also { slots.put(it) } + clock += 60_000L + entry.put("hash", UbisoftCloud.mark(bytes)).put("size", bytes.size).put("lastModified", Instant.ofEpochMilli(clock).toString()) + record = JSONObject(record.toString()).put("revision", record.getInt("revision") + 1).put("obj", JSONObject().put("slots", slots)) + } + + companion object { + fun save(tag: String): ByteArray = ("UBISAVE0" + CloudSaves.md5(tag.toByteArray()) + tag).toByteArray() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index aecf4ca779..b0aea68660 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -5,6 +5,7 @@ import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar import com.droiddeck.launcher.stores.StoreLaunch import org.json.JSONArray +import java.io.File import org.json.JSONObject import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals @@ -98,4 +99,74 @@ class UbisoftTest { assertArrayEquals(bytes, UbisoftActivation.unhex("00017fff802a")) assertNull(UbisoftActivation.unhex("abc")) } + + @Test fun aSaveNamesItsUbisoftIdentifierInItsHeader() { + val mark = "4ef5bf634b40daa577aaeaa52c2283a9" + val save = byteArrayOf(0x24, 2, 0, 0, 0, 0, 0, 0) + mark.toByteArray() + ByteArray(64) { it.toByte() } + assertEquals(mark, UbisoftCloud.mark(save)) + assertNull(UbisoftCloud.mark(ByteArray(8) + ByteArray(32) + ByteArray(16))) + assertNull(UbisoftCloud.mark(ByteArray(39))) + } + + @Test fun cloudSaveBodiesSurviveTheZlibHop() { + val save = ByteArray(200_000) { (it % 251).toByte() } + assertArrayEquals(save, UbisoftCloud.inflate(UbisoftCloud.deflate(save))) + assertEquals(0x78, UbisoftCloud.deflate(save)[0].toInt()) + val packed = UbisoftCloud.deflate(save) + val cut = runCatching { UbisoftCloud.inflate(packed.copyOf(packed.size / 2)) } + assertTrue(cut.isFailure) + } + + @Test fun aSlotVersionChangesWithItsSizeTimeOrIdentifier() { + val a = UbisoftCloud.Slot(1, "1", "4ef5bf634b40daa577aaeaa52c2283a9", 2414, 1_689_224_156_000) + assertEquals("2414:1689224156000:4ef5bf634b40daa577aaeaa52c2283a9", UbisoftCloud.version(a)) + assertTrue(UbisoftCloud.version(a) != UbisoftCloud.version(UbisoftCloud.Slot(1, "1", a.hash, 2414, a.modifiedMs + 1))) + } + + @Test fun aSlotCommitCountsOnlyWhenNoOtherSlotMovedAndOursLanded() { + fun entity(revision: Int, vararg slots: Triple) = UbisoftCloud.Entity(JSONObject().put("revision", revision) + .put("obj", JSONObject().put("slots", JSONArray().apply { + for ((name, hash, size) in slots) put(JSONObject().put("filename", name).put("hash", hash).put("size", size).put("lastModified", "2026-01-01T00:00:00Z")) + }))) + val a = "4ef5bf634b40daa577aaeaa52c2283a9"; val b = "0123456789abcdef0123456789abcdef"; val c = "fedcba9876543210fedcba9876543210" + val before = entity(4, Triple("1", a, 10), Triple("2", b, 20)) + assertEquals(c, UbisoftCloudTransport.committedSlot(before, entity(5, Triple("1", c, 11), Triple("2", b, 20)), "1", c, 11)?.hash) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", c, 11), Triple("2", a, 21)), "1", c, 11)) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", b, 30), Triple("2", b, 20)), "1", c, 11)) + assertNull(UbisoftCloudTransport.committedSlot(before, entity(6, Triple("1", c, 11)), "1", c, 11)) + } + + @Test fun aSlotTheCloudRewritesBeforeItIsVerifiedStaysUnsent() { + val slots = MemorySlots().apply { store("1", MemorySlots.save("a1")) } + val transport = UbisoftCloudTransport(slots, "u1") + transport.list() + slots.afterUpdate = { list -> list.getJSONObject(0).put("hash", UbisoftCloud.mark(MemorySlots.save("other device"))) } + val changed = runCatching { transport.put(mapOf("1.save" to MemorySlots.save("a2"))) }.exceptionOrNull() as com.droiddeck.launcher.stores.CloudChanged + assertTrue(changed.sent.isEmpty()) + assertEquals(listOf("1.save"), changed.unsent) + assertNull(transport.committed("1.save")) + } + + @Test fun ubisoftCloudSavesAreSupported() { + assertTrue(com.droiddeck.launcher.stores.CloudSaves.supports(Store.UBISOFT)) + assertTrue(!com.droiddeck.launcher.stores.CloudSaves.supports(Store.AMAZON)) + } + + @Test fun keptGameTokensBelongToOneAccountAndProductUntilDropped() { + val root = kotlin.io.path.createTempDirectory().toFile() + val dir = File(root, "cache") + val cache = UbisoftActivation.TokenCache(dir) + assertNull(cache.get("u-1", 109)) + assertTrue(cache.put("u-1", 109, byteArrayOf(1, 2, 3))) + assertArrayEquals(byteArrayOf(1, 2, 3), cache.get("u-1", 109)) + assertNull(cache.get("u-1", 82)) + assertNull(cache.get("u-2", 109)) + assertTrue(cache.put("../u-1", 82, byteArrayOf(4))) + assertEquals(listOf("cache"), root.list()!!.toList()) + assertTrue(dir.listFiles()!!.all { it.parentFile == dir }) + assertTrue(cache.drop("u-1", 109)) + assertNull(cache.get("u-1", 109)) + assertTrue(cache.drop("u-1", 109)) + root.deleteRecursively() + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt index 2bf7360edf..0ada7eba29 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/CloudMessageTest.kt @@ -3,6 +3,7 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R import com.droiddeck.launcher.stores.CloudSaves import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -25,6 +26,15 @@ class CloudMessageTest { assertEquals(ctx.getString(R.string.cloud_not_synced), msg("failed", 0, 0, "SocketTimeoutException")) } + @Test fun aPartialSyncNamesTheSlotsItLeft() { + fun partial(conflicts: Int, detail: String) = cloudMessage(ctx, CloudSaves.Result("partial", 0, 0L, "blocked-path", conflicts, detail)) + assertEquals(ctx.getString(R.string.cloud_partial, "outside the save folder: ../x.save"), partial(0, "outside the save folder: ../x.save")) + assertEquals(ctx.getString(R.string.cloud_conflict_files_detail, 2, "changed locally: 1.save, 2.save"), partial(2, "changed locally: 1.save, 2.save")) + assertTrue(partial(1, "changed locally: 1.save").contains("1.save")) + assertEquals(ctx.getString(R.string.cloud_conflict_files, 1), partial(1, "")) + assertEquals(ctx.getString(R.string.cloud_not_synced), partial(0, "")) + } + @Test fun okResultsSayWhatHappened() { assertEquals(ctx.getString(R.string.cloud_up_to_date), msg("ok", 0, 0, "up-to-date")) assertEquals(ctx.getString(R.string.cloud_done, 3), msg("ok", 3, 0, "uploaded")) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index 1a5bc27114..5031cb93dc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -116,7 +116,7 @@ def through_client(folder, sidecar, timeout=CLIENT_TIMEOUT): return str(answer.get("reason") or "failed") -def ask(channel, request, timeout=TIMEOUT): +def ask(channel, request, timeout=TIMEOUT, claim=False): req_dir, resp_dir = channel / "req", channel / "resp" req_dir.mkdir(parents=True, exist_ok=True) resp_dir.mkdir(parents=True, exist_ok=True) @@ -125,19 +125,33 @@ def ask(channel, request, timeout=TIMEOUT): tmp.write_text(json.dumps(request)) os.rename(tmp, req_dir / (rid + ".json")) answer = resp_dir / (rid + ".json") - deadline = time.monotonic() + timeout - while time.monotonic() < deadline: + + def wait(seconds): + deadline = time.monotonic() + seconds + while time.monotonic() < deadline: + try: + value = json.loads(answer.read_text()) + answer.unlink() + return value + except (OSError, ValueError): + time.sleep(0.05) + return None + + value = wait(timeout) + if value is not None: + return value + for pending in (req_dir / (rid + ".json"), resp_dir / (rid + ".taken")): + abandoned = pending.with_name(rid + ".abandoned") try: - value = json.loads(answer.read_text()) - answer.unlink() - return value - except (OSError, ValueError): - time.sleep(0.05) - try: - (req_dir / (rid + ".json")).unlink() - except OSError: - pass - return None + os.rename(pending, abandoned) + except OSError: + continue + try: + abandoned.unlink() + except OSError: + pass + return None + return wait(CLAIMED_TIMEOUT) if claim else None def windows_path(unix): @@ -255,7 +269,8 @@ def create_prefix(compat_data, proton, timeout=120): CLOUD_TIMEOUT = 15.0 -CLOUD_STORES = ("gog", "epic") +CLAIMED_TIMEOUT = 120.0 +CLOUD_STORES = ("gog", "epic", "ea", "ubisoft") STORE_GAME = 10 RAN = 11 RAN_FAILED = 12 @@ -304,11 +319,14 @@ def exited(argv, code=0): if found is not None and launch_dir and str(found[1].get("store")) == "ea": ask(Path(launch_dir) / "stores", {"op": "ea-exited", "store": "ea", "id": str(found[1].get("id"))}, timeout=1.0) log("ea %s exited" % found[1].get("id")) - return 0 if found is None or not launch_dir or not cloud_on(found[1]): return 0 store, game = str(found[1].get("store")), str(found[1].get("id")) - ask(Path(launch_dir) / "stores", {"op": "cloud-up", "store": store, "id": game}, timeout=1.0) + try: + ask(Path(launch_dir) / "stores", {"op": "cloud-up", "store": store, "id": game}, timeout=1.0) + except OSError as error: + log("cloud %s %s up not requested (%s)" % (store, game, type(error).__name__)) + return 0 log("cloud %s %s up requested" % (store, game)) return 0 @@ -1601,7 +1619,7 @@ def main(argv): compat_data = os.environ.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") prefix_id = os.path.basename(compat_data) if compat_data else "" launch_dir = os.environ.get("DD_LAUNCH_DIR", "") - if launch_dir and cloud_on(sidecar): + if launch_dir and cloud_on(sidecar) and store != "ea": made = create_prefix(compat_data, os.environ.get("DD_STORE_PROTON", "")) if made != "present": log("cloud %s %s prefix=%s" % (store, game, made)) @@ -1670,13 +1688,16 @@ def main(argv): log("epic prefix=%s %s" % (prefix_id or "?", provision_prefix(compat_data))) if store == "ea": prepare_ea(folder, sidecar, compat_data, launch_dir) - return STORE_GAME if not cloud_on(sidecar): if store in CLOUD_STORES: log("cloud %s %s down result=skipped reason=off" % (store, game)) - return 0 + return STORE_GAME if store == "ea" else 0 if launch_dir: - answer = ask(Path(launch_dir) / "stores", {"op": "cloud-down", "store": store, "id": game}, timeout=CLOUD_TIMEOUT) + try: + answer = ask(Path(launch_dir) / "stores", {"op": "cloud-down", "store": store, "id": game}, timeout=CLOUD_TIMEOUT, claim=True) + except OSError as error: + log("cloud %s %s down result=failed reason=%s" % (store, game, type(error).__name__)) + return STORE_GAME if answer is None: log("cloud %s %s down result=timeout" % (store, game)) else: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index ca7032cdc9..143aa07c27 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -518,7 +518,7 @@ def launch(command, env): context.chmod(0o600) owned_env = dict(env, DROIDDECK_XBOX_ACTIVE='1', DROIDDECK_XBOX_COMMAND_FILE=str(context), XODUS_SOCKET=reply['socket'], XODUS_BRIDGE_PORT=str(port), XODUS_BRIDGE_KEY=key, - XODUS_LOG='off', RUST_LOG='off', XODUS_SAVE_SYNC='auto' if sidecar.get('cloud', True) else 'off') + XODUS_LOG='off', RUST_LOG='off', XODUS_SAVE_SYNC='auto' if sidecar.get('cloud', True) else 'none') for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): owned_env.pop(name, None) if reply.get('playfab'): diff --git a/tools/tests/test_droiddeck_epic.py b/tools/tests/test_droiddeck_epic.py index 6849db9c15..e78de6280c 100644 --- a/tools/tests/test_droiddeck_epic.py +++ b/tools/tests/test_droiddeck_epic.py @@ -1318,7 +1318,7 @@ class StoreLaunchClientTest(unittest.TestCase): (self.folder / ".droiddeck-store.json").write_text(json.dumps(sidecar)) with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: calls.append("wanted") or True, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertNotIn("wanted", calls) self.assertNotIn("epic-code", calls) @@ -1341,7 +1341,7 @@ class StoreLaunchClientTest(unittest.TestCase): with mock.patch.dict(os.environ, env), \ mock.patch.dict(S, {"client_wanted": lambda: True, "through_client": lambda folder, sidecar, timeout=0: calls.append("client") or "timeout", - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True, "code": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True, "code": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["client", "epic-code", "cloud-down"], calls) @@ -1356,7 +1356,7 @@ class StoreLaunchClientTest(unittest.TestCase): (self.folder / ".droiddeck-epic-code").write_text("stale") with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: True, "through_client": through, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["client", "cloud-down"], calls) self.assertFalse((self.folder / ".droiddeck-epic-code").exists()) @@ -1368,7 +1368,7 @@ class StoreLaunchClientTest(unittest.TestCase): with mock.patch.dict(os.environ, {"DD_LAUNCH_DIR": str(self.tmp / "launch"), "DROIDDECK_EPIC_HANDLED": "1", "STEAM_COMPAT_DATA_PATH": ""}), \ mock.patch.dict(S, {"client_wanted": lambda: calls.append("wanted") or True, - "ask": lambda channel, request, timeout=0: calls.append(request["op"]) or {"ok": True}}): + "ask": lambda channel, request, timeout=0, claim=False: calls.append(request["op"]) or {"ok": True}}): S["main"]([str(self.folder / ".droiddeck-launch.bat")]) self.assertEqual(["cloud-down"], calls) self.assertTrue((self.folder / ".droiddeck-epic-args").exists()) diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 1ce1659ea7..84ce7dcfa6 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -106,6 +106,62 @@ class Asking(unittest.TestCase): self.assertIsNone(store.ask(channel, {'op': 'epic-code'}, timeout=0.2)) self.assertEqual([], list((channel / 'req').iterdir())) + def test_a_cloud_download_the_launcher_stops_waiting_for_loses_its_claim(self): + with tempfile.TemporaryDirectory() as root: + channel = Path(root) / 'stores' + taken = [] + handed = threading.Event() + + def app(): + deadline = time.monotonic() + 5 + while not taken and time.monotonic() < deadline: + for request in (channel / 'req').glob('*.json') if (channel / 'req').is_dir() else []: + target = channel / 'resp' / (request.stem + '.taken') + os.rename(request, target) + taken.append(target) + handed.set() + time.sleep(0.02) + + t = threading.Thread(target=app, daemon=True) + t.start() + try: + self.assertIsNone(store.ask(channel, {'op': 'cloud-down'}, timeout=2.0, claim=True)) + finally: + t.join(5) + self.assertTrue(handed.is_set(), 'the app never took the request') + with self.assertRaises(OSError): + os.rename(taken[0], taken[0].with_suffix('.writing')) + + def test_a_claimed_cloud_download_is_waited_for(self): + with tempfile.TemporaryDirectory() as root: + channel = Path(root) / 'stores' + handed = threading.Event() + + def app(): + deadline = time.monotonic() + 5 + while time.monotonic() < deadline: + names = list((channel / 'req').glob('*.json')) if (channel / 'req').is_dir() else [] + if names: + handed.set() + writing = channel / 'resp' / (names[0].stem + '.writing') + os.rename(names[0], writing) + time.sleep(0.6) + tmp = channel / 'resp' / (names[0].name + '.tmp') + tmp.write_text(json.dumps({'ok': True, 'result': 'ok'})) + os.rename(tmp, channel / 'resp' / names[0].name) + writing.unlink() + return + time.sleep(0.02) + + t = threading.Thread(target=app, daemon=True) + t.start() + try: + answer = store.ask(channel, {'op': 'cloud-down'}, timeout=0.2, claim=True) + finally: + t.join(5) + self.assertTrue(handed.is_set(), 'the app never took the request') + self.assertEqual({'ok': True, 'result': 'ok'}, answer) + def test_a_stale_code_is_dropped_before_asking(self): with tempfile.TemporaryDirectory() as root: folder = game(root) @@ -214,7 +270,7 @@ class CloudHooks(unittest.TestCase): try: original = store.ask asked = [] - store.ask = lambda channel, request, timeout=5.0: asked.append((request, timeout)) or {'ok': True, 'files': 2, 'reason': 'ok'} + store.ask = lambda channel, request, timeout=5.0, claim=False: asked.append((request, timeout)) or {'ok': True, 'files': 2, 'reason': 'ok'} self.assertEqual(store.STORE_GAME, store.main([bat])) self.assertEqual(0, store.main(['--exited', bat])) finally: @@ -225,6 +281,55 @@ class CloudHooks(unittest.TestCase): self.assertEqual(store.CLOUD_TIMEOUT, asked[1][1]) self.assertEqual('cloud-up', asked[2][0]['op']) + def test_a_cloud_request_that_cannot_be_written_still_starts_the_game_and_uploads_on_exit(self): + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='ubisoft', ident='space-1') + sc = json.loads((folder / '.droiddeck-store.json').read_text()); sc['extra'] = {'productId': '109'} + (folder / '.droiddeck-store.json').write_text(json.dumps(sc)) + bat = str(folder / '.droiddeck-launch.bat') + asked = [] + + def ask(channel, request, timeout=5.0, claim=False): + asked.append(request['op']) + if request['op'] in ('cloud-down', 'cloud-up'): + raise PermissionError(13, 'read-only') + return {'ok': True} + + lines = [] + with patch.dict(os.environ, {'DD_LAUNCH_DIR': str(Path(root) / 'session')}), patch.object(store, 'ask', side_effect=ask), patch.object(store, 'prepare_ubisoft', return_value='ready'), patch.object(store, 'create_prefix', return_value='present'), patch.object(store, 'log', side_effect=lines.append): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['cloud-down', 'cloud-up'], [op for op in asked if op.startswith('cloud-')]) + self.assertIn('cloud ubisoft space-1 down result=failed reason=PermissionError', lines) + self.assertIn('cloud ubisoft space-1 up not requested (PermissionError)', lines) + def test_an_ea_game_with_cloud_saves_asks_after_its_preparation_and_exit(self): + ident = 'Origin.OFR.50.0002694' + with tempfile.TemporaryDirectory() as root: + folder = game(root, store_id='ea', ident=ident) + bat = str(folder / '.droiddeck-launch.bat') + asked = [] + env = {'DD_LAUNCH_DIR': str(Path(root) / 'session')} + record = lambda channel, request, timeout=5.0, claim=False: asked.append(request) or {'result': 'ok'} + with patch.dict(os.environ, env), \ + patch.object(store, 'prepare_ea', side_effect=lambda *a: asked.append({'op': 'prepared'})), \ + patch.object(store, 'create_prefix', side_effect=AssertionError('EA prepares its own prefix')), \ + patch.object(store, 'ask', side_effect=record): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual(['prepared', 'cloud-down'], [r['op'] for r in asked]) + self.assertEqual({'op': 'cloud-down', 'store': 'ea', 'id': ident}, asked[1]) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['ea-exited', 'cloud-up'], [r['op'] for r in asked[2:]]) + self.assertEqual({'op': 'cloud-up', 'store': 'ea', 'id': ident}, asked[3]) + sidecar = json.loads((folder / store.SIDECAR).read_text()) + sidecar['cloud'] = False + (folder / store.SIDECAR).write_text(json.dumps(sidecar)) + asked.clear() + with patch.dict(os.environ, env), patch.object(store, 'prepare_ea'), patch.object(store, 'ask', side_effect=record): + self.assertEqual(store.STORE_GAME, store.main([bat])) + self.assertEqual([], asked) + self.assertEqual(0, store.main(['--exited', bat])) + self.assertEqual(['ea-exited'], [r['op'] for r in asked]) + def test_a_first_launch_creates_the_prefix_before_the_cloud_download(self): with tempfile.TemporaryDirectory() as root: folder = game(root, store_id='epic', ident='fa4240e5') @@ -244,7 +349,7 @@ class CloudHooks(unittest.TestCase): env = {'DD_LAUNCH_DIR': root, 'STEAM_COMPAT_DATA_PATH': str(compat), 'DD_STORE_PROTON': str(proton)} with patch.dict(os.environ, env), patch.object(store.subprocess, 'run', side_effect=run), \ - patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0: order.append(request) or {'result': 'ok'}): + patch.object(store, 'ask', side_effect=lambda channel, request, timeout=5.0, claim=False: order.append(request) or {'result': 'ok'}): self.assertEqual(store.STORE_GAME, store.main([str(folder / store.LAUNCHER)])) self.assertEqual([str(proton), 'run', 'cmd.exe', '/d', '/c', 'exit'], order[0]) self.assertEqual({'op': 'cloud-down', 'store': 'epic', 'id': 'fa4240e5'}, order[-1]) diff --git a/tools/tests/test_store_launch_ea.py b/tools/tests/test_store_launch_ea.py index 0f73f92f8a..1dd912f0ab 100644 --- a/tools/tests/test_store_launch_ea.py +++ b/tools/tests/test_store_launch_ea.py @@ -147,7 +147,7 @@ class EaHook(unittest.TestCase): folder.mkdir() asked = {} - def fake_ask(channel, request, timeout=5.0): + def fake_ask(channel, request, timeout=5.0, claim=False): asked.update(request) return {'ok': True, 'lsx': True, 'license': 'ok v4', 'licenses': [{'path': 'ProgramData/L/x.dlf', 'data': base64.b64encode(b'z').decode()}]} diff --git a/tools/ubisoft-launcher/src/bridge.rs b/tools/ubisoft-launcher/src/bridge.rs new file mode 100644 index 0000000000..361acb743f --- /dev/null +++ b/tools/ubisoft-launcher/src/bridge.rs @@ -0,0 +1,161 @@ +//! The file bridge DroidDeck answers Denuvo activations through. + +use std::path::Path; +use std::sync::{Condvar, Mutex}; +use std::thread; +use std::time::Duration; + +pub const INVALIDATE: &str = "denuvo-invalidate"; + +pub fn publish_invalidation(dir: &Path, account: &str, tries: u32, pause: Duration) -> bool { + let marker = dir.join(INVALIDATE); + let part = dir.join(format!("{INVALIDATE}.upc")); + for attempt in 0..tries { + if marker.is_file() { + return true; + } + if std::fs::write(&part, account.as_bytes()).is_ok() && std::fs::rename(&part, &marker).is_ok() { + return true; + } + let _ = std::fs::remove_file(&part); + if attempt + 1 < tries { + thread::sleep(pause); + } + } + false +} + +#[derive(Default)] +pub struct Generation { + state: Mutex<(u64, usize)>, + idle: Condvar, +} + +impl Generation { + pub fn current(&self) -> u64 { + self.state.lock().unwrap().0 + } + + pub fn invalidate(&self, wait: Duration, acknowledge: impl FnOnce() -> T) -> T { + let mut state = self.state.lock().unwrap(); + state.0 += 1; + let _ = self.idle.wait_timeout_while(state, wait, |s| s.1 > 0).unwrap(); + acknowledge() + } + + pub fn serve(&self, seen: u64, reply: impl FnOnce() -> T) -> Option { + { + let mut state = self.state.lock().unwrap(); + if state.0 != seen { + return None; + } + state.1 += 1; + } + let out = reply(); + self.state.lock().unwrap().1 -= 1; + self.idle.notify_all(); + Some(out) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::sync::Arc; + use std::time::Instant; + + fn dir(name: &str) -> std::path::PathBuf { + let d = std::env::temp_dir().join(format!("upc-bridge-{name}-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&d); + std::fs::create_dir_all(&d).unwrap(); + d + } + + #[test] + fn an_invalidation_is_published_as_the_marker() { + let d = dir("publish"); + assert!(publish_invalidation(&d, "user-a", 1, Duration::ZERO)); + assert_eq!(std::fs::read(d.join(INVALIDATE)).unwrap(), b"user-a"); + assert!(!d.join("denuvo-invalidate.upc").exists()); + } + + #[test] + fn a_marker_naming_its_account_is_kept() { + let d = dir("named"); + std::fs::write(d.join(INVALIDATE), b"user-a").unwrap(); + assert!(publish_invalidation(&d, "user-b", 1, Duration::ZERO)); + assert_eq!(std::fs::read(d.join(INVALIDATE)).unwrap(), b"user-a"); + } + + #[test] + fn a_marker_that_cannot_be_written_is_reported_after_every_try() { + let d = dir("missing").join("gone"); + let started = Instant::now(); + assert!(!publish_invalidation(&d, "user-a", 3, Duration::from_millis(20))); + assert!(started.elapsed() >= Duration::from_millis(40)); + assert!(!d.join(INVALIDATE).exists()); + } + + #[test] + fn a_marker_written_while_retrying_counts() { + let d = dir("late").join("bridge"); + let later = d.clone(); + let maker = thread::spawn(move || { + thread::sleep(Duration::from_millis(30)); + std::fs::create_dir_all(later).unwrap(); + }); + assert!(publish_invalidation(&d, "user-a", 50, Duration::from_millis(10))); + maker.join().unwrap(); + assert!(d.join(INVALIDATE).is_file()); + } + + #[test] + fn a_kept_token_asked_for_before_an_invalidation_is_not_served_after_it() { + let g = Generation::default(); + let seen = g.current(); + assert_eq!(g.invalidate(Duration::from_secs(1), || "acknowledged"), "acknowledged"); + assert_eq!(g.serve(seen, || "token"), None); + assert_eq!(g.serve(g.current(), || "token"), Some("token")); + } + + #[test] + fn a_reply_being_served_holds_the_acknowledgement_back() { + let g = Arc::new(Generation::default()); + let order = Arc::new(Mutex::new(Vec::new())); + let seen = g.current(); + let (g2, o2) = (g.clone(), order.clone()); + let served = g.serve(seen, || { + let ack = thread::spawn(move || g2.invalidate(Duration::from_secs(5), || o2.lock().unwrap().push("acknowledged"))); + thread::sleep(Duration::from_millis(50)); + order.lock().unwrap().push("token"); + ack + }); + served.unwrap().join().unwrap(); + assert_eq!(*order.lock().unwrap(), vec!["token", "acknowledged"]); + } + + #[test] + fn a_reply_that_stalls_never_blocks_other_connections_or_the_acknowledgement_for_long() { + let g = Arc::new(Generation::default()); + let seen = g.current(); + let (entered, inside) = std::sync::mpsc::channel(); + let (release, held) = std::sync::mpsc::channel::<()>(); + let stalled = { + let g = g.clone(); + thread::spawn(move || g.serve(seen, move || { + entered.send(()).unwrap(); + let _ = held.recv(); + })) + }; + inside.recv().unwrap(); + let started = Instant::now(); + assert_eq!(g.current(), seen); + assert_eq!(g.serve(seen, || "other"), Some("other")); + assert!(started.elapsed() < Duration::from_millis(200)); + assert_eq!(g.invalidate(Duration::from_millis(100), || "acknowledged"), "acknowledged"); + assert!(started.elapsed() < Duration::from_millis(450)); + assert_eq!(g.serve(seen, || "late"), None); + release.send(()).unwrap(); + assert!(stalled.join().unwrap().is_some()); + } +} diff --git a/tools/ubisoft-launcher/src/launcher.rs b/tools/ubisoft-launcher/src/launcher.rs index 343708dba0..d993ebe9f9 100644 --- a/tools/ubisoft-launcher/src/launcher.rs +++ b/tools/ubisoft-launcher/src/launcher.rs @@ -338,6 +338,8 @@ pub fn announced(body: &[u8]) -> Option<(Option, Option)> { pub enum AuxReq<'a> { Init(u64), Activate(u64, &'a [u8]), + Invalidate(u64), + BurnTicket(u64), Other(u64), } @@ -348,8 +350,14 @@ pub fn aux_request(body: &[u8]) -> AuxReq<'_> { let Some(activate) = pb::sub(&f, 3) else { return if pb::has(&f, 2) { AuxReq::Init(rid) } else { AuxReq::Other(rid) }; }; - let token = pb::fields(activate) - .and_then(|a| pb::sub(&a, 2).and_then(pb::fields)) + let Some(a) = pb::fields(activate) else { return AuxReq::Other(rid) }; + if pb::has(&a, 1) && !pb::has(&a, 2) { + return AuxReq::Invalidate(rid); + } + if pb::has(&a, 3) && !pb::has(&a, 2) { + return AuxReq::BurnTicket(rid); + } + let token = pb::sub(&a, 2).and_then(pb::fields) .and_then(|t| t.iter().find_map(|(n, v)| match v { Value::Bytes(b) if *n == 2 => Some(*b), _ => None })); match token { Some(t) => AuxReq::Activate(rid, t), @@ -365,6 +373,15 @@ pub fn aux_init(rid: u64, pid: u32) -> Vec { Msg::new().uint(1, rid).msg(2, init).0 } +pub fn aux_invalidated(rid: u64) -> Vec { + Msg::new().uint(1, rid).msg(3, Msg::new()).0 +} + +pub fn aux_no_burn_ticket(rid: u64) -> Vec { + let answer = Msg::new().uint(2, 3).uint(3, 3); + Msg::new().uint(1, rid).msg(3, Msg::new().msg(3, answer)).0 +} + pub fn aux_token(rid: u64, game_token: &[u8]) -> Vec { let answer = Msg::new().uint(2, 1).uint(3, 0).bytes(4, game_token).bytes(5, b""); Msg::new().uint(1, rid).msg(3, Msg::new().msg(2, answer)).0 @@ -476,6 +493,30 @@ mod tests { assert!(matches!(aux_request(&Msg::new().uint(1, 1).msg(2, Msg::new().uint(1, 109)).0), AuxReq::Init(1))); } + #[test] + fn an_invalidation_is_recognised_and_acknowledged_with_an_empty_activation() { + let req = Msg::new().uint(1, 5).msg(3, Msg::new().msg(1, Msg::new())); + assert!(matches!(aux_request(&req.0), AuxReq::Invalidate(5))); + let rsp = pb::fields(&aux_invalidated(5)).unwrap().into_iter().map(|(n, _)| n).collect::>(); + assert_eq!(rsp, vec![1, 3]); + assert_eq!(pb::sub(&pb::fields(&aux_invalidated(5)).unwrap(), 3), Some(&b""[..])); + let burn = Msg::new().uint(1, 6).msg(3, Msg::new().msg(3, Msg::new().bytes(2, b"t"))); + assert!(matches!(aux_request(&burn.0), AuxReq::BurnTicket(6))); + } + + #[test] + fn a_burn_ticket_request_is_answered_with_a_connection_error() { + let rsp = aux_no_burn_ticket(6); + let top = pb::fields(&rsp).unwrap(); + assert_eq!(pb::num(&top, 1), Some(6)); + let activate = pb::fields(pb::sub(&top, 3).unwrap()).unwrap(); + assert!(!pb::has(&activate, 2)); + let burn = pb::fields(pb::sub(&activate, 3).unwrap()).unwrap(); + assert_eq!(pb::num(&burn, 2), Some(3)); + assert_eq!(pb::num(&burn, 3), Some(3)); + assert!(!pb::has(&burn, 4)); + } + #[test] fn orbit_init_answers_with_the_save_folder() { let (rsp, what) = config().orbit(&[0x08, 0x01, 0x62, 0x03, 0x08, 0xcd, 0x01]).unwrap(); diff --git a/tools/ubisoft-launcher/src/main.rs b/tools/ubisoft-launcher/src/main.rs index 0b7126a919..e4442d7033 100644 --- a/tools/ubisoft-launcher/src/main.rs +++ b/tools/ubisoft-launcher/src/main.rs @@ -4,6 +4,7 @@ #![cfg_attr(windows, windows_subsystem = "windows")] +mod bridge; mod launcher; mod pb; #[cfg(windows)] @@ -22,12 +23,13 @@ fn main() { #[cfg(windows)] mod service { + use crate::bridge::{self, Generation}; use crate::launcher::{self, AuxReq, Config, SessionReq}; use crate::win::{self, Handle}; use std::fs::OpenOptions; use std::io::Write; - use std::path::PathBuf; - use std::sync::atomic::{AtomicU32, Ordering}; + use std::path::{Path, PathBuf}; + use std::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use std::sync::{Arc, Mutex}; use std::thread; use std::time::{Duration, Instant}; @@ -36,6 +38,9 @@ mod service { const ANNOUNCE_WAIT: Duration = Duration::from_secs(120); const RESTART_WAIT: Duration = Duration::from_secs(15); const DENUVO_WAIT: Duration = Duration::from_secs(90); + const SERVE_WAIT: Duration = Duration::from_secs(10); + const MARKER_TRIES: u32 = 25; + const MARKER_PAUSE: Duration = Duration::from_millis(200); struct State { cfg: Config, @@ -43,6 +48,8 @@ mod service { log: Mutex>, event: Handle, game: AtomicU32, + stale_token: AtomicBool, + generation: Generation, started: Instant, } @@ -175,7 +182,8 @@ mod service { state.say("session: closed"); } - fn denuvo(state: &State, rid: u64, challenge: &[u8]) -> Option> { + /// The game token for an activation, with the invalidation count it was asked under when it may be a kept one. + fn denuvo(state: &State, rid: u64, challenge: &[u8], fresh: bool) -> Option<(Vec, Option)> { if state.cfg.bridge.is_empty() { return None; } @@ -185,12 +193,20 @@ mod service { let _ = std::fs::remove_file(&rsp); let part = dir.join(format!("denuvo-{rid}.req.part")); std::fs::write(&part, challenge).ok()?; - std::fs::rename(&part, dir.join(format!("denuvo-{rid}.req"))).ok()?; + let seen = state.generation.current(); + let stale = state.stale_token.swap(false, Ordering::SeqCst) || fresh; + let kind = if stale { "req" } else { "cache.req" }; + if std::fs::rename(&part, dir.join(format!("denuvo-{rid}.{kind}"))).is_err() { + if stale { + state.stale_token.store(true, Ordering::SeqCst); + } + return None; + } let deadline = Instant::now() + DENUVO_WAIT; while Instant::now() < deadline { if let Ok(token) = std::fs::read(&rsp) { let _ = std::fs::remove_file(&rsp); - return (!token.is_empty()).then_some(token); + return (!token.is_empty()).then_some((token, (!stale).then_some(seen))); } thread::sleep(Duration::from_millis(200)); } @@ -207,14 +223,48 @@ mod service { } AuxReq::Activate(rid, challenge) => { state.say(&format!("aux: activation {rid} with a {} B challenge", challenge.len())); - match denuvo(state, rid, challenge) { - Some(token) => { - send(&pipe, &launcher::aux_token(rid, &token)); + let mut fresh = false; + loop { + let Some((token, seen)) = denuvo(state, rid, challenge, fresh) else { + state.say(&format!("aux: no game token for activation {rid}")); + break; + }; + let answer = || send(&pipe, &launcher::aux_token(rid, &token)); + let served = match seen { + Some(g) => state.generation.serve(g, answer).is_some(), + None => { + answer(); + true + } + }; + if served { state.say(&format!("aux: activation {rid} answered ({} B)", token.len())); + break; } - None => state.say(&format!("aux: no game token for activation {rid}")), + state.say(&format!("aux: kept token for activation {rid} came back after an invalidation; asking afresh")); + fresh = true; } } + AuxReq::Invalidate(rid) => { + state.stale_token.store(true, Ordering::SeqCst); + let published = state.generation.invalidate(SERVE_WAIT, || { + let published = state.cfg.bridge.is_empty() + || bridge::publish_invalidation(Path::new(&state.cfg.bridge), &state.cfg.user_id, MARKER_TRIES, MARKER_PAUSE); + if published { + send(&pipe, &launcher::aux_invalidated(rid)); + } + published + }); + if published { + state.say(&format!("aux: token invalidated by request {rid}")); + } else { + state.say(&format!("aux: invalidation {rid} not acknowledged; the kept token could not be marked stale")); + } + } + AuxReq::BurnTicket(rid) => { + send(&pipe, &launcher::aux_no_burn_ticket(rid)); + state.say(&format!("aux: burn ticket {rid} answered as unavailable")); + } AuxReq::Other(rid) => state.say(&format!("aux: request {rid} not handled ({} B)", req.len())), } } @@ -304,6 +354,8 @@ mod service { log: Mutex::new(log), event: win::inheritable_event(), game: AtomicU32::new(0), + stale_token: AtomicBool::new(false), + generation: Generation::default(), started: Instant::now(), }); state.say(&format!("product {} on {}*", state.cfg.product, state.prefix)); From adf13d0bdd0149f7b369d2df6ce99c5ea92e58e8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 21:58:57 -0500 Subject: [PATCH 43/60] feat(session): manage memory automatically and remove the manual memory controls (#2853) Memory in the Steam session is kept above a floor by a monitor instead of the zRAM, RAM cap and VRAM cap settings, which are removed. --- .../droiddeck/launcher/FrontEndActivity.kt | 16 - .../droiddeck/launcher/core/DeviceReport.kt | 3 - .../launcher/session/SessionFiles.kt | 4 +- .../launcher/session/SessionPrefs.kt | 23 - .../launcher/session/SessionService.kt | 7 +- .../session/SessionSuspendController.kt | 37 +- .../launcher/session/SettingsReset.kt | 2 +- .../launcher/ui/PerformanceDialog.kt | 38 - .../droiddeck/launcher/ui/SettingsIndex.kt | 4 - app/src/main/res/values-ar/strings.xml | 12 - app/src/main/res/values-b+es+419/strings.xml | 12 - app/src/main/res/values-bg/strings.xml | 12 - app/src/main/res/values-cs/strings.xml | 12 - app/src/main/res/values-da/strings.xml | 12 - app/src/main/res/values-de/strings.xml | 12 - app/src/main/res/values-el/strings.xml | 12 - app/src/main/res/values-es/strings.xml | 12 - app/src/main/res/values-fi/strings.xml | 12 - app/src/main/res/values-fr/strings.xml | 12 - app/src/main/res/values-hi/strings.xml | 12 - app/src/main/res/values-hu/strings.xml | 12 - app/src/main/res/values-in/strings.xml | 12 - app/src/main/res/values-it/strings.xml | 12 - app/src/main/res/values-ja/strings.xml | 12 - app/src/main/res/values-ko/strings.xml | 12 - app/src/main/res/values-ms/strings.xml | 12 - app/src/main/res/values-nb/strings.xml | 12 - app/src/main/res/values-nl/strings.xml | 12 - app/src/main/res/values-pl/strings.xml | 12 - app/src/main/res/values-pt-rPT/strings.xml | 12 - app/src/main/res/values-pt/strings.xml | 12 - app/src/main/res/values-ro/strings.xml | 12 - app/src/main/res/values-ru/strings.xml | 12 - app/src/main/res/values-sv/strings.xml | 12 - app/src/main/res/values-th/strings.xml | 12 - app/src/main/res/values-tr/strings.xml | 12 - app/src/main/res/values-uk/strings.xml | 12 - app/src/main/res/values-vi/strings.xml | 12 - app/src/main/res/values-zh-rCN/strings.xml | 12 - app/src/main/res/values-zh-rHK/strings.xml | 12 - app/src/main/res/values-zh-rTW/strings.xml | 12 - app/src/main/res/values/strings.xml | 12 - .../session/SessionSuspendControllerTest.kt | 67 +- docs/development/low-memory.md | 196 ++-- docs/development/vram-budget.md | 28 - docs/settings-map.md | 4 - tools/components/recipes.json | 3 +- tools/gpuload/build.sh | 13 +- .../layer/VK_LAYER_DROIDDECK_vram_cap.json | 20 - .../gpuload/src/vk_layer_droiddeck_vramcap.c | 206 ---- tools/gpuload/src/vramcap_budget.h | 32 - tools/gpuload/tests/test_vramcap_budget.c | 154 --- .../overlay/usr/local/bin/droiddeck-game-env | 17 - .../overlay/usr/local/bin/droiddeck-session | 567 +++++------ tools/linuxfs/preload/zram.c | 197 +++- tools/release/runtime_inputs.py | 3 +- tools/tests/test_client_zram_focus.py | 247 +---- tools/tests/test_game_environment.py | 17 - tools/tests/test_memory_pressure.py | 923 ++++++------------ tools/tests/test_zram_preload.py | 157 ++- 60 files changed, 1117 insertions(+), 2264 deletions(-) delete mode 100644 docs/development/vram-budget.md delete mode 100644 tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json delete mode 100644 tools/gpuload/src/vk_layer_droiddeck_vramcap.c delete mode 100644 tools/gpuload/src/vramcap_budget.h delete mode 100644 tools/gpuload/tests/test_vramcap_budget.c diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index a8f165bc42..56787a7146 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -180,10 +180,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) private var paceCores by mutableStateOf(true) - private var ramCapMb by mutableStateOf(0) - private var zramClient by mutableStateOf(true) - private var zramIdle by mutableStateOf(true) - private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) @@ -2745,10 +2741,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, - ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient, zramIdle = zramIdle, - deviceRamMb = (android.app.ActivityManager.MemoryInfo() - .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), - ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, nativeUserland = nativeUserland, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, @@ -2763,10 +2755,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on }, onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, - onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, - onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on }, - onZramIdle = { on -> SessionPrefs.setZramIdle(this, on); zramIdle = on }, - onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, onNativeUserland = { on -> SessionPrefs.setNativeUserland(this, on); nativeUserland = on }, @@ -3065,10 +3053,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) paceCores = SessionPrefs.paceCores(this) - ramCapMb = SessionPrefs.ramCapMb(this) - zramClient = SessionPrefs.zramClient(this) - zramIdle = SessionPrefs.zramIdle(this) - vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 3c047d2e13..fe835b10c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -281,9 +281,6 @@ object DeviceReport { k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) k("pace cores", SessionPrefs.paceCores(context)) - k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) - k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) - k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("native userland (no proot)", SessionPrefs.nativeUserland(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 9501915fe5..53b54e9ca2 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -234,8 +234,6 @@ object SessionFiles { val gpuLoad = listOf( "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_gpu_load.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_gpu_load.json", - "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" to "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "usr/local/lib/droiddeck-gpuload/VK_LAYER_DROIDDECK_vram_cap.json" to "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json", ) val fexPreloads = listOf("x86_64", "i386").flatMap { arch -> listOf("libddsession.so", "libfakeinput.so", "libfaultreport.so").map { "$arch/$it" to "usr/local/lib/droiddeck-fex/$arch/$it" } @@ -282,6 +280,8 @@ object SessionFiles { if (installed) ledger.staged(relative, target) else Log.e(TAG, "$relative NOT staged") } File(root, "usr/local/bin/bannerlator-steam-compat").delete() + File(root, "usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so").delete() + File(root, "usr/share/vulkan/implicit_layer.d/droiddeck_vram_cap.json").delete() LegacyNames.migrateRootfs(root) ComponentsManager.migrateLaunchDir(context) EsyncPacks.stageBundled(context, root) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index ed23e31bc3..39d92312b5 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -932,29 +932,6 @@ object SessionPrefs { prefs(context).edit().putBoolean("gamescopeRealtime", on).apply() } - fun ramCapMb(context: Context): Int = prefs(context).getInt("ramCapMb", 0).coerceAtLeast(0) - - fun setRamCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() - } - - fun zramClient(context: Context): Boolean = prefs(context).getBoolean("zramClient", true) - - fun setZramClient(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramClient", on).apply() - } - - fun zramIdle(context: Context): Boolean = prefs(context).getBoolean("zramIdle", true) - - fun setZramIdle(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("zramIdle", on).apply() - } - - fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) - - fun setVramCapMb(context: Context, mb: Int) { - prefs(context).edit().putInt("vramCapMb", mb.coerceAtLeast(0)).apply() - } fun gpuClockPin(context: Context): Boolean = prefs(context).getBoolean("gpuClockPin", false) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 9c8e6fe2c4..aaf77c3f5f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -911,10 +911,9 @@ class SessionService : Service() { )) } }, - readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> if (processes == 0) { - Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (${availableKb / 1024} MB available is too little)") } else { Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") } @@ -1085,11 +1084,7 @@ class SessionService : Service() { relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("DD_ZRAM=1") - if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_RAM_CAP_MB=$it") } - if (!SessionPrefs.zramClient(this)) guest.add("DD_ZRAM_CLIENT=0") - if (!SessionPrefs.zramIdle(this)) guest.add("DD_ZRAM_IDLE=0") } - SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("DD_VRAM_MB=$it") } guest.add("AUDIO_DIRECT_DECAY=0") val extra = extraEnv() + agentEnvironment guest.addAll(TurnipEnvironment.gameEnvironment(tuOverride, tuDriver, SessionPrefs.tuSysmem(this), extra)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index 221a1e78c5..74f7d5ace9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -27,7 +27,6 @@ internal class SessionSuspendController( private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, - private val readBackAllowed: () -> Boolean = { true }, private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = { _, _, _, _, _ -> }, ) { @@ -278,12 +277,21 @@ internal class SessionSuspendController( private fun pageOut(records: MutableMap, ProcessRecord>, root: Int, helpers: List) { val control = zramControl?.takeIf { it.isFile } ?: return + val hold = holdFile(control) try { - addSnapshot(records, root, helpers) - control.writeText("1") + hold.writeText(PAGE_OUT_REQUEST) + sleep(PAGE_OUT_POLL_MS) + pageOut(control, records, root, helpers) } catch (_: IOException) { - return + } finally { + hold.delete() } + } + + private fun holdFile(control: File) = File(control.parentFile, "${control.name}.hold") + + private fun pageOut(control: File, records: MutableMap, ProcessRecord>, root: Int, helpers: List) { + addSnapshot(records, root, helpers) val targets = records.values.filter { record -> try { File(procRoot, "${record.pid}/maps").useLines { lines -> lines.any { it.endsWith("/libddsession.so") } } @@ -301,16 +309,22 @@ internal class SessionSuspendController( val waiting = targets.toMutableList() while (!closing && !cancelled && nowMillis() - start < PAGE_OUT_TIMEOUT_MS) { val started = nowMillis() - start >= PAGE_OUT_START_MS - waiting.removeAll { val ack = acks.getValue(it); ack.length() > 0 || (started && !ack.exists()) || isGone(it) } + waiting.removeAll { val ack = acks.getValue(it); pagedOut(ack) || (started && !ack.exists()) || isGone(it) } if (waiting.isEmpty()) break sleep(PAGE_OUT_POLL_MS) } - val unacknowledged = targets.count { acks.getValue(it).length() == 0L && !isGone(it) } + val unacknowledged = targets.count { !pagedOut(acks.getValue(it)) && !isGone(it) } acks.values.forEach { it.delete() } val after = memoryKb(targets) pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + private fun pagedOut(ack: File): Boolean = try { + ack.readText().trim() == PAGE_OUT_ACK + } catch (_: IOException) { + false + } + private fun readBack() { val targets = pagedOutTargets.filterNot { isGone(it) } pagedOutTargets = emptyList() @@ -318,13 +332,15 @@ internal class SessionSuspendController( if (targets.isEmpty() || closing) return val before = memoryKb(targets).second val (total, available) = meminfoKb() - if (!readBackAllowed() || !canTake(before, total, available)) { + if (!canTake(before, total, available)) { pagedIn(0, before, before, available, 0) return } + val hold = holdFile(control) try { - control.writeText("0") + hold.writeText(READ_BACK_REQUEST) } catch (_: IOException) { + hold.delete() return } val start = nowMillis() @@ -341,6 +357,8 @@ internal class SessionSuspendController( } } catch (_: InterruptedException) { Thread.currentThread().interrupt() + } finally { + hold.delete() } pagedIn(targets.size, swap, before, available, nowMillis() - start) } @@ -456,6 +474,9 @@ internal class SessionSuspendController( const val SIGSTOP = 19 const val SIGCONT = 18 const val SIGURG = 23 + const val PAGE_OUT_ACK = "1" + const val PAGE_OUT_REQUEST = "1" + const val READ_BACK_REQUEST = "0" const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index 0a08067990..f85318b595 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -20,7 +20,7 @@ object SettingsReset { "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "integerScaling", "railLabels", "developerTools", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index df22a743f1..3c4db68c32 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -28,8 +28,6 @@ import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) -private const val MEMORY_CAP_STEP_MB = 256 - @Composable fun PerformancePage( cores: List, @@ -47,12 +45,6 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, - ramCapMb: Int, - zramClient: Boolean, - zramIdle: Boolean, - vramCapMb: Int, - deviceRamMb: Int, - ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, nativeUserland: Boolean, @@ -71,10 +63,6 @@ fun PerformancePage( onFsyncFirst: (Boolean) -> Unit, onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, - onRamCapMb: (Int) -> Unit, - onZramClient: (Boolean) -> Unit, - onZramIdle: (Boolean) -> Unit, - onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, onNativeUserland: (Boolean) -> Unit, @@ -141,32 +129,6 @@ fun PerformancePage( gpuClockPin, onChange = onGpuClockPin, ) } - SettingsGroup(stringResource(R.string.perf_memory)) { - val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) - val off = stringResource(R.string.perf_cap_off) - val auto = stringResource(R.string.perf_cap_auto) - ToggleRow( - host, "zramidle", stringResource(R.string.perf_zram_idle), - if (ramCapAvailable) stringResource(R.string.perf_zram_idle_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramIdle && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramIdle, - ) - ToggleRow( - host, "zramclient", stringResource(R.string.perf_zram_client), - if (ramCapAvailable) stringResource(R.string.perf_zram_client_hint) else stringResource(R.string.perf_ram_cap_unavailable), - zramClient && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramClient, - ) - SliderRow( - stringResource(R.string.perf_ram_cap), - if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), - ramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, enabled = ramCapAvailable, - format = { if (it == 0) off else "$it MB" }, onChange = onRamCapMb, - ) - SliderRow( - stringResource(R.string.perf_vram_cap), stringResource(R.string.perf_vram_cap_hint), - vramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, - format = { if (it == 0) auto else "$it MB" }, onChange = onVramCapMb, - ) - } SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt index 37de5eba31..8e3912e433 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -76,10 +76,6 @@ internal object SettingsIndex { s(SettingsSection.PERFORMANCE, R.string.perf_noglerror), s(SettingsSection.PERFORMANCE, R.string.perf_gsrealtime, "gamescope"), s(SettingsSection.PERFORMANCE, R.string.perf_gpuclock, "gpu", "clock", "max"), - s(SettingsSection.PERFORMANCE, R.string.perf_ram_cap, "ram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_vram_cap, "vram", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_idle, "zram", "swap", "memory"), - s(SettingsSection.PERFORMANCE, R.string.perf_zram_client, "zram", "swap", "memory"), s(SettingsSection.PERFORMANCE, R.string.setup_clear_cached, "memory", "ram", "crash", "sleep", "killed"), s(SettingsSection.PERFORMANCE, R.string.setup_bg_limit, "memory", "ram", "background apps"), s(SettingsSection.PERFORMANCE, R.string.setup_memory_hud, "memory", "ram", "overlay"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e92f6f47e2..943fa41584 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -22,7 +22,6 @@ أضف مكتبات Steam من بطاقة SD أو محرك USB أو SSD، وسيجمع DroidDeck الألعاب معًا في «المكتبة». تتيح لك «المتاجر» تسجيل الدخول إلى Epic Games وGOG وXbox وEA وBattle.net وUbisoft Connect وAmazon Games وitch.io وGame Jolt، ثم تثبيت ألعابها وتحديثها من DroidDeck. تحدّث المكوّنات مثل FEX وDXVK وVKD3D-Proton نفسها تلقائيًا، ويكون Proton Experimental ARM64 هو الافتراضي، أو Proton 11.0 ARM64 بعد تثبيت هذا الإصدار. - يحرر «ضغط Steam أثناء تشغيل لعبة» مساحة من الذاكرة في الأجهزة قليلة الذاكرة. اسحب من الحافة اليمنى للداخل لفتح قائمة الجلسة: وضع «لوحة اللمس» و«لوحة مفاتيح الكمبيوتر» و«وضع زمن الاستجابة المنخفض» وملف اللعبة والمزيد. اللعبة بطيئة؟ حدّد معدل الإطارات في الوصول السريع، ثم جرّب إصدار Proton آخر أو إعدادًا مسبقًا آخر لـ FEX في مكوّنات اللعبة. هل الصوت متقطع أو مفقود في اللعبة؟ جرّب مفتاح «DirectAudio للألعاب» في إعدادات Steam ضمن «الصوت». @@ -634,18 +633,7 @@ gamescope: طابور GPU بأولوية الوقت الفعلي يعطي الأولوية لعمل GPU الخاص بالمُركِّب. قد يحسّن انتظام الإطارات على حساب أداء الألعاب قليلًا. GPU - الذاكرة إيقاف - افتراضي برنامج التشغيل - ضغط Steam أثناء تشغيل لعبة - ضغط ذاكرة اللعبة الخاملة - يرحّل ذاكرة اللعبة الخاملة عند انخفاض RAM. أوقفه إذا كانت الألعاب تتجمد لبضع ثوانٍ كل نصف دقيقة تقريبًا. يُطبَّق عند بدء الجلسة التالية. - بعد 20 ثانية من بدء اللعبة، يُضغط عميل Steam في zRAM لترك ذاكرة أكبر للعبة، ثم يُقرأ مجددًا عند إغلاقها. أوقف هذا الخيار إذا كانت الجلسة تُغلَق بعد بدء الألعاب بقليل. يظل حد RAM أعلاه يضغط Steam عندما تتجاوزه الجلسة. - حد RAM - يُطبَّق أثناء تشغيل عميل Steam، في جلسة Steam أو من سطح المكتب. عندما تستخدم الجلسة أكثر من هذا الحد، يُضغط Steam ثم عمليات الجلسة المدعومة الأخرى في zRAM. حد مرن: لا يُغلَق شيء، لكن قد تتقطّع الألعاب أثناء استعادة الصفحات. - يتطلب مساحة تبديل zRAM، وهي غير متوفرة على هذا الجهاز. - حد VRAM - يُبلّغ ألعاب Direct3D من 9 إلى 12 بميزانية ذاكرة الفيديو هذه لتشجيع تقليل استخدامها. قد تتجاوزها الألعاب؛ لا يضيف هذا ترحيل ذاكرة GPU ولا يضمن منع الانهيار بسبب نفاد الذاكرة. يسري في الجلسة التالية. تثبيت GPU على أعلى تردد له لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة. إصلاحات الجلسة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index c754689975..1351982627 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener microcortes mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de video para reducir su uso. Los juegos pueden superarlo; no agrega paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos microcortes, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e5c8de89cb..f44b98d75d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -22,7 +22,6 @@ Добавяйте библиотеки на Steam от SD карта, USB устройство или SSD, а DroidDeck държи игрите заедно в Библиотека. Магазини ви позволява да влезете в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а после да инсталирате и обновявате техните игри от DroidDeck. Компоненти като FEX, DXVK и VKD3D-Proton се обновяват сами, а Proton Experimental ARM64 е по подразбиране, или Proton 11.0 ARM64, щом тази версия е инсталирана. - Компресиране на Steam, докато върви игра освобождава RAM на устройства с малко памет. Плъзнете навътре от десния ръб, за да отворите менюто на сесията: режим на тъчпад, Клавиатура за компютър, Режим на ниска латентност, профил на играта и други. Играта е бавна? Ограничете кадрите в Quick Access, после опитайте друга версия на Proton или друга предварителна настройка на FEX в компонентите на играта. Пращене или липсващ звук в играта? Опитайте превключвателя DirectAudio за игри в настройките на Steam, под Звук. @@ -626,18 +625,7 @@ gamescope: GPU опашка в реално време Дава приоритет на GPU работата на компоситора. Може да изглади темпото на кадрите с известна цена за игрите. GPU - Памет Изкл. - По подразбиране за драйвера - Компресиране на Steam, докато върви игра - Компресиране на неактивната памет на играта - Компресира неактивната памет на играта при малко RAM. Изключете го, ако игрите замръзват за няколко секунди приблизително на всеки половин минута. Прилага се при следващото стартиране на сесията. - 20 s след стартиране на игра клиентът на Steam се компресира в zRAM, за да остави повече памет на играта, и се прочита обратно, когато играта се затвори. Изключете, ако сесията се затваря малко след стартиране на игри. Ограничение на RAM по-горе пак компресира Steam, когато сесията го надхвърли. - Ограничение на RAM - Прилага се, докато клиентът на Steam работи, в режим Steam или от работния плот. Когато сесията използва повече от това, Steam и след това другите поддържани процеси на сесията се компресират в zRAM. Меко ограничение: нищо не се затваря, но игрите може да засичат, докато страниците се връщат. - Изисква zRAM swap, който това устройство няма. - Ограничение на VRAM - Съобщава този бюджет за видео памет на игри с Direct3D 9 до 12, за да намали използването на памет. Игрите може да го надвишат; това не добавя странициране на GPU и не гарантира защита от сривове при недостиг на памет. Прилага се от следващата сесия. Задръжте GPU на максималната му честота Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина. Корекции на сесията diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 370a0eea68..c27da890b3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -22,7 +22,6 @@ Přidejte knihovny Steamu z SD karty, USB disku nebo SSD a DroidDeck udrží hry pohromadě v Knihovně. Obchody vám umožní přihlásit se do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io a Game Jolt a pak instalovat a aktualizovat jejich hry přímo z DroidDeck. Komponenty jako FEX, DXVK a VKD3D-Proton se aktualizují samy a výchozí je Proton Experimental ARM64, případně Proton 11.0 ARM64, jakmile je tato verze nainstalovaná. - Komprimovat Steam během hry uvolní RAM na zařízeních s nedostatkem paměti. Přejetím od pravého okraje otevřete nabídku relace: režim touchpadu, Klávesnice PC, Režim nízkého zpoždění, profil hry a další. Hra běží pomalu? Omezte snímkovou frekvenci v Quick Access a zkuste jinou verzi Proton nebo jinou předvolbu FEX v komponentách hry. Praskání nebo chybějící zvuk ve hře? Zkuste přepínač DirectAudio pro hry v nastavení Steamu v části Zvuk. @@ -630,18 +629,7 @@ gamescope: fronta GPU v reálném čase Dává prioritu práci GPU kompozitoru. Může vyhladit tempo snímků na úkor her. GPU - Paměť Vypnuto - Výchozí ovladače - Komprimovat Steam během hry - Komprimovat neaktivní paměť hry - Při nedostatku RAM stránkuje neaktivní paměť hry. Vypněte to, pokud hry zhruba každou půlminutu na několik sekund zamrznou. Projeví se při příštím spuštění relace. - 20 s po spuštění hry se klient Steam zkomprimuje do zRAM, aby hře zbylo více paměti, a po zavření hry se načte zpět. Vypněte, pokud se relace krátce po spuštění her zavírá. Limit RAM výše stále komprimuje Steam, když ho relace překročí. - Limit RAM - Platí, když běží klient Steam, v režimu Steam nebo z Plochy. Když relace použije víc, zkomprimuje se do zRAM Steam a poté další podporované procesy relace. Měkký limit: nic se nezavře, ale hry mohou trhat, než se stránky načtou zpět. - Vyžaduje swap zRAM, který toto zařízení nemá. - Limit VRAM - Hlásí hrám s Direct3D 9 až 12 tento rozpočet videopaměti, aby snížily její využití. Hry jej mohou překročit; nepřidává stránkování GPU ani nezaručuje ochranu před pády kvůli nedostatku paměti. Platí od příští relace. Udržet GPU na nejvyšších taktech Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla. Opravy relace diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ea39e14dea..4eb0484c1f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -22,7 +22,6 @@ Tilføj Steam-biblioteker fra et SD-kort, et USB-drev eller en SSD, så samler DroidDeck spillene i dit Bibliotek. Butikker lader dig logge ind på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt og derefter installere og opdatere deres spil fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton opdaterer sig selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64, når den version er installeret. - Komprimer Steam, mens et spil kører frigør RAM på enheder med lidt hukommelse. Stryg ind fra højre kant for at åbne sessionsmenuen: touchpad-tilstand, PC-tastatur, Lav forsinkelse, spilprofil og mere. Kører spillet langsomt? Begræns billedfrekvensen i Hurtig adgang, og prøv så en anden Proton-version eller FEX-forudindstilling i spillets komponenter. Knitrende eller manglende lyd i spillet? Prøv kontakten DirectAudio til spil i Steam-indstillingerne under Lyd. @@ -626,18 +625,7 @@ gamescope: realtids-GPU-kø Prioriterer compositorens GPU-arbejde. Kan give jævnere billedtiming på bekostning af spillene. GPU - Hukommelse Fra - Driverstandard - Komprimer Steam, mens et spil kører - Komprimer spillets inaktive hukommelse - Pager spillets inaktive hukommelse ud, når RAM er lav. Slå det fra, hvis spil fryser i et par sekunder cirka hvert halve minut. Træder i kraft, næste gang sessionen starter. - 20 s efter et spil starter, komprimeres Steam-klienten i zRAM for at give spillet mere hukommelse, og læses tilbage, når spillet lukkes. Slå fra, hvis sessionen lukker kort efter, at spil starter. En RAM-grænse ovenfor komprimerer stadig Steam, når sessionen overskrider den. - RAM-grænse - Gælder, mens Steam-klienten kører, i Steam-tilstand eller fra skrivebordet. Når sessionen bruger mere end dette, komprimeres Steam og derefter sessionens andre understøttede processer i zRAM. En blød grænse: intet lukkes, men spil kan hakke, mens sider hentes tilbage. - Kræver zRAM-swap, som denne enhed ikke har. - VRAM-grænse - Rapporterer dette videohukommelsesbudget til Direct3D 9 til 12-spil for at mindske hukommelsesforbruget. Spil kan overskride det; dette tilføjer ikke GPU-paging og garanterer ikke beskyttelse mod nedbrud ved hukommelsesmangel. Gælder fra næste session. Hold GPU’en på dens højeste clock Kun Adreno. Færre hak, mere batteribrug og varme. Sessionsrettelser diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8b4ccd022..b60fceb58d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,7 +22,6 @@ Füge Steam-Bibliotheken von einer SD-Karte, einem USB-Laufwerk oder einer SSD hinzu, und DroidDeck hält die Spiele in deiner Bibliothek zusammen. Mit Stores meldest du dich bei Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io und Game Jolt an und installierst und aktualisierst deren Spiele direkt in DroidDeck. Komponenten wie FEX, DXVK und VKD3D-Proton aktualisieren sich selbst, und Proton Experimental ARM64 ist der Standard, oder Proton 11.0 ARM64, sobald diese Version installiert ist. - Steam komprimieren, während ein Spiel läuft gibt auf Geräten mit knappem Arbeitsspeicher RAM frei. Wische vom rechten Rand nach innen, um das Sitzungsmenü zu öffnen: Touchpad-Modus, PC-Tastatur, Modus mit geringer Latenz, Spielprofil und mehr. Das Spiel läuft langsam? Begrenze die Bildrate im Schnellzugriff und probiere dann eine andere Proton-Version oder ein anderes FEX-Preset in den Komponenten des Spiels. Knacken oder fehlender Spielton? Probiere den Schalter DirectAudio für Spiele in den Steam-Einstellungen unter Audio. @@ -626,18 +625,7 @@ gamescope: Echtzeit-GPU-Warteschlange Priorisiert die GPU-Arbeit des Compositors. Kann das Frame-Pacing glätten, kostet Spiele aber etwas Leistung. GPU - Arbeitsspeicher Aus - Treiberstandard - Steam komprimieren, während ein Spiel läuft - Inaktiven Spielspeicher komprimieren - Lagert inaktiven Spielspeicher bei knappem RAM aus. Schalte dies aus, wenn Spiele etwa jede halbe Minute für einige Sekunden einfrieren. Gilt ab dem nächsten Start der Sitzung. - 20 s nach dem Spielstart wird der Steam-Client in zRAM komprimiert, um dem Spiel mehr Speicher zu lassen, und beim Beenden des Spiels zurückgelesen. Schalte dies aus, wenn sich die Sitzung kurz nach dem Spielstart schließt. Ein RAM-Limit oben komprimiert Steam weiterhin, wenn die Sitzung es überschreitet. - RAM-Limit - Gilt, solange der Steam-Client läuft, im Steam-Modus oder vom Desktop aus. Verbraucht die Sitzung mehr als diesen Wert, werden Steam und danach die übrigen unterstützten Prozesse der Sitzung in zRAM komprimiert. Ein weiches Limit: Nichts wird geschlossen, aber Spiele können ruckeln, während Seiten zurückgeladen werden. - Benötigt zRAM-Swap, den dieses Gerät nicht hat. - VRAM-Limit - Meldet Direct3D-9-bis-12-Spielen dieses Videospeicherbudget, um den Speicherverbrauch zu senken. Spiele können es überschreiten; dies fügt kein GPU-Paging hinzu und garantiert keinen Schutz vor Abstürzen durch Speichermangel. Gilt ab der nächsten Sitzung. GPU auf höchstem Takt halten Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme. Sitzungskorrekturen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 42baf8965a..faa6c9727f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -22,7 +22,6 @@ Προσθέστε βιβλιοθήκες Steam από κάρτα SD, μονάδα USB ή SSD, και το DroidDeck κρατά τα παιχνίδια μαζί στη Βιβλιοθήκη σας. Τα Καταστήματα σάς επιτρέπουν να συνδεθείτε σε Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io και Game Jolt και μετά να εγκαθιστάτε και να ενημερώνετε τα παιχνίδια τους από το DroidDeck. Στοιχεία όπως τα FEX, DXVK και VKD3D-Proton ενημερώνονται μόνα τους, και το Proton Experimental ARM64 είναι το προεπιλεγμένο, ή το Proton 11.0 ARM64 μόλις εγκατασταθεί αυτή η έκδοση. - Η επιλογή Συμπίεση του Steam όσο τρέχει παιχνίδι ελευθερώνει RAM σε συσκευές με λίγη μνήμη. Σύρετε προς τα μέσα από τη δεξιά άκρη για να ανοίξετε το μενού συνεδρίας: λειτουργία πινακίδας αφής, Πληκτρολόγιο PC, Λειτουργία χαμηλής καθυστέρησης, προφίλ παιχνιδιού και άλλα. Το παιχνίδι τρέχει αργά; Περιορίστε τον ρυθμό καρέ στο Quick Access και δοκιμάστε άλλη έκδοση Proton ή άλλη προεπιλογή FEX στα στοιχεία του παιχνιδιού. Κροταλίσματα ή απουσία ήχου στο παιχνίδι; Δοκιμάστε τον διακόπτη DirectAudio για παιχνίδια στις ρυθμίσεις του Steam, στην ενότητα Ήχος. @@ -626,18 +625,7 @@ gamescope: ουρά GPU πραγματικού χρόνου Δίνει προτεραιότητα στην εργασία GPU του compositor. Μπορεί να εξομαλύνει τον ρυθμό καρέ με κάποιο κόστος για τα παιχνίδια. GPU - Μνήμη Ανενεργό - Προεπιλογή προγράμματος οδήγησης - Συμπίεση του Steam όσο τρέχει παιχνίδι - Συμπίεση ανενεργής μνήμης παιχνιδιού - Σελιδοποιεί την ανενεργή μνήμη του παιχνιδιού όταν η RAM είναι χαμηλή. Απενεργοποιήστε το αν τα παιχνίδια παγώνουν για λίγα δευτερόλεπτα περίπου κάθε μισό λεπτό. Ισχύει από την επόμενη έναρξη της συνεδρίας. - 20 s μετά την εκκίνηση ενός παιχνιδιού, ο πελάτης Steam συμπιέζεται στη zRAM για να μείνει περισσότερη μνήμη στο παιχνίδι, και διαβάζεται πίσω όταν το παιχνίδι κλείσει. Απενεργοποιήστε το αν η συνεδρία κλείνει λίγο μετά την εκκίνηση παιχνιδιών. Ένα όριο RAM παραπάνω εξακολουθεί να συμπιέζει το Steam όταν η συνεδρία το ξεπεράσει. - Όριο RAM - Ισχύει όσο τρέχει ο πελάτης Steam, σε λειτουργία Steam ή από την επιφάνεια εργασίας. Όταν η συνεδρία χρησιμοποιεί περισσότερη, το Steam και έπειτα οι άλλες υποστηριζόμενες διεργασίες της συνεδρίας συμπιέζονται στη zRAM. Ήπιο όριο: τίποτα δεν κλείνει, αλλά τα παιχνίδια μπορεί να κολλάνε όσο επιστρέφουν οι σελίδες. - Απαιτεί zRAM swap, που δεν υπάρχει σε αυτή τη συσκευή. - Όριο VRAM - Αναφέρει αυτόν τον προϋπολογισμό μνήμης βίντεο σε παιχνίδια Direct3D 9 έως 12 για να μειωθεί η χρήση μνήμης. Τα παιχνίδια μπορεί να τον υπερβούν· δεν προσθέτει σελιδοποίηση GPU ούτε εγγυάται προστασία από σφάλματα έλλειψης μνήμης. Ισχύει από την επόμενη συνεδρία. Διατήρηση της GPU στη μέγιστη συχνότητά της Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα. Διορθώσεις συνεδρίας diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38ada10bda..15a280bac0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -22,7 +22,6 @@ Añade bibliotecas de Steam desde una tarjeta SD, una unidad USB o un SSD, y DroidDeck mantiene los juegos juntos en tu Biblioteca. Tiendas te permite iniciar sesión en Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io y Game Jolt, y luego instalar y actualizar sus juegos desde DroidDeck. Componentes como FEX, DXVK y VKD3D-Proton se actualizan solos, y Proton Experimental ARM64 es el predeterminado, o Proton 11.0 ARM64 una vez instalada esa versión. - Comprimir Steam mientras se ejecuta un juego libera RAM en dispositivos con poca memoria. Desliza desde el borde derecho para abrir el menú de sesión: modo touchpad, Teclado de PC, Modo de baja latencia, perfil del juego y más. ¿El juego va lento? Limita la tasa de fotogramas en Quick Access y prueba otra versión de Proton o un ajuste preestablecido de FEX en los componentes del juego. ¿Audio del juego entrecortado o ausente? Prueba el interruptor DirectAudio para juegos en los ajustes de Steam, en Audio. @@ -628,18 +627,7 @@ gamescope: cola de GPU en tiempo real Da prioridad al trabajo de GPU del compositor. Puede suavizar el ritmo de fotogramas a costa de algo de rendimiento en los juegos. GPU - Memoria Desactivado - Predeterminado del controlador - Comprimir Steam mientras se ejecuta un juego - Comprimir memoria inactiva del juego - Comprime la memoria inactiva del juego cuando queda poca RAM. Desactívalo si los juegos se congelan unos segundos cada medio minuto aproximadamente. Se aplica la próxima vez que se inicie la sesión. - 20 s después de que empiece un juego, el cliente de Steam se comprime en zRAM para dejarle más memoria al juego, y se vuelve a leer cuando el juego se cierra. Desactívalo si la sesión se cierra poco después de iniciar los juegos. Un límite de RAM definido arriba sigue comprimiendo Steam cuando la sesión lo supera. - Límite de RAM - Se aplica mientras se ejecuta el cliente de Steam, en modo Steam o desde el escritorio. Cuando la sesión usa más de esto, Steam y luego los demás procesos compatibles de la sesión se comprimen en zRAM. Es un límite flexible: no se cierra nada, pero los juegos pueden tener tirones mientras se recuperan las páginas. - Requiere swap de zRAM, y este dispositivo no lo tiene. - Límite de VRAM - Informa a los juegos Direct3D 9 a 12 de este presupuesto de memoria de vídeo para reducir su uso. Los juegos pueden superarlo; no añade paginación de GPU ni garantiza evitar fallos por falta de memoria. Se aplica en la próxima sesión. Mantener la GPU a su reloj máximo Solo Adreno. Menos tirones, más consumo de batería y calor. Correcciones de sesión diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b912a7cf0b..2abc70d958 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -22,7 +22,6 @@ Lisää Steam-kirjastoja SD-kortilta, USB-asemalta tai SSD-levyltä, ja DroidDeck pitää pelit yhdessä Kirjastossasi. Kaupat-osiossa voit kirjautua sisään palveluihin Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ja Game Jolt sekä asentaa ja päivittää niiden pelejä DroidDeckistä. Komponentit, kuten FEX, DXVK ja VKD3D-Proton, päivittyvät itsestään, ja oletuksena on Proton Experimental ARM64 tai Proton 11.0 ARM64, kun kyseinen versio on asennettu. - Pakkaa Steam pelin ollessa käynnissä vapauttaa RAM-muistia laitteilla, joilla muisti on vähissä. Pyyhkäise oikeasta reunasta sisäänpäin avataksesi istuntovalikon: kosketuslevytila, PC-näppäimistö, matalan viiveen tila, pelin profiili ja muuta. Peli pyörii hitaasti? Rajoita kuvanopeutta Pikavalikossa ja kokeile sitten toista Proton-versiota tai FEX-esiasetusta pelin komponenteissa. Rätisevä tai puuttuva pelin ääni? Kokeile Steamin asetuksissa kohdassa Ääni asetusta DirectAudio peleille. @@ -626,18 +625,7 @@ gamescope: reaaliaikainen GPU-jono Priorisoi kompositorin GPU-työtä. Voi tasoittaa kuvanopeuden tahditusta pelien kustannuksella. GPU - Muisti Pois - Ajurin oletus - Pakkaa Steam pelin ollessa käynnissä - Pakkaa pelin käyttämätöntä muistia - Siirtää pelin käyttämätöntä muistia zRAMiin, kun RAM-muisti vähenee. Poista tämä käytöstä, jos pelit jäätyvät muutamaksi sekunniksi noin puolen minuutin välein. Tulee voimaan, kun istunto käynnistyy seuraavan kerran. - 20 s pelin käynnistymisen jälkeen Steam-asiakasohjelma pakataan zRAMiin, jotta pelille jää enemmän muistia, ja luetaan takaisin, kun peli sulkeutuu. Poista tämä käytöstä, jos istunto sulkeutuu pian pelien käynnistymisen jälkeen. Yllä oleva RAM-raja pakkaa silti Steamin, kun istunto ylittää sen. - RAM-raja - Koskee aikaa, jolloin Steam-asiakasohjelma on käynnissä, Steam-tilassa tai työpöydältä. Kun istunto käyttää tätä enemmän, Steam ja sen jälkeen istunnon muut tuetut prosessit pakataan zRAMiin. Pehmeä raja: mitään ei suljeta, mutta pelit voivat nykiä, kun sivuja luetaan takaisin. - Vaatii zRAM-swapin, jota tässä laitteessa ei ole. - VRAM-raja - Ilmoittaa tämän videomuistibudjetin Direct3D 9–12 -peleille muistin käytön vähentämiseksi. Pelit voivat ylittää sen; tämä ei lisää GPU-sivutusta eikä takaa suojaa muistin loppumisesta johtuvilta kaatumisilta. Tulee voimaan seuraavassa istunnossa. Pidä GPU huippukellotaajuudessaan Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä. Istunnon korjaukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c889818314..ef705ec2eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -22,7 +22,6 @@ Ajoutez des bibliothèques Steam depuis une carte SD, une clé USB ou un SSD, et DroidDeck réunit les jeux dans votre Bibliothèque. Boutiques vous permet de vous connecter à Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io et Game Jolt, puis d\'installer et de mettre à jour leurs jeux depuis DroidDeck. Les composants comme FEX, DXVK et VKD3D-Proton se mettent à jour seuls, et Proton Experimental ARM64 est la valeur par défaut, ou Proton 11.0 ARM64 une fois cette version installée. - Compresser Steam pendant un jeu libère de la RAM sur les appareils qui en manquent. Balayez depuis le bord droit pour ouvrir le menu de session : mode pavé tactile, Clavier PC, Mode faible latence, Profil du jeu et plus encore. Jeu lent ? Limitez la fréquence d\'images dans Accès rapide, puis essayez une autre version de Proton ou un autre préréglage FEX dans les composants du jeu. Audio du jeu qui grésille ou absent ? Essayez l\'option Utiliser DirectAudio pour le jeu dans les paramètres Steam, sous Audio. @@ -628,18 +627,7 @@ gamescope : file d\'attente GPU temps réel Augmente la priorité du travail GPU du compositeur. Peut améliorer la stabilité du temps de frame, mais consomme une partie des performances du jeu. GPU - Mémoire Désactivé - Valeur par défaut du pilote - Compresser Steam pendant un jeu - Compresser la mémoire inactive du jeu - Compresse la mémoire inactive du jeu quand la RAM manque. Désactivez-le si les jeux se figent quelques secondes environ toutes les trente secondes. S\'applique au prochain démarrage de la session. - 20 s après le démarrage d\'un jeu, le client Steam est compressé dans zRAM pour laisser plus de mémoire au jeu, puis relu à la fermeture du jeu. Désactivez cette option si la session se ferme peu après le démarrage des jeux. Une limite de RAM ci-dessus compresse toujours Steam lorsque la session la dépasse. - Limite de RAM - S\'applique tant que le client Steam fonctionne, en mode Steam ou depuis le bureau. Lorsque la session dépasse cette valeur, Steam puis les autres processus pris en charge de la session sont compressés dans zRAM. Limite souple : rien n\'est fermé, mais les jeux peuvent saccader pendant le rechargement des pages. - Nécessite un swap zRAM, dont cet appareil ne dispose pas. - Limite de VRAM - Signale ce budget de mémoire vidéo aux jeux Direct3D 9 à 12 pour réduire leur consommation. Les jeux peuvent le dépasser ; cela ne fournit pas de pagination GPU et ne garantit pas une protection contre les plantages par manque de mémoire. Prend effet à la prochaine session. Maintenir le GPU à sa fréquence maximale Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur. Correctifs de session diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d26bbc324c..f758c55481 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -22,7 +22,6 @@ SD कार्ड, USB ड्राइव या SSD से Steam लाइब्रेरी जोड़ें, और DroidDeck गेम को आपकी लाइब्रेरी में एक साथ रखता है। स्टोर से आप Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io और Game Jolt में साइन इन कर सकते हैं, फिर DroidDeck से उनके गेम इंस्टॉल और अपडेट कर सकते हैं। FEX, DXVK और VKD3D-Proton जैसे कॉम्पोनेंट खुद अपडेट होते हैं, और डिफ़ॉल्ट Proton Experimental ARM64 है, या वह बिल्ड इंस्टॉल होने पर Proton 11.0 ARM64। - गेम चलते समय Steam को कंप्रेस करें कम RAM वाले डिवाइस पर RAM खाली करता है। सत्र मेनू खोलने के लिए दाएँ किनारे से अंदर की ओर स्वाइप करें: टचपैड मोड, पीसी कीबोर्ड, लो लेटेंसी मोड, गेम प्रोफ़ाइल और बहुत कुछ। गेम धीमा चल रहा है? Quick Access में फ़्रेम रेट सीमित करें, फिर गेम के कॉम्पोनेंट में कोई दूसरा Proton वर्शन या FEX प्रीसेट आज़माएँ। गेम की आवाज़ में खरखराहट है या आवाज़ नहीं आ रही? Steam सेटिंग में ऑडियो के अंतर्गत गेम के लिए DirectAudio टॉगल आज़माएँ। @@ -626,18 +625,7 @@ gamescope: रीयलटाइम GPU क्यू कम्पोज़िटर के GPU काम को प्राथमिकता देता है। गेम की कुछ कीमत पर फ़्रेम पेसिंग को स्मूथ कर सकता है। GPU - मेमोरी बंद - ड्राइवर डिफ़ॉल्ट - गेम चलते समय Steam को कंप्रेस करें - गेम की निष्क्रिय मेमोरी को संपीड़ित करें - RAM कम होने पर गेम की निष्क्रिय मेमोरी को पेज करता है। अगर गेम लगभग हर आधे मिनट में कुछ सेकंड के लिए रुकते हैं, तो इसे बंद करें। अगली बार सत्र शुरू होने पर लागू होता है। - गेम शुरू होने के 20 s बाद, Steam क्लाइंट को zRAM में कंप्रेस किया जाता है ताकि गेम को ज़्यादा मेमोरी मिले, और गेम बंद होने पर वापस पढ़ा जाता है। अगर गेम शुरू होने के कुछ देर बाद सेशन बंद हो जाता है तो इसे बंद करें। ऊपर दी गई RAM सीमा पार होने पर भी Steam कंप्रेस होता है। - RAM सीमा - Steam क्लाइंट चलते समय लागू होती है, Steam मोड में या डेस्कटॉप से। जब सेशन इससे ज़्यादा इस्तेमाल करता है, तो Steam और फिर सेशन की दूसरी समर्थित प्रोसेस zRAM में कंप्रेस होती हैं। यह सॉफ़्ट सीमा है: कुछ बंद नहीं होता, लेकिन पेज वापस आते समय गेम अटक सकते हैं। - zRAM स्वैप चाहिए, जो इस डिवाइस में नहीं है। - VRAM सीमा - मेमोरी का उपयोग कम करने के लिए Direct3D 9 से 12 गेम को यह वीडियो मेमोरी बजट बताता है। गेम इसे पार कर सकते हैं; यह GPU पेजिंग नहीं जोड़ता और मेमोरी खत्म होने से क्रैश रोकने की गारंटी नहीं देता। अगले सत्र से लागू होगा। GPU को उसकी टॉप क्लॉक पर बनाए रखें सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी। सेशन फ़िक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6563b39d2d..e00b2643c9 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -22,7 +22,6 @@ Adj hozzá Steam-könyvtárakat SD-kártyáról, USB-meghajtóról vagy SSD-ről, és a DroidDeck egy helyen tartja a játékokat a Könyvtárban. Az Áruházak lehetővé teszi, hogy bejelentkezz a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io és Game Jolt szolgáltatásokba, majd telepítsd és frissítsd a játékaikat a DroidDeckből. Az olyan összetevők, mint a FEX, a DXVK és a VKD3D-Proton, maguktól frissülnek, az alapértelmezett pedig a Proton Experimental ARM64, vagy a Proton 11.0 ARM64, ha az a build telepítve van. - A Steam tömörítése játék közben RAM-ot szabadít fel a kevés memóriával rendelkező eszközökön. Húzd be az ujjad a jobb szélről a munkamenet menü megnyitásához: érintőpad mód, PC-billentyűzet, alacsony késleltetésű mód, játékprofil és más. Lassan fut a játék? Korlátozd a képkockasebességet a Gyors hozzáférésben, majd próbálj ki másik Proton-verziót vagy FEX-előbeállítást a játék összetevőiben. Ropog vagy hiányzik a játék hangja? Próbáld ki a DirectAudio a játékokhoz kapcsolót a Steam beállításaiban a Hang alatt. @@ -626,18 +625,7 @@ gamescope: valós idejű GPU-sor Előnyben részesíti a kompozitor GPU-munkáját. Egyenletesebbé teheti a képkocka-ütemezést, kisebb költséggel a játékoknak. GPU - Memória Ki - Illesztőprogram alapértéke - A Steam tömörítése játék közben - Játék inaktív memóriájának tömörítése - Kevés RAM esetén tömöríti a játék inaktív memóriáját. Kapcsold ki, ha a játékok nagyjából félpercenként néhány másodpercre lefagynak. A munkamenet következő indításakor lép érvénybe. - 20 mp-cel a játék indulása után a Steam-kliens a zRAM-ba tömörül, hogy több memória maradjon a játéknak, és a játék bezárásakor visszaolvasódik. Kapcsolja ki, ha a munkamenet röviddel a játékok indulása után bezárul. A fenti RAM-korlát akkor is tömöríti a Steamet, ha a munkamenet túllépi. - RAM-korlát - Akkor érvényes, amikor a Steam-kliens fut, Steam módban vagy az asztalról. Ha a munkamenet ennél többet használ, a Steam, majd a munkamenet többi támogatott folyamata a zRAM-ba tömörül. Puha korlát: semmi sem zárul be, de a játékok akadhatnak, amíg a lapok visszatöltődnek. - zRAM swap szükséges, amely ezen az eszközön nincs. - VRAM-korlát - Ezt a videomemória-keretet jelzi a Direct3D 9–12 játékoknak a memóriahasználat csökkentésére. A játékok túlléphetik; nem biztosít GPU-lapozást, és nem garantál védelmet a memóriahiány miatti összeomlás ellen. A következő munkamenettől érvényes. A GPU legmagasabb órajelen tartása Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés. Munkamenet-javítások diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1cc8c8a9c1..b52adf60a2 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -22,7 +22,6 @@ Tambahkan pustaka Steam dari kartu SD, drive USB, atau SSD, dan DroidDeck menyatukan semua gim di Pustaka kamu. Toko memungkinkanmu masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, dan Game Jolt, lalu memasang dan memperbarui gim mereka dari DroidDeck. Komponen seperti FEX, DXVK, dan VKD3D-Proton memperbarui diri sendiri, dan Proton Experimental ARM64 menjadi default, atau Proton 11.0 ARM64 setelah build tersebut terpasang. - Kompres Steam saat gim berjalan membebaskan RAM pada perangkat yang kekurangan memori. Geser masuk dari tepi kanan untuk membuka menu sesi: mode touchpad, Keyboard PC, Mode latensi rendah, Profil gim, dan lainnya. Gim berjalan lambat? Batasi frame rate di Akses cepat, lalu coba versi Proton lain atau preset FEX lain di komponen gim. Audio gim pecah atau tidak ada? Coba opsi DirectAudio untuk gim di pengaturan Steam pada bagian Audio. @@ -624,18 +623,7 @@ gamescope: antrean GPU realtime Memprioritaskan kerja GPU compositor. Dapat menghaluskan pacing frame dengan sedikit mengorbankan gim. GPU - Memori Nonaktif - Default driver - Kompres Steam saat gim berjalan - Kompres memori game yang tidak aktif - Mengompres memori game yang tidak aktif saat RAM rendah. Matikan jika game membeku beberapa detik kira-kira setiap setengah menit. Berlaku saat sesi dimulai berikutnya. - 20 detik setelah gim dimulai, klien Steam dikompres ke zRAM agar gim mendapat lebih banyak memori, lalu dibaca kembali saat gim ditutup. Nonaktifkan jika sesi tertutup sesaat setelah gim dimulai. Batas RAM di atas tetap mengompres Steam saat sesi melampauinya. - Batas RAM - Berlaku saat klien Steam berjalan, di mode Steam atau dari desktop. Saat sesi menggunakan lebih dari ini, Steam lalu proses lain yang didukung dalam sesi dikompres ke zRAM. Batas lunak: tidak ada yang ditutup, tetapi gim dapat tersendat saat halaman dimuat kembali. - Memerlukan swap zRAM, yang tidak dimiliki perangkat ini. - Batas VRAM - Melaporkan anggaran memori video ini ke game Direct3D 9 hingga 12 untuk mengurangi penggunaan memori. Game dapat melampauinya; ini tidak menambahkan paging GPU atau menjamin perlindungan dari crash akibat kehabisan memori. Berlaku pada sesi berikutnya. Pertahankan GPU pada clock tertingginya Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas. Perbaikan sesi diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 296ea93f8d..b8495afa08 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -22,7 +22,6 @@ Aggiungi librerie Steam da una scheda SD, un\'unità USB o un SSD, e DroidDeck tiene i giochi insieme nella tua Libreria. Negozi ti permette di accedere a Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, poi di installare e aggiornare i loro giochi da DroidDeck. I componenti come FEX, DXVK e VKD3D-Proton si aggiornano da soli, e Proton Experimental ARM64 è il predefinito, oppure Proton 11.0 ARM64 una volta installata quella build. - Comprimi Steam durante il gioco libera RAM sui dispositivi che ne hanno poca. Scorri verso l\'interno dal bordo destro per aprire il menu della sessione: modalità touchpad, Tastiera PC, Modalità bassa latenza, Profilo del gioco e altro. Il gioco è lento? Limita il frame rate in Accesso rapido, poi prova un\'altra versione di Proton o un altro preset FEX nei componenti del gioco. Audio del gioco che gracchia o manca? Prova l\'opzione DirectAudio per i giochi nelle impostazioni di Steam, sotto Audio. @@ -628,18 +627,7 @@ gamescope: coda GPU in tempo reale Dà priorità al lavoro GPU del compositor. Può rendere più regolare il frame pacing, a scapito dei giochi. GPU - Memoria Disattivo - Predefinito del driver - Comprimi Steam durante il gioco - Comprimi la memoria inattiva del gioco - Comprime la memoria inattiva del gioco quando la RAM scarseggia. Disattivalo se i giochi si bloccano per qualche secondo circa ogni mezzo minuto. Si applica al prossimo avvio della sessione. - 20 s dopo l\'avvio di un gioco, il client Steam viene compresso in zRAM per lasciare più memoria al gioco e viene riletto quando il gioco si chiude. Disattivalo se la sessione si chiude poco dopo l\'avvio dei giochi. Un limite di RAM impostato sopra comprime comunque Steam quando la sessione lo supera. - Limite RAM - Si applica mentre il client Steam è in esecuzione, in modalità Steam o dal desktop. Quando la sessione usa più di questo valore, Steam e poi gli altri processi supportati della sessione vengono compressi in zRAM. È un limite morbido: non viene chiuso nulla, ma i giochi possono scattare mentre le pagine vengono recuperate. - Richiede lo swap zRAM, che questo dispositivo non ha. - Limite VRAM - La memoria video che DXVK comunica ai giochi Direct3D, così usano meno texture. Le impostazioni DXVK del gioco hanno comunque la priorità. Si applica dalla prossima sessione. Mantieni la GPU alla frequenza massima Solo Adreno. Meno scatti, più consumo di batteria e più calore. Correzioni della sessione diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3a616a8570..fc7485bac0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -22,7 +22,6 @@ SDカード、USBドライブ、SSDからSteamライブラリを追加でき、DroidDeckはゲームをライブラリにまとめて表示します。 ストアでは、Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io、Game Joltにサインインして、DroidDeckからそれらのゲームをインストール・更新できます。 FEX、DXVK、VKD3D-Protonなどのコンポーネントは自動で更新されます。既定はProton Experimental ARM64で、Proton 11.0 ARM64がインストールされている場合はそちらになります。 - ゲーム実行中はSteamを圧縮すると、メモリが少ない端末でRAMを確保できます。 画面の右端から内側にスワイプするとセッションメニューが開きます。タッチパッドモード、PCキーボード、低遅延モード、ゲームプロファイルなどがあります。 ゲームが重い場合は、クイックアクセスでフレームレートを制限し、ゲームのコンポーネントで別のProtonバージョンやFEXプリセットを試してください。 ゲームの音が割れる、または出ない場合は、Steam設定のオーディオにある「ゲームでDirectAudioを使用」を試してください。 @@ -624,18 +623,7 @@ gamescope:リアルタイムGPUキュー コンポジタのGPU作業の優先度を上げます。フレームタイムの安定性が向上する場合がありますが、ゲームのパフォーマンスの一部を消費します。 GPU - メモリ オフ - ドライバーのデフォルト - ゲーム実行中はSteamを圧縮 - ゲームのアイドルメモリを圧縮 - RAMが少ないときにゲームのアイドルメモリを圧縮します。ゲームが30秒ごとに数秒止まる場合はオフにしてください。次回のセッション開始時に適用されます。 - ゲーム開始の20秒後、SteamクライアントをzRAMに圧縮してゲームに使えるメモリを増やし、ゲーム終了時に読み戻します。ゲーム開始直後にセッションが終了する場合はオフにしてください。上のRAM上限を設定している場合は、セッションが上限を超えるとSteamは引き続き圧縮されます。 - RAM上限 - Steamモードでもデスクトップからでも、Steamクライアントの実行中に適用されます。セッションの使用量がこの値を超えると、Steam、次にセッション内の対応する他のプロセスがzRAMに圧縮されます。ソフトな上限のため何も終了されませんが、ページの読み戻し中にゲームがカクつくことがあります。 - zRAMスワップが必要ですが、このデバイスにはありません。 - VRAM上限 - Direct3D 9~12のゲームにこのビデオメモリ予算を通知し、メモリ使用量の削減を促します。ゲームは予算を超える場合があります。GPUのページングを追加するものではなく、メモリ不足によるクラッシュの防止は保証されません。次のセッションから有効になります。 GPUを最高クロックに保つ Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。 セッション修正 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 78182d217a..9c7bf0671a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -22,7 +22,6 @@ SD 카드, USB 드라이브, SSD에서 Steam 라이브러리를 추가할 수 있으며, DroidDeck이 게임을 라이브러리에 함께 모아 줍니다. 스토어에서는 Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io, Game Jolt에 로그인하고 DroidDeck에서 해당 게임을 설치하고 업데이트할 수 있습니다. FEX, DXVK, VKD3D-Proton 같은 구성 요소는 스스로 업데이트되며, 기본값은 Proton Experimental ARM64이고 Proton 11.0 ARM64 빌드가 설치되면 그쪽이 기본값이 됩니다. - 게임 실행 중 Steam 압축은 메모리가 부족한 기기에서 RAM을 확보해 줍니다. 오른쪽 가장자리에서 안쪽으로 스와이프하면 세션 메뉴가 열립니다. 터치패드 모드, PC 키보드, 저지연 모드, 게임 프로필 등이 있습니다. 게임이 느린가요? 빠른 액세스에서 프레임 레이트를 제한한 다음, 게임의 구성 요소에서 다른 Proton 버전이나 FEX 프리셋을 시도해 보세요. 게임 소리가 지직거리거나 나오지 않나요? Steam 설정의 오디오에서 게임에서 DirectAudio 사용 토글을 시도해 보세요. @@ -624,18 +623,7 @@ gamescope: 실시간 GPU 큐 컴포지터 GPU 작업의 우선순위를 높입니다. 프레임 타임 안정성을 개선할 수 있지만 게임 성능의 일부를 소모합니다. GPU - 메모리 끄기 - 드라이버 기본값 - 게임 실행 중 Steam 압축 - 유휴 게임 메모리 압축 - RAM이 부족할 때 유휴 게임 메모리를 압축합니다. 게임이 약 30초마다 몇 초씩 멈추면 끄세요. 다음 세션을 시작할 때 적용됩니다. - 게임이 시작되고 20초 후 Steam 클라이언트를 zRAM으로 압축해 게임에 더 많은 메모리를 남기고, 게임이 종료되면 다시 읽어 들입니다. 게임 시작 직후 세션이 종료되면 이 옵션을 끄세요. 위의 RAM 제한을 설정하면 세션이 이를 초과할 때 여전히 Steam을 압축합니다. - RAM 제한 - Steam 모드나 데스크톱에서 Steam 클라이언트가 실행되는 동안 적용됩니다. 세션이 이 값보다 많이 사용하면 Steam과 세션의 다른 지원 프로세스를 차례로 zRAM으로 압축합니다. 소프트 제한이므로 종료되는 것은 없지만, 페이지를 다시 읽어 들이는 동안 게임이 끊길 수 있습니다. - zRAM 스왑이 필요하지만 이 기기에는 없습니다. - VRAM 제한 - 메모리 사용량을 줄이도록 Direct3D 9~12 게임에 이 비디오 메모리 예산을 알립니다. 게임은 예산을 초과할 수 있으며, GPU 페이징을 추가하거나 메모리 부족으로 인한 충돌 방지를 보장하지 않습니다. 다음 세션부터 적용됩니다. GPU를 최고 클럭으로 유지 Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다. 세션 수정 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 8ac9fe26ef..95bde0cbb5 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -22,7 +22,6 @@ Tambah pustaka Steam daripada kad SD, pemacu USB atau SSD, dan DroidDeck menyatukan permainan dalam Pustaka anda. Kedai membolehkan anda log masuk ke Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io dan Game Jolt, kemudian memasang dan mengemas kini permainan mereka daripada DroidDeck. Komponen seperti FEX, DXVK dan VKD3D-Proton mengemas kini sendiri, dan Proton Experimental ARM64 ialah lalai, atau Proton 11.0 ARM64 sebaik sahaja binaan itu dipasang. - Mampatkan Steam semasa permainan berjalan membebaskan RAM pada peranti yang kekurangan memori. Leret masuk dari tepi kanan untuk membuka menu sesi: mod pad sentuh, Papan kekunci PC, Mod kependaman rendah, profil permainan dan banyak lagi. Permainan berjalan perlahan? Hadkan kadar bingkai dalam Akses pantas, kemudian cuba versi Proton atau pratetap FEX lain dalam komponen permainan. Bunyi permainan berderak atau tiada? Cuba togol DirectAudio untuk permainan dalam tetapan Steam di bawah Audio. @@ -624,18 +623,7 @@ gamescope: baris gilir GPU masa nyata Mengutamakan kerja GPU compositor. Boleh melicinkan rentak bingkai dengan sedikit kos kepada permainan. GPU - Memori Mati - Lalai pemacu - Mampatkan Steam semasa permainan berjalan - Mampatkan memori permainan terbiar - Mampatkan memori permainan terbiar apabila RAM rendah. Matikan jika permainan membeku beberapa saat lebih kurang setiap setengah minit. Berkuat kuasa apabila sesi dimulakan seterusnya. - 20 s selepas permainan bermula, klien Steam dimampatkan ke dalam zRAM untuk memberi permainan lebih banyak memori, dan dibaca semula apabila permainan ditutup. Matikan ini jika sesi tertutup sejurus selepas permainan bermula. Had RAM di atas masih memampatkan Steam apabila sesi melebihinya. - Had RAM - Berkuat kuasa semasa klien Steam berjalan, dalam mod Steam atau dari desktop. Apabila sesi menggunakan lebih daripada ini, Steam dan kemudian proses lain sesi yang disokong dimampatkan ke dalam zRAM. Had lembut: tiada apa yang ditutup, tetapi permainan mungkin tersekat-sekat semasa halaman dibaca semula. - Memerlukan swap zRAM, yang tiada pada peranti ini. - Had VRAM - Melaporkan bajet memori video ini kepada permainan Direct3D 9 hingga 12 untuk mengurangkan penggunaan memori. Permainan boleh melebihinya; ini tidak menambah paging GPU atau menjamin perlindungan daripada ranap akibat kehabisan memori. Berkuat kuasa pada sesi seterusnya. Kekalkan GPU pada kelajuan tertinggi Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba. Pembetulan sesi diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index dc2dc6ec18..6c64167883 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -22,7 +22,6 @@ Legg til Steam-biblioteker fra et SD-kort, en USB-stasjon eller en SSD, så holder DroidDeck spillene samlet i Biblioteket ditt. Butikker lar deg logge inn på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io og Game Jolt, og deretter installere og oppdatere spillene deres fra DroidDeck. Komponenter som FEX, DXVK og VKD3D-Proton oppdaterer seg selv, og Proton Experimental ARM64 er standard, eller Proton 11.0 ARM64 når den versjonen er installert. - Komprimer Steam mens et spill kjører frigjør minne på enheter som har lite. Sveip inn fra høyre kant for å åpne øktmenyen: styreflatemodus, PC-tastatur, modus for lav forsinkelse, spillprofil og mer. Kjører spillet tregt? Begrens bildefrekvensen i Hurtigmeny, og prøv deretter en annen Proton-versjon eller FEX-forhåndsinnstilling i spillets komponenter. Knitrende eller manglende spillyd? Prøv bryteren DirectAudio for spill i Steam-innstillingene under Lyd. @@ -626,18 +625,7 @@ gamescope: realtime GPU-kø Prioriterer kompositørens GPU-arbeid. Kan jevne ut bildetakten, på bekostning av spillene. GPU - Minne Av - Driverstandard - Komprimer Steam mens et spill kjører - Komprimer inaktivt spillminne - Komprimerer inaktivt spillminne når RAM er lav. Slå av hvis spill fryser i noen sekunder omtrent hvert halve minutt. Trer i kraft neste gang økten starter. - 20 s etter at et spill starter, komprimeres Steam-klienten til zRAM for å gi spillet mer minne, og leses inn igjen når spillet lukkes. Slå av hvis sesjonen lukkes kort tid etter at spill starter. En RAM-grense ovenfor komprimerer fortsatt Steam når sesjonen går over den. - RAM-grense - Gjelder mens Steam-klienten kjører, i Steam-modus eller fra skrivebordet. Når sesjonen bruker mer enn dette, komprimeres Steam og deretter sesjonens andre støttede prosesser til zRAM. En myk grense: ingenting lukkes, men spill kan hakke mens sider hentes tilbake. - Krever zRAM-swap, som denne enheten ikke har. - VRAM-grense - Rapporterer dette videominnebudsjettet til Direct3D 9 til 12-spill for å redusere minnebruken. Spill kan overskride det; dette legger ikke til GPU-sideveksling og garanterer ikke beskyttelse mot krasj ved minnemangel. Gjelder fra neste økt. Hold GPU-en på toppfrekvens Bare Adreno. Færre hikk, mer batteribruk og varme. Sesjonsfikser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1ae36c1cad..1176b01733 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -22,7 +22,6 @@ Voeg Steam-bibliotheken toe vanaf een SD-kaart, USB-stick of SSD, en DroidDeck houdt de games bij elkaar in je Bibliotheek. Met Winkels log je in bij Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io en Game Jolt, en installeer en update je hun games vanuit DroidDeck. Componenten zoals FEX, DXVK en VKD3D-Proton updaten zichzelf, en Proton Experimental ARM64 is de standaard, of Proton 11.0 ARM64 zodra die build is geïnstalleerd. - Steam comprimeren terwijl een game draait maakt RAM vrij op apparaten die weinig geheugen hebben. Veeg vanaf de rechterrand naar binnen om het sessiemenu te openen: touchpadmodus, Pc-toetsenbord, modus voor lage latentie, gameprofiel en meer. Draait een game traag? Begrens de framerate in het Snelmenu en probeer dan een andere Proton-versie of FEX-preset in de componenten van de game. Kraakt de audio of ontbreekt het geluid? Probeer de schakelaar DirectAudio voor games in de Steam-instellingen onder Audio. @@ -626,18 +625,7 @@ gamescope: realtime GPU-wachtrij Geeft het GPU-werk van de compositor voorrang. Kan de framepacing gladder maken, ten koste van wat gameprestaties. GPU - Geheugen Uit - Driverstandaard - Steam comprimeren terwijl een game draait - Inactief gamegeheugen comprimeren - Comprimeert inactief gamegeheugen bij weinig RAM. Zet dit uit als games ongeveer elke halve minuut een paar seconden vastlopen. Geldt vanaf de volgende keer dat de sessie start. - 20 s nadat een game start, wordt de Steam-client in zRAM gecomprimeerd om de game meer geheugen te geven, en teruggelezen als de game sluit. Zet dit uit als de sessie kort na het starten van games sluit. Een RAM-limiet hierboven comprimeert Steam nog steeds als de sessie die overschrijdt. - RAM-limiet - Geldt terwijl de Steam-client draait, in de Steam-modus of vanaf de desktop. Als de sessie meer gebruikt dan dit, worden Steam en daarna de andere ondersteunde processen van de sessie in zRAM gecomprimeerd. Een zachte limiet: er wordt niets gesloten, maar games kunnen haperen terwijl pagina’s terugkomen. - Vereist zRAM-swap, die dit apparaat niet heeft. - VRAM-limiet - Meldt dit videogeheugenbudget aan Direct3D 9- tot 12-games om het geheugengebruik te verlagen. Games kunnen het overschrijden; dit voegt geen GPU-paging toe en garandeert geen bescherming tegen crashes door geheugentekort. Geldt vanaf de volgende sessie. GPU op hoogste kloksnelheid houden Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte. Sessiefixes diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index dd47a73b5d..da0c0e4c1f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -22,7 +22,6 @@ Dodaj biblioteki Steam z karty SD, dysku USB lub SSD, a DroidDeck zbierze gry razem w Twojej Bibliotece. Sklepy pozwalają zalogować się do Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io i Game Jolt, a następnie instalować i aktualizować ich gry z poziomu DroidDeck. Komponenty takie jak FEX, DXVK i VKD3D-Proton aktualizują się same, a domyślny jest Proton Experimental ARM64 albo Proton 11.0 ARM64, gdy ta wersja jest zainstalowana. - Kompresuj Steam podczas gry zwalnia pamięć RAM na urządzeniach, którym jej brakuje. Przesuń palcem od prawej krawędzi, aby otworzyć menu sesji: tryb touchpada, Klawiatura PC, Tryb niskiego opóźnienia, profil gry i więcej. Gra działa wolno? Ogranicz liczbę klatek w menu Szybki dostęp, a potem wypróbuj inną wersję Proton lub inny preset FEX w komponentach gry. Trzaski lub brak dźwięku w grze? Wypróbuj przełącznik DirectAudio dla gier w ustawieniach Steam w sekcji Dźwięk. @@ -630,18 +629,7 @@ gamescope: kolejka GPU czasu rzeczywistego Nadaje priorytet pracy GPU kompozytora. Może wygładzić tempo klatek kosztem części wydajności gier. GPU - Pamięć Wyłączony - Domyślny sterownika - Kompresuj Steam podczas gry - Kompresuj nieużywaną pamięć gry - Kompresuje nieużywaną pamięć gry przy małej ilości RAM. Wyłącz, jeśli gry zawieszają się na kilka sekund mniej więcej co pół minuty. Działa od następnego uruchomienia sesji. - 20 s po starcie gry klient Steam jest kompresowany do zRAM, aby zostawić grze więcej pamięci, i wczytywany z powrotem po zamknięciu gry. Wyłącz, jeśli sesja zamyka się wkrótce po starcie gier. Powyższy limit RAM nadal kompresuje Steam, gdy sesja go przekroczy. - Limit RAM - Działa, gdy działa klient Steam, w trybie Steam lub z pulpitu. Gdy sesja używa więcej, Steam, a następnie inne obsługiwane procesy sesji są kompresowane do zRAM. Miękki limit: nic nie jest zamykane, ale gry mogą się zacinać podczas wczytywania stron z powrotem. - Wymaga swapu zRAM, którego to urządzenie nie ma. - Limit VRAM - Zgłasza ten budżet pamięci wideo grom Direct3D od 9 do 12, aby ograniczyć zużycie pamięci. Gry mogą go przekroczyć; nie dodaje to stronicowania GPU ani nie gwarantuje ochrony przed awariami z powodu braku pamięci. Działa od następnej sesji. Utrzymuj GPU na najwyższym taktowaniu Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła. Poprawki sesji diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index fdb7974b59..f36d346b39 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas Steam de um cartão SD, unidade USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite iniciar sessão no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles a partir do DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton atualizam-se sozinhos, e o Proton Experimental ARM64 é o predefinido, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir o Steam durante um jogo liberta RAM em dispositivos com pouca memória. Deslize a partir do limite direito para abrir o menu da sessão: modo de painel tátil, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. O jogo está lento? Limite a taxa de fotogramas no Acesso rápido e experimente outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com estalidos ou ausente? Experimente a opção DirectAudio para jogos nas definições do Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Dá prioridade ao trabalho de GPU do compositor. Pode suavizar o ritmo de fotogramas, com algum custo para os jogos. GPU - Memória Desativado - Predefinição do controlador - Comprimir o Steam durante um jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos bloquearem durante alguns segundos aproximadamente a cada meio minuto. Aplica-se no próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar pouco depois de os jogos iniciarem. Um limite de RAM acima continua a comprimir o Steam quando a sessão o ultrapassa. - Limite de RAM - Aplica-se enquanto o cliente Steam está em execução, no modo Steam ou a partir do ambiente de trabalho. Quando a sessão utiliza mais do que isto, o Steam e depois os outros processos suportados da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem ter soluços enquanto as páginas são repostas. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Comunica este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir a utilização de memória. Os jogos podem excedê-lo; isto não adiciona paginação da GPU nem garante proteção contra falhas por falta de memória. Aplica-se na próxima sessão. Manter a GPU na frequência máxima Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d29261a8a7..bc8927ea3c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -22,7 +22,6 @@ Adicione bibliotecas da Steam de um cartão SD, pen drive USB ou SSD, e o DroidDeck mantém os jogos juntos na sua Biblioteca. Lojas permite entrar no Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io e Game Jolt, e depois instalar e atualizar os jogos deles pelo DroidDeck. Componentes como FEX, DXVK e VKD3D-Proton se atualizam sozinhos, e o Proton Experimental ARM64 é o padrão, ou o Proton 11.0 ARM64 quando essa versão estiver instalada. - Comprimir a Steam durante o jogo libera RAM em dispositivos com pouca memória. Deslize da borda direita para abrir o menu da sessão: modo touchpad, Teclado de PC, Modo de baixa latência, perfil do jogo e mais. Jogo rodando devagar? Limite a taxa de quadros no Acesso rápido e depois teste outra versão do Proton ou outra predefinição do FEX nos componentes do jogo. Áudio do jogo com chiado ou sem som? Experimente a opção DirectAudio para jogos nas configurações da Steam, em Áudio. @@ -628,18 +627,7 @@ gamescope: fila de GPU em tempo real Prioriza o trabalho de GPU do compositor. Pode suavizar o ritmo dos quadros, com algum custo para os jogos. GPU - Memória Desativado - Padrão do driver - Comprimir a Steam durante o jogo - Comprimir memória inativa do jogo - Comprime a memória inativa do jogo quando há pouca RAM. Desative se os jogos travarem por alguns segundos a cada meio minuto, aproximadamente. Vale a partir do próximo início da sessão. - 20 s após o início de um jogo, o cliente Steam é comprimido na zRAM para deixar mais memória ao jogo, e é lido de volta quando o jogo fecha. Desative se a sessão fechar logo após os jogos iniciarem. Um limite de RAM acima ainda comprime a Steam quando a sessão o ultrapassa. - Limite de RAM - Vale enquanto o cliente Steam está em execução, no modo Steam ou pela área de trabalho. Quando a sessão usa mais que isso, a Steam e depois os outros processos compatíveis da sessão são comprimidos na zRAM. Um limite flexível: nada é fechado, mas os jogos podem travar enquanto as páginas voltam. - Requer swap em zRAM, que este dispositivo não tem. - Limite de VRAM - Informa este orçamento de memória de vídeo aos jogos Direct3D 9 a 12 para reduzir o uso de memória. Os jogos podem excedê-lo; isso não adiciona paginação de GPU nem garante proteção contra falhas por falta de memória. Entra em vigor na próxima sessão. Manter a GPU no clock máximo Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor. Correções da sessão diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fff6f62692..4ef9d1d8cb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -22,7 +22,6 @@ Adaugă biblioteci Steam de pe un card SD, o unitate USB sau un SSD, iar DroidDeck păstrează jocurile împreună în Biblioteca ta. Magazine îți permite să te conectezi la Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io și Game Jolt, apoi să instalezi și să actualizezi jocurile lor din DroidDeck. Componente precum FEX, DXVK și VKD3D-Proton se actualizează singure, iar Proton Experimental ARM64 este implicit, sau Proton 11.0 ARM64 odată ce acea versiune este instalată. - Comprimă Steam cât rulează un joc eliberează RAM pe dispozitivele cu memorie puțină. Glisează dinspre marginea dreaptă ca să deschizi meniul sesiunii: mod touchpad, Tastatură de PC, Mod latență redusă, profilul jocului și altele. Jocul rulează greu? Limitează rata de cadre în Acces rapid, apoi încearcă altă versiune de Proton sau alt preset FEX în componentele jocului. Sunet de joc cu pârâituri sau lipsă? Încearcă opțiunea DirectAudio pentru jocuri din setările Steam, la Sunet. @@ -628,18 +627,7 @@ gamescope: coadă GPU în timp real Prioritizează lucrul GPU al compositorului. Poate netezi ritmul cadrelor, cu un cost pentru jocuri. GPU - Memorie Dezactivat - Implicit driver - Comprimă Steam cât rulează un joc - Comprimă memoria inactivă a jocului - Comprimă memoria inactivă a jocului când memoria RAM este redusă. Dezactivează dacă jocurile îngheață câteva secunde aproximativ la fiecare jumătate de minut. Se aplică la următoarea pornire a sesiunii. - La 20 s după pornirea unui joc, clientul Steam este comprimat în zRAM pentru a lăsa jocului mai multă memorie și este citit înapoi când jocul se închide. Dezactivează dacă sesiunea se închide la scurt timp după pornirea jocurilor. O limită RAM de mai sus tot comprimă Steam când sesiunea o depășește. - Limită RAM - Se aplică cât rulează clientul Steam, în modul Steam sau de pe desktop. Când sesiunea folosește mai mult de atât, Steam și apoi celelalte procese acceptate ale sesiunii sunt comprimate în zRAM. O limită flexibilă: nimic nu se închide, dar jocurile pot sacada cât paginile revin. - Necesită swap zRAM, pe care acest dispozitiv nu îl are. - Limită VRAM - Raportează acest buget de memorie video jocurilor Direct3D 9 până la 12 pentru a reduce utilizarea memoriei. Jocurile îl pot depăși; nu adaugă paginare GPU și nu garantează protecție împotriva blocărilor cauzate de lipsa memoriei. Se aplică din sesiunea următoare. Fixează GPU-ul la frecvența maximă Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură. Remedieri de sesiune diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c1e27d2a5a..f2005f1af4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -22,7 +22,6 @@ Добавляйте библиотеки Steam с SD-карты, USB-накопителя или SSD, и DroidDeck соберёт игры вместе в вашей «Библиотеке». «Магазины» позволяют войти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io и Game Jolt, а затем устанавливать и обновлять их игры из DroidDeck. Компоненты вроде FEX, DXVK и VKD3D-Proton обновляются сами, а по умолчанию используется Proton Experimental ARM64 или Proton 11.0 ARM64, когда эта сборка установлена. - «Сжимать Steam во время игры» освобождает ОЗУ на устройствах с нехваткой памяти. Проведите от правого края, чтобы открыть меню сеанса: режим тачпада, «Клавиатура ПК», «Режим низкой задержки», профиль игры и другое. Игра тормозит? Ограничьте частоту кадров в меню «Быстрый доступ», затем попробуйте другую версию Proton или другой пресет FEX в компонентах игры. Треск или нет звука в игре? Попробуйте переключатель «DirectAudio для игр» в настройках Steam в разделе «Аудио». @@ -630,18 +629,7 @@ gamescope: очередь GPU в реальном времени Повышает приоритет работы GPU композитора. Может улучшить стабильность времени кадра, но потребляет часть производительности игры. GPU - Память Выкл. - По умолчанию драйвера - Сжимать Steam во время игры - Сжимать неактивную память игры - Сжимает неактивную память игры при нехватке RAM. Отключите, если игры зависают на несколько секунд примерно каждые полминуты. Применяется при следующем запуске сеанса. - Через 20 с после запуска игры клиент Steam сжимается в zRAM, чтобы оставить игре больше памяти, и считывается обратно после закрытия игры. Отключите, если сессия закрывается вскоре после запуска игр. Лимит RAM выше всё равно сжимает Steam, когда сессия его превышает. - Лимит RAM - Действует, пока работает клиент Steam, в режиме Steam или с рабочего стола. Когда сессия использует больше этого значения, Steam, а затем другие поддерживаемые процессы сессии сжимаются в zRAM. Мягкий лимит: ничего не закрывается, но игры могут подтормаживать, пока страницы возвращаются. - Нужен своп zRAM, которого на этом устройстве нет. - Лимит VRAM - Сообщает играм Direct3D 9–12 этот бюджет видеопамяти для снижения её использования. Игры могут его превысить; это не добавляет подкачку памяти GPU и не гарантирует защиту от сбоев из-за нехватки памяти. Действует со следующего сеанса. Поддерживать максимальную частоту GPU Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева. Исправления сессии diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f2732a0c90..670a8019c6 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -22,7 +22,6 @@ Lägg till Steam-bibliotek från ett SD-kort, USB-minne eller SSD, så håller DroidDeck ihop spelen i ditt Bibliotek. Butiker låter dig logga in på Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io och Game Jolt och sedan installera och uppdatera deras spel från DroidDeck. Komponenter som FEX, DXVK och VKD3D-Proton uppdaterar sig själva, och Proton Experimental ARM64 är standard, eller Proton 11.0 ARM64 när den versionen är installerad. - Komprimera Steam medan ett spel körs frigör RAM på enheter med lite minne. Svep in från högerkanten för att öppna sessionsmenyn: pekplattsläge, PC-tangentbord, låg latens, spelprofil med mera. Går spelet långsamt? Begränsa bildfrekvensen i Snabbåtkomst och prova sedan en annan Proton-version eller FEX-förinställning i spelets komponenter. Knaster eller saknat ljud i spelet? Prova växlaren DirectAudio för spel i Steam-inställningarna under Ljud. @@ -626,18 +625,7 @@ gamescope: GPU-kö i realtid Prioriterar kompositorns GPU-arbete. Kan jämna ut bildtakten till viss kostnad för spelen. GPU - Minne Av - Drivrutinens standard - Komprimera Steam medan ett spel körs - Komprimera spelets inaktiva minne - Komprimerar spelets inaktiva minne när RAM-minnet är lågt. Stäng av om spel fryser några sekunder ungefär var halvminut. Gäller nästa gång sessionen startar. - 20 s efter att ett spel startat komprimeras Steam-klienten till zRAM för att ge spelet mer minne, och läses tillbaka när spelet stängs. Stäng av om sessionen stängs strax efter att spel startar. En RAM-gräns ovan komprimerar fortfarande Steam när sessionen överskrider den. - RAM-gräns - Gäller medan Steam-klienten körs, i Steam-läge eller från skrivbordet. När sessionen använder mer än detta komprimeras Steam och sedan sessionens övriga processer som stöds till zRAM. En mjuk gräns: inget stängs, men spel kan hacka medan sidor läses tillbaka. - Kräver zRAM-swap, vilket den här enheten saknar. - VRAM-gräns - Rapporterar denna videominnesbudget till Direct3D 9 till 12-spel för att minska minnesanvändningen. Spel kan överskrida den; detta lägger inte till sidväxling av GPU-minne och garanterar inte skydd mot krascher vid minnesbrist. Gäller från nästa session. Håll GPU:n på dess högsta klockfrekvens Bara Adreno. Färre hack, högre batteriförbrukning och mer värme. Sessionsfixar diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 89147a62cf..576b285e7b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -22,7 +22,6 @@ เพิ่มคลังเกม Steam จากการ์ด SD ไดรฟ์ USB หรือ SSD แล้ว DroidDeck จะรวมเกมไว้ด้วยกันใน ไลบรารี ของคุณ สโตร์ ให้คุณลงชื่อเข้าใช้ Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io และ Game Jolt แล้วติดตั้งและอัปเดตเกมของสโตร์เหล่านั้นจาก DroidDeck ได้ คอมโพเนนต์อย่าง FEX, DXVK และ VKD3D-Proton อัปเดตตัวเอง และค่าเริ่มต้นคือ Proton Experimental ARM64 หรือ Proton 11.0 ARM64 เมื่อติดตั้งบิลด์นั้นแล้ว - บีบอัด Steam ขณะเล่นเกม ช่วยเพิ่ม RAM ว่างบนอุปกรณ์ที่หน่วยความจำเหลือน้อย ปัดเข้าจากขอบขวาเพื่อเปิดเมนูเซสชัน: โหมดทัชแพด แป้นพิมพ์พีซี โหมดหน่วงเวลาต่ำ โปรไฟล์เกม และอื่น ๆ เกมช้าใช่ไหม ลองจำกัดเฟรมเรตใน Quick Access แล้วลองใช้ Proton เวอร์ชันอื่นหรือพรีเซ็ต FEX อื่นในคอมโพเนนต์ของเกม เสียงเกมแตกพร่าหรือไม่มีเสียง ลองเปิดสวิตช์ DirectAudio สำหรับเกม ในการตั้งค่า Steam ภายใต้ เสียง @@ -624,18 +623,7 @@ gamescope: คิว GPU แบบเรียลไทม์ ให้ความสำคัญกับงาน GPU ของตัวประกอบภาพก่อน อาจทำให้การเรียงเฟรมราบรื่นขึ้นโดยแลกกับประสิทธิภาพของเกมบางส่วน GPU - หน่วยความจำ ปิด - ค่าเริ่มต้นของไดรเวอร์ - บีบอัด Steam ขณะเล่นเกม - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งาน - บีบอัดหน่วยความจำเกมที่ไม่ได้ใช้งานเมื่อ RAM เหลือน้อย ปิดไว้หากเกมค้างไม่กี่วินาทีทุกประมาณครึ่งนาที มีผลเมื่อเริ่มเซสชันครั้งถัดไป - 20 วินาทีหลังเกมเริ่ม ไคลเอนต์ Steam จะถูกบีบอัดลงใน zRAM เพื่อเหลือหน่วยความจำให้เกมมากขึ้น และอ่านกลับเมื่อปิดเกม ปิดตัวเลือกนี้หากเซสชันปิดไปไม่นานหลังเริ่มเกม ขีดจำกัด RAM ด้านบนยังคงบีบอัด Steam เมื่อเซสชันใช้เกินขีดจำกัด - ขีดจำกัด RAM - มีผลขณะไคลเอนต์ Steam ทำงาน ทั้งในโหมด Steam หรือจากเดสก์ท็อป เมื่อเซสชันใช้เกินค่านี้ Steam และโปรเซสอื่นที่รองรับของเซสชันจะถูกบีบอัดลงใน zRAM ตามลำดับ เป็นขีดจำกัดแบบอ่อน: ไม่มีอะไรถูกปิด แต่เกมอาจกระตุกขณะดึงหน้าหน่วยความจำกลับมา - ต้องใช้ zRAM swap ซึ่งอุปกรณ์นี้ไม่มี - ขีดจำกัด VRAM - แจ้งงบประมาณหน่วยความจำวิดีโอนี้ให้เกม Direct3D 9 ถึง 12 เพื่อลดการใช้หน่วยความจำ เกมอาจใช้เกินงบได้ ฟีเจอร์นี้ไม่ได้เพิ่มการสลับหน้าหน่วยความจำ GPU และไม่รับประกันว่าจะป้องกันการแครชเมื่อหน่วยความจำหมด มีผลในเซสชันถัดไป ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น การแก้ไขเซสชัน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 84ccc32c35..3fe7a74c55 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -22,7 +22,6 @@ SD karttan, USB sürücüden veya SSD\'den Steam kütüphaneleri ekle; DroidDeck oyunları Kütüphane\'nde bir arada tutar. Mağazalar, Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io ve Game Jolt\'ta oturum açmanı, ardından oyunlarını DroidDeck\'ten yüklemeni ve güncellemeni sağlar. FEX, DXVK ve VKD3D-Proton gibi bileşenler kendini günceller; varsayılan Proton Experimental ARM64\'tür, Proton 11.0 ARM64 kurulduktan sonra ise o olur. - Oyun çalışırken Steam\'i sıkıştır, belleği az olan cihazlarda RAM boşaltır. Oturum menüsünü açmak için sağ kenardan içeri kaydır: dokunmatik yüzey modu, PC klavyesi, düşük gecikme, oyun profili ve daha fazlası. Oyun yavaş mı çalışıyor? Hızlı erişim\'de kare hızını sınırla, sonra oyunun bileşenlerinde başka bir Proton sürümü veya FEX ön ayarı dene. Oyun sesinde cızırtı var ya da ses yok mu? Steam ayarlarında Ses altındaki Oyunlar için DirectAudio düğmesini dene. @@ -626,18 +625,7 @@ gamescope: gerçek zamanlı GPU kuyruğu Bileştiricinin GPU işine öncelik verir. Oyunlardan biraz feda ederek kare zamanlamasını yumuşatabilir. GPU - Bellek Kapalı - Sürücü varsayılanı - Oyun çalışırken Steam\'i sıkıştır - Oyunun boşta belleğini sıkıştır - RAM azaldığında oyunun boşta belleğini sıkıştırır. Oyunlar yaklaşık her yarım dakikada birkaç saniye donuyorsa kapatın. Oturum bir sonraki başlatıldığında geçerli olur. - Oyun başladıktan 20 sn sonra oyuna daha fazla bellek kalması için Steam istemcisi zRAM\'e sıkıştırılır ve oyun kapanınca geri okunur. Oyunlar başladıktan kısa süre sonra oturum kapanıyorsa bunu kapatın. Yukarıdaki RAM sınırı, oturum onu aştığında Steam\'i yine sıkıştırır. - RAM sınırı - Steam istemcisi Steam oturumunda veya masaüstünden çalışırken uygulanır. Oturum bundan fazlasını kullandığında önce Steam, ardından oturumun desteklenen diğer işlemleri zRAM\'e sıkıştırılır. Yumuşak bir sınırdır: hiçbir şey kapatılmaz, ancak sayfalar geri yüklenirken oyunlar takılabilir. - Bu cihazda olmayan zRAM takası gerekir. - VRAM sınırı - Bellek kullanımını azaltmak için Direct3D 9–12 oyunlarına bu video belleği bütçesini bildirir. Oyunlar bütçeyi aşabilir; GPU sayfalaması eklemez veya bellek yetersizliğinden kaynaklanan çökmeleri önlemeyi garanti etmez. Sonraki oturumda geçerli olur. GPU\'yu en yüksek saat hızında tut Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma. Oturum düzeltmeleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 17d3a83830..f7354e66e2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -22,7 +22,6 @@ Додавайте бібліотеки Steam із SD-картки, USB-накопичувача чи SSD, і DroidDeck збере ігри разом у вашій «Бібліотеці». «Магазини» дають змогу увійти в Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io і Game Jolt, а потім установлювати й оновлювати їхні ігри з DroidDeck. Компоненти, як-от FEX, DXVK і VKD3D-Proton, оновлюються самі, а типовою є Proton Experimental ARM64 або Proton 11.0 ARM64, щойно цю збірку встановлено. - «Стискати Steam під час гри» звільняє оперативну пам\'ять на пристроях, яким її бракує. Проведіть від правого краю, щоб відкрити меню сеансу: режим сенсорної панелі, «Клавіатура ПК», низька затримка, профіль гри та інше. Гра гальмує? Обмежте частоту кадрів у меню «Швидкий доступ», потім спробуйте іншу версію Proton або набір налаштувань FEX у компонентах гри. Тріск або зникає звук у грі? Спробуйте перемикач «DirectAudio для ігор» у налаштуваннях Steam у розділі «Звук». @@ -630,18 +629,7 @@ gamescope: черга GPU реального часу Надає пріоритет роботі композитора на GPU. Може вирівняти темп кадрів ціною частини продуктивності ігор. GPU - Памʼять Вимк. - Типово для драйвера - Стискати Steam під час гри - Стискати неактивну пам’ять гри - Стискає неактивну пам’ять гри, коли мало RAM. Вимкніть, якщо ігри зависають на кілька секунд приблизно кожні пів хвилини. Застосовується під час наступного запуску сеансу. - Через 20 с після запуску гри клієнт Steam стискається в zRAM, щоб залишити грі більше памʼяті, і зчитується назад, коли гра закривається. Вимкніть, якщо сеанс закривається невдовзі після запуску ігор. Ліміт RAM вище все одно стискає Steam, коли сеанс його перевищує. - Ліміт RAM - Діє, поки працює клієнт Steam, у режимі Steam або з робочого столу. Коли сеанс використовує більше цього значення, Steam, а потім інші підтримувані процеси сеансу стискаються в zRAM. Мʼякий ліміт: нічого не закривається, але ігри можуть підвисати, поки сторінки повертаються. - Потрібен своп zRAM, якого на цьому пристрої немає. - Ліміт VRAM - Повідомляє іграм Direct3D 9–12 цей бюджет відеопам’яті для зменшення її використання. Ігри можуть його перевищити; це не додає підкачку пам’яті GPU й не гарантує захисту від збоїв через нестачу пам’яті. Діє з наступного сеансу. Тримати GPU на максимальній частоті Лише Adreno. Менше запинок, вища витрата заряду та нагрів. Виправлення сеансу diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 34ec1d90bc..896a787697 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -22,7 +22,6 @@ Thêm thư viện Steam từ thẻ SD, ổ USB hoặc SSD, và DroidDeck sẽ gom các game lại trong Thư viện của bạn. Cửa hàng cho phép bạn đăng nhập Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io và Game Jolt, rồi cài đặt và cập nhật game của họ ngay từ DroidDeck. Các thành phần như FEX, DXVK và VKD3D-Proton tự cập nhật, và mặc định là Proton Experimental ARM64, hoặc Proton 11.0 ARM64 khi bản dựng đó đã được cài. - Nén Steam khi game đang chạy giúp giải phóng RAM trên các thiết bị thiếu bộ nhớ. Vuốt vào từ mép phải để mở menu phiên: chế độ bàn di chuột, Bàn phím PC, độ trễ thấp, hồ sơ game và nhiều hơn nữa. Game chạy chậm? Hãy giới hạn tốc độ khung hình trong Truy cập nhanh, rồi thử phiên bản Proton khác hoặc bộ cài đặt sẵn FEX khác trong các thành phần của game. Âm thanh game bị rè hoặc mất tiếng? Hãy thử bật DirectAudio cho game trong cài đặt Steam, mục Âm thanh. @@ -624,18 +623,7 @@ gamescope: hàng đợi GPU thời gian thực Ưu tiên công việc GPU của compositor. Có thể làm nhịp khung hình mượt hơn với một phần chi phí cho game. GPU - Bộ nhớ Tắt - Mặc định của driver - Nén Steam khi game đang chạy - Nén bộ nhớ game không hoạt động - Nén bộ nhớ game không hoạt động khi RAM thấp. Tắt nếu game bị đứng vài giây khoảng mỗi nửa phút. Áp dụng từ lần khởi động phiên tiếp theo. - 20 giây sau khi game bắt đầu, client Steam được nén vào zRAM để game có thêm bộ nhớ, và được đọc lại khi game đóng. Tắt nếu phiên bị đóng ngay sau khi game bắt đầu. Giới hạn RAM ở trên vẫn nén Steam khi phiên vượt quá mức đó. - Giới hạn RAM - Áp dụng khi client Steam đang chạy, ở chế độ Steam hoặc từ desktop. Khi phiên dùng nhiều hơn mức này, Steam rồi đến các tiến trình được hỗ trợ khác của phiên sẽ bị nén vào zRAM. Giới hạn mềm: không có gì bị đóng, nhưng game có thể giật khi các trang được nạp lại. - Cần swap zRAM, thiết bị này không có. - Giới hạn VRAM - Báo ngân sách bộ nhớ video này cho các trò chơi Direct3D 9 đến 12 để giảm mức dùng bộ nhớ. Trò chơi có thể vượt ngân sách; tính năng này không bổ sung phân trang GPU hay bảo đảm tránh lỗi do hết bộ nhớ. Có hiệu lực ở phiên tiếp theo. Giữ GPU ở xung nhịp cao nhất Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn. Các bản sửa phiên diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index aa10c5ccf6..e91a58b486 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -22,7 +22,6 @@ 可添加 SD 卡、USB 驱动器或 SSD 上的 Steam 游戏库,DroidDeck 会把这些游戏集中在你的库中。 游戏商店让你登录 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然后在 DroidDeck 中安装和更新它们的游戏。 FEX、DXVK 和 VKD3D-Proton 等组件会自动更新,默认使用 Proton Experimental ARM64,安装 Proton 11.0 ARM64 后则默认使用它。 - “游戏运行时压缩 Steam”可在内存不足的设备上释放 RAM。 从右边缘向内滑动可打开会话菜单:触控板模式、PC 键盘、低延迟、游戏配置档案等。 游戏运行缓慢?先在快捷访问中限制帧率,再到游戏的组件中尝试其他 Proton 版本或 FEX 预设。 游戏音频爆音或没有声音?请在 Steam 设置的“音频”下尝试“游戏使用 DirectAudio”开关。 @@ -624,18 +623,7 @@ gamescope:实时 GPU 队列 优先处理合成器的 GPU 工作。可平滑帧节奏,但会牺牲部分游戏性能。 GPU - 内存 关闭 - 驱动默认 - 游戏运行时压缩 Steam - 压缩游戏闲置内存 - RAM 较低时压缩游戏闲置内存。如果游戏大约每半分钟卡顿几秒,请关闭此项。下次启动会话时生效。 - 游戏启动 20 秒后,Steam 客户端会被压缩到 zRAM 中,为游戏腾出更多内存,并在游戏关闭时读回。如果会话在游戏启动后不久就关闭,请关闭此选项。设置了上方的 RAM 上限时,会话超出上限后仍会压缩 Steam。 - RAM 上限 - 在 Steam 客户端运行时生效,无论是 Steam 模式还是从桌面启动。会话使用量超过此值时,会先将 Steam、再将会话中其他受支持的进程压缩到 zRAM。这是软上限:不会关闭任何进程,但在页面读回时游戏可能卡顿。 - 需要 zRAM 交换空间,但此设备不支持。 - VRAM 上限 - 向 Direct3D 9 至 12 游戏报告此显存预算,以促使游戏减少内存使用。游戏可能超出预算;此功能不提供 GPU 分页,也不保证避免内存不足导致的崩溃。下次会话生效。 把 GPU 锁定在最高频率 仅限 Adreno。卡顿更少,但更耗电、更发热。 会话修复 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d86325fe04..25a9d22aea 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 優先處理合成器的 GPU 工作。可令幀間隔更平穩,但會犧牲少許遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果會話在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,會話仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當會話的用量超過此值時,會先將 Steam、再將會話中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但此裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲報告此顯存預算,以促使遊戲減少記憶體用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免因記憶體不足而崩潰。下次工作階段生效。 讓 GPU 保持最高頻率 只限 Adreno。減少卡頓,但更耗電、更發熱。 會話修正 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index cb8df3aec8..66a0480c55 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -22,7 +22,6 @@ 可加入 SD 卡、USB 隨身碟或 SSD 上的 Steam 遊戲庫,DroidDeck 會把這些遊戲集中在你的收藏庫中。 「遊戲商店」讓你登入 Epic Games、GOG、Xbox、EA、Battle.net、Ubisoft Connect、Amazon Games、itch.io 和 Game Jolt,然後在 DroidDeck 中安裝和更新它們的遊戲。 FEX、DXVK 和 VKD3D-Proton 等元件會自動更新,預設使用 Proton Experimental ARM64,安裝 Proton 11.0 ARM64 後則預設使用它。 - 「遊戲執行時壓縮 Steam」可在記憶體不足的裝置上釋放 RAM。 從右邊緣向內滑動可開啟工作階段選單:觸控板模式、電腦鍵盤、低延遲、遊戲設定檔等。 遊戲執行緩慢?先在快速存取中限制影格率,再到遊戲的元件中嘗試其他 Proton 版本或 FEX 預設。 遊戲音訊爆音或沒有聲音?請在 Steam 設定的「音訊」下嘗試「遊戲使用 DirectAudio」開關。 @@ -624,18 +623,7 @@ gamescope:即時 GPU 佇列 提高合成器 GPU 工作的優先順序。可能改善影格時間穩定性,但會佔用一部分遊戲效能。 GPU - 記憶體 關閉 - 驅動程式預設值 - 遊戲執行時壓縮 Steam - 壓縮遊戲閒置記憶體 - RAM 偏低時壓縮遊戲閒置記憶體。如果遊戲大約每半分鐘凍結幾秒,請關閉此項。下次啟動工作階段時生效。 - 遊戲啟動 20 秒後,Steam 用戶端會被壓縮到 zRAM,為遊戲騰出更多記憶體,並在遊戲關閉時讀回。如果工作階段在遊戲啟動後不久就關閉,請關閉此選項。若超過上方的 RAM 上限,工作階段仍會壓縮 Steam。 - RAM 上限 - 在 Steam 用戶端執行時生效,無論是 Steam 模式或從桌面啟動。當工作階段的用量超過此值時,會先將 Steam、再將工作階段中其他受支援的程序壓縮到 zRAM。這是軟性上限:不會關閉任何程式,但在分頁讀回時遊戲可能會卡頓。 - 需要 zRAM 交換空間,但這部裝置沒有。 - VRAM 上限 - 向 Direct3D 9 至 12 遊戲回報此顯示記憶體預算,以促使遊戲減少記憶體使用量。遊戲可能超出預算;此功能不提供 GPU 分頁,也不保證避免記憶體不足造成的當機。下次工作階段生效。 讓 GPU 保持最高頻率 僅適用於 Adreno。卡頓更少,但耗電和發熱更多。 工作階段修復 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e697c0bb00..c72a92b84b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -49,7 +49,6 @@ Add Steam libraries from an SD card, USB drive or SSD, and DroidDeck keeps the games together in your Library. Stores lets you sign in to Epic Games, GOG, Xbox, EA, Battle.net, Ubisoft Connect, Amazon Games, itch.io and Game Jolt, then install and update their games from DroidDeck. Components like FEX, DXVK and VKD3D-Proton update themselves, and Proton Experimental ARM64 is the default, or Proton 11.0 ARM64 once that build is installed. - Compress Steam while a game runs frees RAM on devices that run low. Swipe in from the right edge to open the session menu: touchpad mode, PC keyboard, low latency, game profile and more. Game running slow? Cap the frame rate in Quick Access, then try another Proton version or FEX preset in the game\'s components. Crackling or missing game audio? Try the DirectAudio for games toggle in Steam settings under Audio. @@ -654,18 +653,7 @@ gamescope: realtime GPU queue Prioritizes the compositor\'s GPU work. Can smooth frame pacing at some cost to games. GPU - Memory Off - Driver default - Compress Steam while a game runs - Compress idle game memory - Pages out idle game memory when RAM is low. Turn this off if games freeze for a few seconds about every half minute. Applies the next time the session starts. - Compresses Steam while a game runs, starting sooner when memory is tight. Steam is read back after the game closes once enough RAM is available. Turn this off if the session closes shortly after games start. A RAM cap above still compresses Steam when the session goes over it. - RAM cap - Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back. - Needs zRAM swap, which this device does not have. - VRAM cap - Reports this video memory budget to Direct3D 9 to 12 games to encourage lower memory use. Games may exceed it; this does not add GPU paging or guarantee protection from out-of-memory crashes. Takes effect at the next session. Hold the GPU at its top clock Adreno only. Fewer hitches, more battery use and heat. Session fixes diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 7d2087f6fc..66b68631f4 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -35,7 +35,8 @@ class SessionSuspendControllerTest { val urgent = fixture.signals.filter { it.signal == URG } assertEquals(listOf(GAME), urgent.map { it.pid }) assertTrue(fixture.signals.indexOfFirst { it.signal == URG } < fixture.signals.indexOfFirst { it.signal == STOP }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) + assertEquals("0", fixture.control.readText()) assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) assertEquals(0, fixture.unacknowledged) assertTrue(fixture.game.threads.all { it.state == 't' }) @@ -56,6 +57,22 @@ class SessionSuspendControllerTest { assertEquals(0, fixture.unacknowledged) } + @Test fun aTrimAcknowledgementIsNotTakenForAFinishedPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + val ack = File(fixture.control.parentFile, ".dd-zram.ack.$GAME") + var stoppedEarly = false + fixture.afterSleep = { + if (fixture.now == 3000L) fixture.handlerStalls = false + if (fixture.handlerStalls && fixture.signals.any { it.signal == URG }) ack.writeText("4096") + if (fixture.handlerStalls && fixture.signals.any { it.signal == STOP }) stoppedEarly = true + } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(stoppedEarly) + assertEquals(0, fixture.unacknowledged) + } + @Test fun replacedHandlerIsNotWaitedForPastTheStartWindow() { val fixture = fixture(17) fixture.control.writeText("0") @@ -107,6 +124,17 @@ class SessionSuspendControllerTest { assertEquals(1, fixture.pagedIn.size) } + @Test fun theMonitorIsHeldOffWhilePagingOutAndReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + val hold = File(fixture.control.parentFile, ".dd-zram.hold") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + assertFalse(hold.exists()) + fixture.controller.resume { assertTrue(it) } + assertFalse(hold.exists()) + assertEquals(listOf("1", "0"), fixture.held) + } + @Test fun noReadBackAfterAFreezeWithoutPageOut() { val fixture = fixture(17) fixture.control.writeText("0") @@ -116,6 +144,18 @@ class SessionSuspendControllerTest { assertTrue(fixture.pagedIn.isEmpty()) } + @Test fun aTrimRequestInTheControlFileDoesNotReplaceThePageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { fixture.control.writeText("2 4096\n") } + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertEquals(listOf("1", "0"), fixture.held) + assertEquals("2 4096\n", fixture.control.readText()) + assertEquals(listOf(Triple(1, 1_000_000L, 3_000_000L)), fixture.pagedOut) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + } + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { val fixture = fixture(17) fixture.control.writeText("0") @@ -124,7 +164,7 @@ class SessionSuspendControllerTest { val before = fixture.signals.size fixture.controller.resume { assertTrue(it) } assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) + assertEquals(listOf("1"), fixture.held) assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } @@ -151,18 +191,6 @@ class SessionSuspendControllerTest { assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) } - @Test fun noReadBackWithARamCap() { - val fixture = fixture(17) - fixture.control.writeText("0") - fixture.readBackAllowed = false - fixture.controller.freeze(pageOut = true) { assertTrue(it) } - val before = fixture.signals.size - fixture.controller.resume { assertTrue(it) } - assertFalse(fixture.signals.drop(before).any { it.signal == URG }) - assertEquals("1", fixture.control.readText()) - assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) - } - @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { val fixture = fixture(17) fixture.control.writeText("0") @@ -170,7 +198,7 @@ class SessionSuspendControllerTest { fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertFalse(fixture.signals.any { it.signal == STOP }) assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(1, fixture.pagedIn.single().first) assertEquals(0L, fixture.pagedIn.single().second) assertTrue(fixture.pagedIn.single().third > 0L) @@ -183,7 +211,7 @@ class SessionSuspendControllerTest { fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } fixture.controller.freeze(pageOut = true) { assertFalse(it) } assertEquals(2, fixture.signals.count { it.signal == URG }) - assertEquals("0", fixture.control.readText()) + assertEquals(listOf("1", "0"), fixture.held) assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) } @@ -467,6 +495,7 @@ class SessionSuspendControllerTest { val groups = mutableListOf(root, game) val helpers = mutableListOf() val signals = mutableListOf() + val held = mutableListOf() var rootPid = ROOT var now = 0L var audioSuspends = 0 @@ -486,7 +515,6 @@ class SessionSuspendControllerTest { val pagedIn = mutableListOf>() var availableKb = 8_000_000L var totalKb = 16_000_000L - var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false @@ -506,7 +534,6 @@ class SessionSuspendControllerTest { pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, - readBackAllowed = { readBackAllowed }, pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) @@ -514,6 +541,8 @@ class SessionSuspendControllerTest { private fun signal(pid: Int, signal: Int) { signals += SentSignal(pid, signal) + val request = if (signal == URG) File(control.parentFile, "${control.name}.hold").takeIf { it.isFile }?.readText() else null + if (signal == URG) held += request val group = groups.first { it.pid == pid } if (signal == STOP) { continuing = false @@ -522,7 +551,7 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true + if (request == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { if (clockAtContinue == null && clock.isFile) { clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long diff --git a/docs/development/low-memory.md b/docs/development/low-memory.md index 434aa22679..218d1fd8e9 100644 --- a/docs/development/low-memory.md +++ b/docs/development/low-memory.md @@ -1,42 +1,121 @@ -# Low-memory reclaim and userspace compression +# Automatic memory management -The Steam session monitor uses the existing `libddsession.so` page-out request to reclaim -private anonymous launcher memory. The default remains a request 20 seconds after game focus, -with five minutes between requests. With client compression enabled, low system headroom can -also trigger a request while a game is loading, before its first focused window. +The Steam session keeps enough memory free on its own. There are no memory settings: the +session monitor in `droiddeck-session` measures how much memory is available and how fast it is +being taken, and compresses just enough idle memory into zRAM to stay ahead of it. -Every five seconds the monitor reads `MemAvailable`, swap headroom and memory PSI. Low -headroom means less than one fifth of total RAM (bounded to 512–1536 MiB), or at least 1% -`some avg10` memory stall with less than one third of RAM available. Pressure requests target -only the launcher processes already recognized by the monitor, never the game. They require -at least 128 MiB launcher RSS and enough free swap to cover its anonymous RSS while leaving -one fifth of swap (at least 256 MiB) free. File-backed resident pages do not consume this -budget: the page-out helper targets private anonymous mappings. If `RssAnon` is absent from a -process's status, its full RSS is used instead. The regular automatic client request uses the -same swap guard. An explicit session RAM cap retains its existing behavior. +## What the monitor measures -Pressure requests are at least 30 seconds apart. Reclaiming less than 16 MiB doubles the -retry delay, up to five minutes. After game exit, speculative launcher readback is deferred -until the session is under any explicit RAM cap, pressure has subsided, and available RAM -can cover twice the launcher's swap while leaving the headroom reserve. Normal demand paging -continues while readback is deferred; Steam does not have to wait for the monitor to recover. -The same readback runs while the game is still running once the client has been in front of it -for five seconds (a game stuck on a black screen and left through Steam, or a long stay in the -Steam menu), under the same memory checks and only without an explicit RAM cap. Missing or -unreadable focus data never counts as the client in front. Demand paging -alone left the Steam library and menus blank for about half a minute in that case. The -client is compressed again 20 seconds after the game is back in front. -Missing memory counters disable automatic pressure reclaim and speculative readback. Missing -PSI alone still permits the `MemAvailable` fallback. No root settings, swap sizes, compression -algorithms, Android process priorities or game-specific settings are changed. +Each pass reads four things: + +- `MemAvailable` from `/proc/meminfo`. +- The fall rate: how much `MemAvailable` dropped since the last pass, plus what the monitor + itself freed in between, per second. A peak decays by a quarter per pass, so one burst keeps + the monitor alert for a few seconds without holding it there. +- Memory stall: the change in the `some` total of `/proc/pressure/memory`, as a percentage of + the time between passes. A missing PSI file reads as no stall. +- zRAM room and saving: free space on the zRAM swap devices in `/proc/swaps` after a reserve + of one eighth of zRAM (at least 128 MiB), and the measured saving per compressed byte from + `/sys/block/zram0/mm_stat` (bounded to 1.2:1–6:1, 2.5:1 before 64 MiB has been stored). + Disk swap is not counted as room: paging to storage is what causes long stalls. + +The monitor sleeps five seconds between passes while more than two fifths of RAM is available +and memory is steady, and one second otherwise. + +## Levels + +| Level | Value | Meaning | +| --- | --- | --- | +| Floor | one eighth of RAM, bounded to 640–1280 MiB | Below this the system is close to killing the session. `lmkd` ended a session on a 7.5 GiB device with 490 MiB available. | +| Target | floor + ten seconds of the fall rate | Where the monitor wants available memory to stay. | +| Burst | two seconds of the fall rate, when that is at least 64 MiB and less than two fifths of RAM is available | Memory that will be taken before the next passes can react. | + +The amount to free is the distance to the target or the burst, whichever is larger. The hard +part of it is what available memory is short of the floor, and nothing when it is above. With +a memory stall of at least 1% the hard part is two seconds of the fall rate when that is +larger, whatever the size of the fall and however much memory is available. + +## What gets compressed, in order + +1. The Steam client and hidden launchers, while a game is running and the client is not known + to be in front (unreadable focus data counts as not in front), or at any time when there is + a hard need. Without a hard need the client is left alone for 30 seconds after + it was read back. +2. Processes of the session that loaded `libddsession.so` (the game, Wine and its services), + largest first, only for the hard part that the client did not cover. One pass moves at + most 256 MiB. + +Both use the preload's cold-only request (`2 `): each process pages out only memory it has +not touched recently and stops at the budget, so memory in use stays in RAM and is not read +straight back. The budget is the amount to free divided by the measured saving, limited to the +zRAM room. With less than half the floor available the request ignores heat (`3 `), moves +up to 1 GiB, and runs at most once every ten seconds. + +Two things keep memory from going in and out of zRAM. The preload remembers each 1 MiB chunk +it paged out: when a quarter or more of those pages are resident again at the next visit, the +chunk is hot and is passed over for the next 64 visits, then 128, then 255. And the monitor +reads `pswpin` from `/proc/vmstat`: what was read back from swap, fading over half a minute, +is taken off what one pass may move (1 GiB in all, at most 256 MiB of it from the session). A device +whose working set does not fit therefore stops being trimmed and is left to the kernel, until +the forced level is reached. + +A pass that gives back less than a quarter of what the floor is short by is followed by a wait: +five seconds, doubling after each such pass up to a minute. The wait ends early when available +memory drops another eighth of the floor or reaches the forced level, and is forgotten after a +pass that gives back enough or once nothing is needed. + +Requests go to one process at a time. The monitor waits for that process's acknowledgement +(the kB it paged out) before the next, reads `MemAvailable` again, and stops once the budget is +met or available memory is back at the level the pass was started for. A process that has not +started within half a second, or has not finished when the pass (client and session together) +has waited five seconds in total or six seconds have gone by since it began, is skipped for a +minute, and a late answer from it is discarded. A process is known by its number and start time, so a new process that got the +number of a skipped one is asked. Processes with less +than 8 MiB of anonymous memory are skipped. While the app pages the session out for suspend, or +reads it back on resume, it holds the monitor off with `/tmp/.dd-zram.hold` and writes its own +request (`1` to page out, `0` to read back) into that file. A signalled process reads the hold +file first and the control file only when the hold file is missing or empty, so a trim request +the monitor wrote at the same moment cannot replace the app's. The suspend page-out answers `1` +in `/tmp/.dd-zram.ack.` and a trim answers its kB in `/tmp/.dd-zram.trim.`, so the +monitor never removes or reads an answer the app is waiting for, and the app never takes a +trim's answer for its own. A trim budget smaller than a chunk covers the stretch of the chunk +that holds that many resident pages, and the next request continues from where it ended. With less than 64 MiB of zRAM room nothing is requested and the +session log says so once a minute. + +With no shortage nothing is compressed. A game that fits in memory is never touched, and Steam +is no longer compressed on a timer. + +## Reading the client back + +Once the client has been compressed, it is read back in one request when the game has exited, +or the client has been in front of the game for five seconds, and at least 30 seconds have +passed since the last request, and available memory covers the client's swap plus the target +and the floor. Missing or unreadable focus data never counts as the client in front. Demand +paging alone left the Steam library and menus blank for about half a minute in that case. +Suspending the session while it is asleep, hidden or the screen is off still pages everything +out, and resuming reads it back when available memory is at least twice what those processes +have in swap at that moment and, after it, 1 GiB or a tenth of RAM, whichever is larger, stays +available. + +## Threads + +Page-out never runs on a thread of the game. The preload's signal handler only wakes its +`zr-worker` thread, which does the `madvise` calls. A forked process +without a worker trims inline in steps of at most 32 MiB per request and looks at no more +than 512 MiB of its address space each time. The page-out for a suspend and the read-back +after it are not limited there: they run once, while the process is being stopped or +started, and cover all of it. The monitor is a +shell loop in the session, outside every game process. + +The session log gets a line once at least 16 MiB has moved since the last one, at most every +five seconds: +`memory: available N MB, falling N MB/s, compressed N MB of the client and N MB of the session`. + +No root settings, swap sizes, compression algorithms, Android process priorities or +game-specific settings are changed. + +## Measurements behind the levels -A bounded live test of the pressure helper on the FIT during Caravan SandWitch loading -requested page-out at 20:52:37 UTC, 18 seconds before the installed timed reclaimer. Aggregate -launcher RSS fell from 608 to 283 MiB across that request; this is summed process RSS, not a -measurement of net physical RAM saved. The game reached its main menu at 60 FPS. The test ran -the candidate monitor functions alongside the old APK's monitor, not a newly built APK; -the old monitor's later request is visible separately at 20:52:55 in the session log. This -does not establish gameplay performance or resolve Stellar Blade's larger memory failure. Continuing an existing Caravan save reproduced a whole-session low-memory kill with the pressure helper running. Android recorded `ApplicationExitInfo` reason `LOW_MEMORY`, and @@ -49,39 +128,6 @@ reduced aggregate launcher RSS only from 263 to 255 MiB and backed off. Thus lau does not resolve this load failure, and this run did not exhaust swap. The unevictable/shmem growth needs allocation attribution before treating it as a driver or GPU-memory diagnosis. -## Pressure reclaim: compressing idle game memory - -The monitor also compresses the game session itself when observed pressure approaches the -system kill boundary. There is no RAM-size gate. The trigger is absolute real headroom, not a -percentage: Android's `lmkd` killed a session on a 7.5 GiB device with -490 MiB still available, so a 95% used threshold (about 400 MiB left on 8 GB) is already past the -kill. A world load added 1 GiB of GPU memory in about ten seconds, and compressing 1.4 GiB took -2.6 seconds, so the request has to leave room for both. - -Performance > Compress idle game memory turns this off (`DD_ZRAM_IDLE=0`); launcher compression -and the RAM cap are unaffected. - -The session request runs when real headroom falls below a quarter of RAM (bounded to -768–2560 MiB), or below one and a half times that with at least 1% `some` or `full avg10` -memory stall. Real headroom subtracts positive growth in KGSL allocation, `Unevictable`, and -`Shmem` from `MemAvailable`; a rapid fall also qualifies below twice the headroom or two fifths of RAM, whichever is larger (a 15 GB Thor Max was killed with 5.3 GB still available while memory fell about 400 MB per tick). The monitor -may first request page-out of idle Steam and hidden launchers, subject to the Performance -setting and client reclaim limits. When both qualify, both requests are sent before waiting -for either to complete, so a slow launcher acknowledgement does not delay the game request. Until the client -request finishes, its anonymous RSS remains reserved from the session's swap budget. Completion -and backoff are measured against the processes that received each request, even if a later scan -finds different processes. The session request targets processes that loaded -`libddsession.so`: the game, Wine and its services, and excludes Steam and hidden launchers. -Requests are at least 30 seconds apart and need the same -swap reserve as launcher requests. When the session has read back more than half of what the -previous request compressed, that memory is in use: the request is skipped and the wait doubles, -up to five minutes. A completed request must also raise `MemAvailable` by at least one -sixteenth of the tier headroom, with a 16 MiB minimum; otherwise the same wait doubles because -the pass did not provide meaningful system headroom. A request whose memory stayed compressed or -whose available memory recovers resets the wait to 30 seconds. Below half the headroom the wait -is ignored and only the 30-second spacing applies, so critical pressure can still trigger a -request. The state resets when the game exits. - Measured on a Retroid Pocket Duo (7.5 GiB, kernel 6.6, 6 GiB lzo-rle zram plus a 4 GiB swap file) entering the world in World of Warcraft: Forever, one run each: @@ -99,20 +145,6 @@ allocation, not swap capacity. Little Nightmares at the same settings compressed the following minute at its menu and 440 MiB while loading the next area; frame rate stayed at 44–46 FPS with one or two short frame-time spikes. These are single runs, not averages. -On the PR build without any manual step, the monitor compressed WoW before character select and -again during the load; the game entered the world and stayed there at 33 FPS. Once in the world, -available memory settled near 1 GiB, under the headroom, and the first version of the policy -compressed 200–400 MiB every 30 seconds while the game read back about 15 MiB/s. The -read-back check therefore compares against the last request instead of all compressed memory. - -A second run on that build showed the trigger arriving too late: character select sat at -1.5–1.6 GiB available, just above the original one-fifth headroom, so nothing was compressed -there. During the load, available memory crossed the headroom 9 seconds after Enter World, but the -launcher check ran first and waited 12 seconds for acknowledgements; the game request started at -21 seconds, moved about 200 MiB, and `lmkd` ended the session at 30 seconds. The quarter-of-RAM -level starts reclaim earlier. Sending both requests before waiting removes the launcher -acknowledgement delay; it does not guarantee that reclaim can keep up with every loading peak. - Without root an app cannot write its memory cgroup's `memory.reclaim` (owned by `system`), `process_madvise` on another process returns `EPERM`, `PAGEMAP_SCAN` is absent before Linux 6.7, and KGSL's per-process GPU reclaim `state` is root-only. Page-out therefore runs inside each diff --git a/docs/development/vram-budget.md b/docs/development/vram-budget.md deleted file mode 100644 index 8877bd7bf3..0000000000 --- a/docs/development/vram-budget.md +++ /dev/null @@ -1,28 +0,0 @@ -# Reported video memory budget - -The Performance VRAM setting enables `VK_LAYER_DROIDDECK_vram_cap` for games and reports smaller device-local `VK_EXT_memory_budget` budgets. DXVK exposes these through DXGI's `QueryVideoMemoryInfo`, including to D3D12 games using DXVK's DXGI alongside vkd3d-proton. Games that consult this budget can choose smaller working sets. The driver still supplies real heap sizes, usage figures, memory types, and actual allocation results. DXVK also receives `dxgi.maxDeviceMemory` and `dxgi.maxSharedMemory`, which separately reduce the adapter's advertised dedicated and shared video memory (on a single-heap GPU DXVK reports the heap as both, so a game adding the two would otherwise still see the whole heap as shared), and, for caps below DXVK's 4096 MiB D3D9 default, `d3d9.maxAvailableMemory`, which caps the texture memory DXVK's D3D9 frontend reports, since D3D9 games do not read the DXGI setting. Higher caps leave the D3D9 setting alone so DXVK's lower per-game limits still apply. OpenGL games are not covered. A lower driver budget remains lower; the layer never increases it. - -This does not make vkd3d-proton automatically enforce the selected budget. In the [upstream allocator inspected during this investigation](https://github.com/HansKristian-Work/vkd3d-proton/blob/865b12ba0cc20796b3709397ce5d6d3b8a205b04/libs/vkd3d/memory.c), `heapBudget` is used for diagnostic reporting, while the [DXVK adapter](https://github.com/doitsujin/dxvk/blob/cf0a0d90f8965147741ad17dcd0b263817572ab3/src/dxgi/dxgi_adapter.cpp) returns the Vulkan budget to applications. Seeing a smaller budget in a VKD3D log verifies reporting, not reduced allocation or eviction. - -This is a budget hint, not a physical reservation or a GPU paging implementation. Games may exceed it. On UMA hardware, host-visible Vulkan allocations can share the same device-local heap as textures. Rejecting every allocation above a fixed total can therefore break required upload buffers and other allocations, rather than make a game reduce its texture pool. The layer does not intercept `vkAllocateMemory` or `vkFreeMemory`, and preserves the real heap size so individual allocations larger than the budget remain Vulkan-valid. - -The layer activates only with `DROIDDECK_VRAM_CAP=1` and a positive `DROIDDECK_VRAM_CAP_MB`. With the Performance setting on Auto, the game environment does not enable it. Explicit DXVK configuration remains available, while the Vulkan layer also covers D3D12 and games that replace their DXVK configuration. - -## Physical investigation - -On an 8 GB Pocket FIT Elite with DD Turnip 0.4.0, Proton 11-12.1, and Caravan SandWitch build 25301828: - -- A native Vulkan probe reported a device-local heap of 5,650,776,064 bytes. All exposed memory types used the same device-local UMA heap. The initial implementation clamped both heap and budget to 2048 MiB; the revised layer preserves heap capacity and clamps only the budget. -- The initial hard allocation cap caused the existing save to fail a required 603,979,776-byte D3D12 allocation. Android survived, but the game crashed. Discord testers also reported crashes after reaching the cap in Fallout 76. -- In the initial test with allocation rejection disabled, vkd3d-proton logged the smaller 2048 MiB heap and budget. Caravan still exhausted system memory while loading the save. A reported budget alone does not solve this workload. -- DX11 loaded the same save and supported movement around the station at approximately 60 FPS for more than five minutes, both with and without the reported budget layer. Graphics settings were unchanged. This establishes a renderer workaround, not proof that the layer solved Caravan's OOM. -- The final release-signed APK, preserving real heap size and clamping only the budget to 2048 MiB, also passed more than five minutes of loaded-save DX11 movement. D3D12 with the same budget still exhausted system memory. -- Launching D3D12 through `droiddeck-proton-run --app` without the Linux Steam client reached the loaded save and allowed movement, then Android killed the session for low memory. Removing the client footprint alone was insufficient. - -A separate Windows DXGI query probe on a **12 GB AYN Thor** with the same APK and Proton queried the adapter without allocating game resources. With the layer disabled, dedicated video memory was 8,858,370,048 bytes and the local budget was 5,656,018,944 bytes. Enabling only the layer at 2048 MiB preserved that dedicated-memory value and changed the local and UMA non-local budgets to 2,147,483,648 bytes. Adding the existing `DXVK_CONFIG="dxgi.maxDeviceMemory = 2048"` setting also lowered advertised dedicated memory to 2,147,483,648 bytes while retaining the 2048 MiB budgets. These probes verify the application-facing budget path; they are not 8 GB gameplay results. - -On that Thor, subsequent D3D12 runs both with and without the 2048 MiB budget reached the existing save and supported more than five minutes of movement. Both used the Stability preset and `VKD3D_CONFIG=log_memory_budget`. The budgeted run ended with an Android low-memory kill during the shutdown window; the unbudgeted retry stopped cleanly. Earlier runs also encountered low-memory kills or a separate exception-stack startup failure. These observations do not establish a reduction in Caravan's memory use from the budget hint or a stable D3D12 fix. - -Native regression coverage exercises core and KHR memory-property queries, chained budget structures, unchanged real usage above the budget, separate heap types, disabled behavior, device lifecycle dispatch, and successful driver allocations whose individual and combined sizes exceed the reported budget. - -The Vulkan specification describes [`heapBudget` as a guideline](https://docs.vulkan.org/refpages/latest/refpages/source/VkPhysicalDeviceMemoryBudgetPropertiesEXT.html). Transparent movement between device-local and host-local memory requires driver and operating-system support for [pageable device-local memory](https://docs.vulkan.org/refpages/latest/refpages/source/vkAllocateMemory.html). diff --git a/docs/settings-map.md b/docs/settings-map.md index b9b42d5639..694717ff8b 100644 --- a/docs/settings-map.md +++ b/docs/settings-map.md @@ -19,10 +19,6 @@ Links of the form `droiddeck://settings/
` open a Settings section direc | Skip GL error checks | Settings › Performance (`droiddeck://settings/performance`) | | | gamescope: realtime GPU queue | Settings › Performance (`droiddeck://settings/performance`) | gamescope | | Hold the GPU at its top clock | Settings › Performance (`droiddeck://settings/performance`) | gpu, clock, max | -| RAM cap | Settings › Performance (`droiddeck://settings/performance`) | ram, memory | -| VRAM cap | Settings › Performance (`droiddeck://settings/performance`) | vram, memory | -| Compress idle game memory | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | -| Compress Steam while a game runs | Settings › Performance (`droiddeck://settings/performance`) | zram, swap, memory | | Clear cached apps before a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, crash, sleep, killed | | Background apps during a session | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, background apps | | Memory readout | Settings › Performance (`droiddeck://settings/performance`) | memory, ram, overlay | diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 79562333d4..5fd8ca4bc2 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -23,8 +23,7 @@ "outputs": [ "app/src/main/assets/linuxfs/usr/local/bin/gamescope", "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/bin/linuxarm64/driver_droiddeck.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so", - "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so" + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_gpuload.so" ], "ndk": true, "packages": [ diff --git a/tools/gpuload/build.sh b/tools/gpuload/build.sh index 683057c382..cf43a948b2 100755 --- a/tools/gpuload/build.sh +++ b/tools/gpuload/build.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash # Builds VK_LAYER_DROIDDECK_gpu_load for the arm64 guest: tools/gpuload/build.sh [--native] OUT -# OUT gets libVkLayer_droiddeck_gpuload.so, libVkLayer_droiddeck_vramcap.so and their implicit-layer manifests. set -euo pipefail here=$(cd "$(dirname "$0")" && pwd) repo=$(cd "$here/../.." && pwd) @@ -36,15 +35,10 @@ cmd=(sh -c ' build/gpuload/test_gpuload_busy cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -o build/gpuload/test_gpuload_ring tools/gpuload/tests/test_gpuload_ring.c build/gpuload/test_gpuload_ring - cc -std=c11 -O2 -Wall -Wextra -Werror -Ibuild/gpuload/include -Itools/gpuload/src -pthread -Wno-unused-parameter -Wno-missing-field-initializers -o build/gpuload/test_vramcap_budget tools/gpuload/tests/test_vramcap_budget.c - build/gpuload/test_vramcap_budget aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ -o build/gpuload/out/libVkLayer_droiddeck_gpuload.so tools/gpuload/src/vk_layer_droiddeck_gpuload.c - aarch64-linux-gnu-gcc -std=c11 -shared -fPIC -O2 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-missing-field-initializers \ - -fvisibility=hidden -pthread -Wl,-z,defs -Ibuild/gpuload/include -Itools/gpuload/src \ - -o build/gpuload/out/libVkLayer_droiddeck_vramcap.so tools/gpuload/src/vk_layer_droiddeck_vramcap.c - aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so build/gpuload/out/libVkLayer_droiddeck_vramcap.so') + aarch64-linux-gnu-strip --strip-unneeded build/gpuload/out/libVkLayer_droiddeck_gpuload.so') if [ "$native" = 1 ]; then (cd "$repo" && "${cmd[@]}") else @@ -52,8 +46,7 @@ else "${DROIDDECK_BUILD_IMAGE:-droiddeck-local-cross:24.04-v3}" "${cmd[@]}" fi -cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$here/layer/VK_LAYER_DROIDDECK_vram_cap.json" "$work/out/" +cp "$here/layer/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/" mkdir -p "$out" -cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/libVkLayer_droiddeck_vramcap.so" \ - "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$work/out/VK_LAYER_DROIDDECK_vram_cap.json" "$out/" +cp "$work/out/libVkLayer_droiddeck_gpuload.so" "$work/out/VK_LAYER_DROIDDECK_gpu_load.json" "$out/" echo "built $out" diff --git a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json b/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json deleted file mode 100644 index 9bff13fe76..0000000000 --- a/tools/gpuload/layer/VK_LAYER_DROIDDECK_vram_cap.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "file_format_version": "1.2.0", - "layer": { - "name": "VK_LAYER_DROIDDECK_vram_cap", - "type": "GLOBAL", - "library_path": "/usr/local/lib/droiddeck-gpuload/libVkLayer_droiddeck_vramcap.so", - "api_version": "1.3.0", - "implementation_version": "1", - "description": "Reports a smaller video memory budget to DXVK and vkd3d-proton", - "functions": { - "vkNegotiateLoaderLayerInterfaceVersion": "DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion" - }, - "enable_environment": { - "DROIDDECK_VRAM_CAP": "1" - }, - "disable_environment": { - "DROIDDECK_VRAM_CAP_DISABLE": "1" - } - } -} diff --git a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c b/tools/gpuload/src/vk_layer_droiddeck_vramcap.c deleted file mode 100644 index eefa5608d3..0000000000 --- a/tools/gpuload/src/vk_layer_droiddeck_vramcap.c +++ /dev/null @@ -1,206 +0,0 @@ -#define _GNU_SOURCE -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "vramcap_budget.h" - -#define EXPORT __attribute__((visibility("default"))) - -static uint64_t g_cap; - -__attribute__((constructor)) static void init(void) { - g_cap = vramcap_parse_mb(getenv("DROIDDECK_VRAM_CAP_MB")); -} - -struct inst { - struct inst *next_in_list; - VkInstance handle; - PFN_vkGetInstanceProcAddr gipa; - PFN_vkDestroyInstance destroy; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2; - PFN_vkGetPhysicalDeviceMemoryProperties2 mem2_khr; -}; - -struct dev { - struct dev *next_in_list; - VkDevice handle; - PFN_vkGetDeviceProcAddr gdpa; - PFN_vkDestroyDevice destroy; -}; - -static pthread_mutex_t g_lock = PTHREAD_MUTEX_INITIALIZER; -static struct inst *g_insts; -static struct dev *g_devs; -static int g_announced; - -static void *key(const void *obj) { return *(void *const *)obj; } - -static struct inst *inst_for(const void *obj) { - struct inst *r; - pthread_mutex_lock(&g_lock); - for (r = g_insts; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static struct dev *dev_for(const void *obj) { - struct dev *r; - pthread_mutex_lock(&g_lock); - for (r = g_devs; r && key(r->handle) != key(obj); r = r->next_in_list) {} - pthread_mutex_unlock(&g_lock); - return r; -} - -static void say(const char *what) { - fprintf(stderr, "[droiddeck-vram-cap] pid %d: %s\n", (int)getpid(), what); -} - -static void announce(void) { - if (__atomic_exchange_n(&g_announced, 1, __ATOMIC_RELAXED)) return; - char line[96]; - snprintf(line, sizeof(line), "reported device memory budget %llu MB", (unsigned long long)(g_cap >> 20)); - say(line); -} - -static void clamp_properties2(PFN_vkGetPhysicalDeviceMemoryProperties2 next, VkPhysicalDevice pd, - VkPhysicalDeviceMemoryProperties2 *out) { - next(pd, out); - for (VkBaseOutStructure *s = out->pNext; s; s = s->pNext) - if (s->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - vramcap_budget(&out->memoryProperties, (VkPhysicalDeviceMemoryBudgetPropertiesEXT *)s, g_cap); - if (g_cap) announce(); - } -} - -static void VKAPI_CALL GetMemoryProperties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2, pd, out); -} - -static void VKAPI_CALL GetMemoryProperties2KHR(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - struct inst *in = inst_for(pd); - if (in) clamp_properties2(in->mem2_khr, pd, out); -} - -static VkResult VKAPI_CALL CreateInstance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *alloc, VkInstance *out) { - VkLayerInstanceCreateInfo *link = (VkLayerInstanceCreateInfo *)ci->pNext; - while (link && !(link->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO && link->function == VK_LAYER_LINK_INFO)) - link = (VkLayerInstanceCreateInfo *)link->pNext; - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - PFN_vkCreateInstance create = (PFN_vkCreateInstance)next_gipa(VK_NULL_HANDLE, "vkCreateInstance"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct inst *in = calloc(1, sizeof(*in)); - if (!in) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(ci, alloc, out); - if (r != VK_SUCCESS) { free(in); return r; } - in->handle = *out; - in->gipa = next_gipa; - in->destroy = (PFN_vkDestroyInstance)next_gipa(*out, "vkDestroyInstance"); - in->mem2 = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2"); - in->mem2_khr = (PFN_vkGetPhysicalDeviceMemoryProperties2)next_gipa(*out, "vkGetPhysicalDeviceMemoryProperties2KHR"); - pthread_mutex_lock(&g_lock); - in->next_in_list = g_insts; - g_insts = in; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyInstance(VkInstance instance, const VkAllocationCallbacks *alloc) { - struct inst *in = inst_for(instance); - if (!in) return; - PFN_vkDestroyInstance destroy = in->destroy; - pthread_mutex_lock(&g_lock); - for (struct inst **p = &g_insts; *p; p = &(*p)->next_in_list) - if (*p == in) { *p = in->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - free(in); - if (destroy) destroy(instance, alloc); -} - -static VkLayerDeviceCreateInfo *device_chain(const VkDeviceCreateInfo *ci, VkLayerFunction function) { - VkLayerDeviceCreateInfo *c = (VkLayerDeviceCreateInfo *)ci->pNext; - while (c && !(c->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO && c->function == function)) - c = (VkLayerDeviceCreateInfo *)c->pNext; - return c; -} - -static VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, const VkAllocationCallbacks *alloc, - VkDevice *out) { - VkLayerDeviceCreateInfo *link = device_chain(ci, VK_LAYER_LINK_INFO); - if (!link) return VK_ERROR_INITIALIZATION_FAILED; - PFN_vkGetInstanceProcAddr next_gipa = link->u.pLayerInfo->pfnNextGetInstanceProcAddr; - PFN_vkGetDeviceProcAddr next_gdpa = link->u.pLayerInfo->pfnNextGetDeviceProcAddr; - link->u.pLayerInfo = link->u.pLayerInfo->pNext; - struct inst *in = inst_for(pd); - PFN_vkCreateDevice create = (PFN_vkCreateDevice)next_gipa(in ? in->handle : VK_NULL_HANDLE, "vkCreateDevice"); - if (!create) return VK_ERROR_INITIALIZATION_FAILED; - struct dev *d = calloc(1, sizeof(*d)); - if (!d) return VK_ERROR_OUT_OF_HOST_MEMORY; - VkResult r = create(pd, ci, alloc, out); - if (r != VK_SUCCESS) { free(d); return r; } - d->handle = *out; - d->gdpa = next_gdpa; - d->destroy = (PFN_vkDestroyDevice)next_gdpa(*out, "vkDestroyDevice"); - pthread_mutex_lock(&g_lock); - d->next_in_list = g_devs; - g_devs = d; - pthread_mutex_unlock(&g_lock); - return VK_SUCCESS; -} - -static void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocationCallbacks *alloc) { - struct dev *d = dev_for(device); - if (!d) return; - pthread_mutex_lock(&g_lock); - for (struct dev **p = &g_devs; *p; p = &(*p)->next_in_list) - if (*p == d) { *p = d->next_in_list; break; } - pthread_mutex_unlock(&g_lock); - PFN_vkDestroyDevice destroy = d->destroy; - free(d); - if (destroy) destroy(device, alloc); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name); - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetInstanceProcAddr(VkInstance instance, const char *name) { - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)CreateInstance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)DestroyInstance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)CreateDevice; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - if (!strcmp(name, "vkGetInstanceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetInstanceProcAddr; - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!instance) return NULL; - struct inst *in = inst_for(instance); - if (!in) return NULL; - if (g_cap) { - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") && in->mem2) return (PFN_vkVoidFunction)GetMemoryProperties2; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR") && in->mem2_khr) - return (PFN_vkVoidFunction)GetMemoryProperties2KHR; - } - return in->gipa(instance, name); -} - -EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL DroidDeckVramCap_GetDeviceProcAddr(VkDevice device, const char *name) { - if (!strcmp(name, "vkGetDeviceProcAddr")) return (PFN_vkVoidFunction)DroidDeckVramCap_GetDeviceProcAddr; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)DestroyDevice; - struct dev *d = dev_for(device); - if (!d) return NULL; - return d->gdpa(device, name); -} - -EXPORT VKAPI_ATTR VkResult VKAPI_CALL DroidDeckVramCap_NegotiateLoaderLayerInterfaceVersion(VkNegotiateLayerInterface *v) { - if (v->loaderLayerInterfaceVersion > 2) v->loaderLayerInterfaceVersion = 2; - v->pfnGetInstanceProcAddr = DroidDeckVramCap_GetInstanceProcAddr; - v->pfnGetDeviceProcAddr = DroidDeckVramCap_GetDeviceProcAddr; - v->pfnGetPhysicalDeviceProcAddr = NULL; - return VK_SUCCESS; -} diff --git a/tools/gpuload/src/vramcap_budget.h b/tools/gpuload/src/vramcap_budget.h deleted file mode 100644 index 3d77b1c951..0000000000 --- a/tools/gpuload/src/vramcap_budget.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef VRAMCAP_BUDGET_H -#define VRAMCAP_BUDGET_H - -#include -#include - -static inline uint64_t vramcap_parse_mb(const char *text) { - if (!text || !*text) return 0; - uint64_t value = 0, limit = UINT64_MAX >> 20; - for (; *text; text++) { - if (*text < '0' || *text > '9') return 0; - unsigned digit = (unsigned)(*text - '0'); - if (value > (limit - digit) / 10) return 0; - value = value * 10 + digit; - } - return value << 20; -} - -static inline VkDeviceSize vramcap_clamp(VkDeviceSize value, uint64_t cap) { - return cap && value > cap ? cap : value; -} - -static inline void vramcap_budget(const VkPhysicalDeviceMemoryProperties *p, - VkPhysicalDeviceMemoryBudgetPropertiesEXT *budget, uint64_t cap) { - for (uint32_t i = 0; i < p->memoryHeapCount && i < VK_MAX_MEMORY_HEAPS; i++) - if (p->memoryHeaps[i].flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) { - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], cap); - budget->heapBudget[i] = vramcap_clamp(budget->heapBudget[i], p->memoryHeaps[i].size); - } -} - -#endif diff --git a/tools/gpuload/tests/test_vramcap_budget.c b/tools/gpuload/tests/test_vramcap_budget.c deleted file mode 100644 index 40c6f9d8c2..0000000000 --- a/tools/gpuload/tests/test_vramcap_budget.c +++ /dev/null @@ -1,154 +0,0 @@ -#include -#include -#include "../src/vk_layer_droiddeck_vramcap.c" - -static int instance_dispatch, device_dispatch; -static void *instance_object = &instance_dispatch, *physical_object = &instance_dispatch; -static void *device_object = &device_dispatch; -static VkInstance instance; -static VkPhysicalDevice physical; -static VkDevice device; -static unsigned allocations, frees, destroyed_devices, destroyed_instances; - -static void VKAPI_CALL memory_properties(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties *out) { - assert(pd == physical); - *out = (VkPhysicalDeviceMemoryProperties){ - .memoryHeapCount = 3, - .memoryHeaps = {{8ULL << 30, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}, {4ULL << 30, 0}, - {512ULL << 20, VK_MEMORY_HEAP_DEVICE_LOCAL_BIT}}, - .memoryTypeCount = 1, - .memoryTypes = {{VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, 0}}, - }; -} - -static void VKAPI_CALL memory_properties2(VkPhysicalDevice pd, VkPhysicalDeviceMemoryProperties2 *out) { - memory_properties(pd, &out->memoryProperties); - for (VkBaseOutStructure *p = out->pNext; p; p = p->pNext) - if (p->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT *b = (void *)p; - b->heapBudget[0] = 6ULL << 30; - b->heapBudget[1] = 3ULL << 30; - b->heapBudget[2] = 256ULL << 20; - b->heapUsage[0] = 3ULL << 30; - } -} - -static VkResult VKAPI_CALL allocate(VkDevice d, const VkMemoryAllocateInfo *info, - const VkAllocationCallbacks *a, VkDeviceMemory *out) { - assert(d == device && info->allocationSize == (3ULL << 30)); - *out = (VkDeviceMemory)(uintptr_t)++allocations; - return VK_SUCCESS; -} - -static void VKAPI_CALL release(VkDevice d, VkDeviceMemory m, const VkAllocationCallbacks *a) { - assert(d == device && m); - frees++; -} - -static void VKAPI_CALL destroy_device(VkDevice d, const VkAllocationCallbacks *a) { - assert(d == device); - destroyed_devices++; -} - -static void VKAPI_CALL destroy_instance(VkInstance in, const VkAllocationCallbacks *a) { - assert(in == instance); - destroyed_instances++; -} - -static PFN_vkVoidFunction VKAPI_CALL gdpa(VkDevice d, const char *name) { - assert(d == device); - if (!strcmp(name, "vkAllocateMemory")) return (PFN_vkVoidFunction)allocate; - if (!strcmp(name, "vkFreeMemory")) return (PFN_vkVoidFunction)release; - if (!strcmp(name, "vkDestroyDevice")) return (PFN_vkVoidFunction)destroy_device; - return NULL; -} - -static VkResult VKAPI_CALL create_device(VkPhysicalDevice pd, const VkDeviceCreateInfo *ci, - const VkAllocationCallbacks *a, VkDevice *out) { - assert(pd == physical); - *out = device; - return VK_SUCCESS; -} - -static VkResult VKAPI_CALL create_instance(const VkInstanceCreateInfo *ci, const VkAllocationCallbacks *a, VkInstance *out) { - *out = instance; - return VK_SUCCESS; -} - -static PFN_vkVoidFunction VKAPI_CALL gipa(VkInstance in, const char *name) { - assert(in == instance || in == VK_NULL_HANDLE); - if (!strcmp(name, "vkCreateInstance")) return (PFN_vkVoidFunction)create_instance; - if (!strcmp(name, "vkDestroyInstance")) return (PFN_vkVoidFunction)destroy_instance; - if (!strcmp(name, "vkCreateDevice")) return (PFN_vkVoidFunction)create_device; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties")) return (PFN_vkVoidFunction)memory_properties; - if (!strcmp(name, "vkGetPhysicalDeviceMemoryProperties2") || !strcmp(name, "vkGetPhysicalDeviceMemoryProperties2KHR")) - return (PFN_vkVoidFunction)memory_properties2; - return NULL; -} - -int main(void) { - assert(vramcap_parse_mb("2048") == (2ULL << 30)); - assert(vramcap_parse_mb(NULL) == 0 && vramcap_parse_mb("") == 0 && vramcap_parse_mb("0") == 0); - const char *bad[] = {"-1", "+1", " 1024", "1024 ", "1GB", "18446744073709551616", "17592186044416"}; - for (size_t i = 0; i < sizeof(bad) / sizeof(bad[0]); i++) assert(vramcap_parse_mb(bad[i]) == 0); - assert(vramcap_parse_mb("17592186044415") == ((UINT64_MAX >> 20) << 20)); - - instance = (VkInstance)&instance_object; - physical = (VkPhysicalDevice)&physical_object; - device = (VkDevice)&device_object; - g_cap = 2ULL << 30; - VkLayerInstanceLink il = {.pfnNextGetInstanceProcAddr = gipa}; - VkLayerInstanceCreateInfo ic = {.sType = VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &il}; - VkInstanceCreateInfo ici = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = &ic}; - VkInstance got_instance; - assert(CreateInstance(&ici, NULL, &got_instance) == VK_SUCCESS && got_instance == instance); - VkPhysicalDeviceMemoryProperties p; - PFN_vkGetPhysicalDeviceMemoryProperties get = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties"); - assert(get == memory_properties); - get(physical, &p); - assert(p.memoryHeaps[0].size == (8ULL << 30) && p.memoryHeaps[1].size == (4ULL << 30)); - assert(p.memoryHeaps[2].size == (512ULL << 20)); - assert(p.memoryTypes[0].propertyFlags == (VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)); - - const char *names[] = {"vkGetPhysicalDeviceMemoryProperties2", "vkGetPhysicalDeviceMemoryProperties2KHR"}; - for (size_t i = 0; i < 2; i++) { - VkPhysicalDeviceMemoryBudgetPropertiesEXT b = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT}; - VkPhysicalDeviceIDProperties id = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES, .pNext = &b}; - VkPhysicalDeviceMemoryProperties2 p2 = {.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2, .pNext = &id}; - PFN_vkGetPhysicalDeviceMemoryProperties2 get2 = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, names[i]); - get2(physical, &p2); - assert(p2.memoryProperties.memoryHeaps[0].size == (8ULL << 30)); - assert(b.heapBudget[0] == g_cap && b.heapBudget[1] == (3ULL << 30)); - assert(b.heapBudget[2] == (256ULL << 20)); - assert(b.heapUsage[0] == (3ULL << 30)); - assert(p2.pNext == &id && id.pNext == &b); - } - - VkLayerDeviceLink dl = {.pfnNextGetInstanceProcAddr = gipa, .pfnNextGetDeviceProcAddr = gdpa}; - VkLayerDeviceCreateInfo dc = {.sType = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO, - .function = VK_LAYER_LINK_INFO, .u.pLayerInfo = &dl}; - VkDeviceCreateInfo dci = {.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = &dc}; - VkDevice got_device; - assert(CreateDevice(physical, &dci, NULL, &got_device) == VK_SUCCESS && got_device == device); - PFN_vkAllocateMemory next_allocate = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkAllocateMemory"); - PFN_vkFreeMemory next_free = (void *)DroidDeckVramCap_GetDeviceProcAddr(device, "vkFreeMemory"); - assert(next_allocate == allocate && next_free == release); - VkMemoryAllocateInfo ai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .allocationSize = 3ULL << 30}; - VkDeviceMemory blocks[2]; - for (unsigned i = 0; i < 2; i++) assert(next_allocate(device, &ai, NULL, &blocks[i]) == VK_SUCCESS); - assert(allocations == 2); - for (unsigned i = 0; i < 2; i++) next_free(device, blocks[i], NULL); - assert(frees == 2); - - g_cap = 0; - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, names[0]) == (PFN_vkVoidFunction)memory_properties2); - assert(DroidDeckVramCap_GetInstanceProcAddr(instance, "vkGetPhysicalDeviceMemoryProperties") == (PFN_vkVoidFunction)memory_properties); - PFN_vkDestroyDevice destroy = (void *)DroidDeckVramCap_GetInstanceProcAddr(instance, "vkDestroyDevice"); - assert(destroy == DestroyDevice); - destroy(device, NULL); - DestroyInstance(instance, NULL); - assert(destroyed_devices == 1 && destroyed_instances == 1 && !g_devs && !g_insts); - puts("test_vramcap_budget: ok"); - return 0; -} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 0e816b9dab..5dd574abdf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -14,7 +14,6 @@ from pathlib import Path GAME_PREFIX = "DROIDDECK_GAME_" GAME_SPLIT_KEYS = ("TU_DEBUG", "MESA_NO_ERROR") CHROMIUM_FILES = {"chrome-sandbox", "chrome_100_percent.pak", "v8_context_snapshot.bin"} -D3D9_DEFAULT_MEMORY_MB = 4096 SYNC_KEYS = ("DD_SYNC", "DD_SYNC_FALLBACK", "DD_FSYNC_FIRST", "DD_SYNC_MIN_NOFILE", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC", "PROTON_NO_NTSYNC", "WINEESYNC") SEED_REDISTS = "/usr/local/bin/droiddeck-seed-redists" PACK_KEYS = ("WINESERVER", "DD_SYNC_PACK", "WINEESYNC", "PROTON_NO_ESYNC", "PROTON_NO_FSYNC") @@ -470,21 +469,6 @@ def split_game_gpu(entries): return result -def vram_cap(env): - value = env.get("DD_VRAM_MB", "") - if not re.fullmatch(r"[1-9][0-9]{0,6}", value): - return env - result = env.copy() - cap = "dxgi.maxDeviceMemory = {0}; dxgi.maxSharedMemory = {0}".format(int(value)) - if int(value) < D3D9_DEFAULT_MEMORY_MB: - cap += "; d3d9.maxAvailableMemory = {0}".format(int(value)) - own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() - result["DXVK_CONFIG"] = cap + "; " + own if own else cap - result["DROIDDECK_VRAM_CAP"] = "1" - result["DROIDDECK_VRAM_CAP_MB"] = value - return result - - def parse_cores(text): cores = set() for part in text.replace(" ", "").split(","): @@ -1456,7 +1440,6 @@ def main(): if mic_enabled == "0": env["AUDIO_DIRECT_MIC"] = "0" env = directaudio_settings(env) - env = vram_cap(env) note = render_path_defaults(command, env) if app_id else None if note: print("droiddeck-game-env: " + note, file=sys.stderr) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 4a10cd42bd..ee13167e38 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -132,6 +132,7 @@ clear_stale_tmp() { [ -z "${DD_INSIDE:-}" ] && clear_stale_tmp if [ -z "${DD_INSIDE:-}" ]; then if [ "${DD_ZRAM:-0}" = 1 ]; then printf 0 > /tmp/.dd-zram; else rm -f /tmp/.dd-zram; fi + rm -f /tmp/.dd-zram.hold dd if=/dev/zero of=/tmp/.dd-clock bs=8 count=1 conv=notrunc status=none fi @@ -756,13 +757,6 @@ case $mode in fi if [ "${DD_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" - _dd_ram_cap=0 - case ${DD_RAM_CAP_MB:-} in - ''|0) ;; - *[!0-9]*|0*|???????*) step "RAM cap: ignored invalid value '$DD_RAM_CAP_MB'" ;; - *) _dd_ram_cap=$((DD_RAM_CAP_MB * 1024)); step "RAM cap: ${DD_RAM_CAP_MB} MB" ;; - esac ( dd_zram_scan() { _dd_game=0 _dd_pids=() _dd_others=() _dd_apps= @@ -839,284 +833,235 @@ case $mode in echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" } dd_memory_read() { - local _k _v _u _kind _fields _avg _whole _frac _gpu_bytes _growth _saved_growth _saved_fall - _saved_growth=${_dd_preserved_growth:-0} _saved_fall=${_dd_preserved_fall:-0} - _dd_preserved_growth=0 _dd_preserved_fall=0 - _dd_mem_total=0 _dd_available=-1 _dd_swap_total=0 _dd_swap_free=-1 - _dd_psi_some=0 _dd_psi_full=0 _dd_gpu=0 _dd_unevictable=0 _dd_shmem=0 + local _k _v _u _kind _fields _name _type _size _used _orig _comp _mem _dt _fall + local _stall=-1 _swap_total=0 _swap_free=0 _total=0 _room=0 _listed=0 _in=-1 + _dd_mem_total=0 _dd_available=-1 while read -r _k _v _u; do case $_v in ''|*[!0-9]*) continue ;; esac case $_k in MemTotal:) _dd_mem_total=$_v ;; MemAvailable:) _dd_available=$_v ;; - SwapTotal:) _dd_swap_total=$_v ;; - SwapFree:) _dd_swap_free=$_v ;; - Unevictable:) _dd_unevictable=$_v ;; - Shmem:) _dd_shmem=$_v ;; + SwapTotal:) _swap_total=$_v ;; + SwapFree:) _swap_free=$_v ;; esac done 2>/dev/null < /proc/meminfo + while read -r _name _type _size _used _u; do + _listed=1 + case $_name in */zram[0-9]*) ;; *) continue ;; esac + case $_size$_used in ''|*[!0-9]*) continue ;; esac + _total=$((_total + _size)) _room=$((_room + _size - _used)) + done 2>/dev/null < /proc/swaps + [ "$_listed" = 1 ] || _total=$_swap_total _room=$_swap_free + _dd_swap_room=$((_total / 8)) + [ "$_dd_swap_room" -ge $((128 * 1024)) ] || _dd_swap_room=$((128 * 1024)) + _dd_swap_room=$((_room - _dd_swap_room)) + _dd_saving=600 + if [ -r /sys/block/zram0/mm_stat ] && read -r _orig _comp _mem _u 2>/dev/null < /sys/block/zram0/mm_stat; then + case $_orig$_mem in + ''|*[!0-9]*) ;; + *) [ "$_orig" -lt $((64 << 20)) ] || _dd_saving=$(((_orig - _mem) / (_orig / 1000))) ;; + esac + [ "$_dd_saving" -ge 167 ] || _dd_saving=167 + [ "$_dd_saving" -le 833 ] || _dd_saving=833 + fi if [ -r /proc/pressure/memory ]; then while read -r _kind _fields; do - [ "$_kind" = some ] || [ "$_kind" = full ] || continue - _avg=${_fields#avg10=} _avg=${_avg%% *} - _whole=${_avg%%.*} _frac=${_avg#*.} - [ "$_frac" = "$_avg" ] && _frac=00 - _frac=${_frac}00 - _frac=${_frac:0:2} - case $_whole$_frac in ''|*[!0-9]*) continue ;; esac - if [ "$_kind" = some ]; then - _dd_psi_some=$((10#$_whole * 100 + 10#$_frac)) - else - _dd_psi_full=$((10#$_whole * 100 + 10#$_frac)) - fi + [ "$_kind" = some ] || continue + _fields=${_fields##*total=} + case $_fields in ''|*[!0-9]*) ;; *) _stall=$_fields ;; esac done 2>/dev/null < /proc/pressure/memory fi - if [ -r /sys/class/kgsl/kgsl/page_alloc ]; then - read -r _gpu_bytes _u < /sys/class/kgsl/kgsl/page_alloc - case $_gpu_bytes in ''|*[!0-9]*) _gpu_bytes=0 ;; esac - _dd_gpu=$((_gpu_bytes / 1024)) + while read -r _k _v; do + [ "$_k" = pswpin ] || continue + case $_v in ''|*[!0-9]*) ;; *) _in=$((_v * _dd_page_kb)) ;; esac + break + done 2>/dev/null < /proc/vmstat + _dt=$((SECONDS - ${_dd_sample_at:-$SECONDS})) + if [ -z "${_dd_sample_at:-}" ]; then + _dd_rate=0 _dd_psi=0 _dd_returned=0 + elif [ "$_dt" -gt 0 ] && [ "$_dd_available" -ge 0 ]; then + _fall=$(((_dd_sample_available - _dd_available + _dd_freed) / _dt)) + _dd_rate=$((_dd_rate * 3 / 4)) + [ "$_fall" -le "$_dd_rate" ] || _dd_rate=$_fall + _dd_psi=0 + [ "$_stall" -lt 0 ] || [ "$_dd_sample_stall" -lt 0 ] || _dd_psi=$(((_stall - _dd_sample_stall) / (_dt * 100))) + _dd_returned=$((_dt < 30 ? _dd_returned * (30 - _dt) / 30 : 0)) + [ "$_in" -lt "$_dd_sample_in" ] || [ "$_dd_sample_in" -lt 0 ] || _dd_returned=$((_dd_returned + _in - _dd_sample_in)) fi - _dd_psi=$_dd_psi_some - [ "$_dd_psi_full" -gt "$_dd_psi" ] && _dd_psi=$_dd_psi_full - if [ "${_dd_sample_at:-}" = "" ]; then - _dd_growth=0 _dd_fall=0 - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - elif [ "$SECONDS" -gt "$_dd_sample_at" ]; then - _dd_growth=0 _dd_fall=0 - _growth=$((_dd_gpu - _dd_sample_gpu)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_unevictable - _dd_sample_unevictable)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _growth=$((_dd_shmem - _dd_sample_shmem)); [ "$_growth" -gt 0 ] && _dd_growth=$((_dd_growth + _growth)) - _dd_fall=$((_dd_sample_available - _dd_available)) - [ "$_saved_growth" -gt "$_dd_growth" ] && _dd_growth=$_saved_growth - [ "$_saved_fall" -gt "$_dd_fall" ] && _dd_fall=$_saved_fall - if [ $((SECONDS - _dd_sample_at)) -ge 5 ]; then - _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_gpu=$_dd_gpu - _dd_sample_unevictable=$_dd_unevictable _dd_sample_shmem=$_dd_shmem - fi + if [ "$_dd_available" -ge 0 ] && { [ -z "${_dd_sample_at:-}" ] || [ "$_dt" -gt 0 ]; }; then + _dd_sample_at=$SECONDS _dd_sample_available=$_dd_available _dd_sample_stall=$_stall _dd_sample_in=$_in _dd_freed=0 fi - _dd_real_available=$_dd_available - [ "$_dd_real_available" -ge 0 ] && _dd_real_available=$((_dd_real_available - _dd_growth)) - _dd_headroom=$((_dd_mem_total / 5)) - [ "$_dd_headroom" -ge $((512 * 1024)) ] || _dd_headroom=$((512 * 1024)) - [ "$_dd_headroom" -le $((1536 * 1024)) ] || _dd_headroom=$((1536 * 1024)) - _dd_tier_headroom=$((_dd_mem_total / 4)) - [ "$_dd_tier_headroom" -ge $((768 * 1024)) ] || _dd_tier_headroom=$((768 * 1024)) - [ "$_dd_tier_headroom" -le $((2560 * 1024)) ] || _dd_tier_headroom=$((2560 * 1024)) - _dd_fall_headroom=$((_dd_tier_headroom * 2)) - [ "$_dd_fall_headroom" -ge $((_dd_mem_total * 2 / 5)) ] || _dd_fall_headroom=$((_dd_mem_total * 2 / 5)) - _dd_swap_reserve=$((_dd_swap_total / 5)) - [ "$_dd_swap_reserve" -ge $((256 * 1024)) ] || _dd_swap_reserve=$((256 * 1024)) + _dd_floor=$((_dd_mem_total / 8)) + [ "$_dd_floor" -ge $((640 * 1024)) ] || _dd_floor=$((640 * 1024)) + [ "$_dd_floor" -le $((1280 * 1024)) ] || _dd_floor=$((1280 * 1024)) + _dd_target=$((_dd_floor + _dd_rate * 10)) } - dd_memory_tight() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_mem_total / 3)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt $((_dd_headroom * 2)) ]; }; } - } - dd_client_can_pageout() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && dd_zram_has_room - } - dd_zram_has_room() { - [ "$_dd_swap_total" -gt 0 ] && - [ $((_dd_swap_free - _dd_anon - ${_dd_client_reserve:-0})) -ge "$_dd_swap_reserve" ] - } - dd_client_can_readback() { - dd_memory_read - dd_zram_usage "${_dd_pids[@]}" > /dev/null - [ "$_dd_mem_total" -gt 0 ] && ! dd_memory_tight && ! dd_memory_critical && - [ "$_dd_real_available" -ge $((_dd_swap * 2)) ] && - [ $((_dd_real_available - _dd_swap)) -ge "$_dd_headroom" ] - } - dd_client_pressure() { - [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ "$_dd_game" = 1 ] && - [ "${#_dd_pids[@]}" -gt 0 ] && { dd_memory_tight || dd_memory_critical; } || return 0 - [ "$_dd_pressure_at" -lt 0 ] || - [ $((SECONDS - _dd_pressure_at)) -ge "$_dd_pressure_backoff" ] || return 0 - [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 30 ] || return 0 - _dd_pressure_at=$SECONDS - if ! dd_client_can_pageout; then - step "zRAM: pressure reclaim skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 + dd_memory_need() { + local _burst=$((_dd_rate * 2)) + _dd_need=0 _dd_hard=0 _dd_force=0 + [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] || return 0 + _dd_need=$((_dd_target - _dd_available)) _dd_hard=$((_dd_floor - _dd_available)) + if [ "$_burst" -ge $((64 * 1024)) ] && [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] && [ "$_burst" -gt "$_dd_need" ]; then + _dd_need=$_burst fi - [ "$_dd_rss" -ge $((128 * 1024)) ] || return 0 - _dd_pressure_before=$_dd_rss - if [ "${1:-}" = defer ]; then - _dd_client_reserve=$_dd_anon - _dd_client_pending=1 - fi - dd_zram_send 1 "memory pressure, compressing the client (available $((_dd_available / 1024)) MB, swap free $((_dd_swap_free / 1024)) MB)" client "${1:-}" - _dd_packed=$SECONDS - if [ "${1:-}" = defer ]; then - _dd_client_targets=("${_dd_zram_targets[@]}") - else - dd_client_pressure_result + if [ "$_dd_psi" -ge 100 ] && [ "$_burst" -gt "$_dd_hard" ]; then + _dd_hard=$_burst fi + [ "$_dd_hard" -gt 0 ] || _dd_hard=0 + [ "$_dd_need" -ge "$_dd_hard" ] || _dd_need=$_dd_hard + [ "$_dd_available" -ge $((_dd_floor / 2)) ] || _dd_force=1 } - dd_client_pressure_finish() { - [ "${_dd_client_pending:-0}" = 1 ] || return 0 - dd_zram_finish 1 "${_dd_client_targets[@]}" - dd_client_pressure_result "${_dd_client_targets[@]}" - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() - } - dd_client_pressure_result() { - [ "${_dd_pageout_complete:-0}" = 1 ] || return 0 - if [ "$#" -gt 0 ]; then dd_zram_usage "$@" > /dev/null; else dd_zram_usage "${_dd_pids[@]}" > /dev/null; fi - if [ $((_dd_pressure_before - _dd_rss)) -lt $((16 * 1024)) ]; then - _dd_pressure_backoff=$((_dd_pressure_backoff * 2 > 300 ? 300 : _dd_pressure_backoff * 2)) - else - _dd_pressure_backoff=30 - fi - } - dd_memory_critical() { - [ "$_dd_mem_total" -gt 0 ] && [ "$_dd_available" -ge 0 ] && - { [ "$_dd_real_available" -lt "$_dd_tier_headroom" ] || - { [ "$_dd_psi" -ge 100 ] && [ "$_dd_real_available" -lt $((_dd_tier_headroom * 3 / 2)) ]; } || - { [ "$_dd_fall" -ge $((256 * 1024)) ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; }; } - } - dd_session_pressure() { - dd_memory_read - dd_memory_critical || _dd_tier_backoff=30 _dd_tier_nogain=0 - [ "$_dd_game" = 1 ] && dd_memory_critical || return 0 - [ "${DD_ZRAM_IDLE:-1}" = 1 ] && dd_game_focused 0 || return 0 - local _wait=$_dd_tier_backoff _before _available_before _pids _targets _gain _min_gain - [ "$_dd_available" -ge $((_dd_headroom / 2)) ] || [ "$_dd_tier_pushed" -lt 0 ] || _wait=30 - [ "$_dd_tier_at" -lt 0 ] || [ $((SECONDS - _dd_tier_at)) -ge "$_wait" ] || return 0 - if [ "$_dd_tier_at" -ge 0 ] && [ "$_dd_tier_pushed" -gt 0 ]; then - dd_tier_readback - if [ "$_dd_tier_back" -le $((_dd_tier_pushed / 2)) ]; then - [ "${_dd_tier_nogain:-0}" = 1 ] || _dd_tier_backoff=30 - else - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_pushed=-1 - step "zRAM: the game read back most of its last page-out, next try in ${_dd_tier_backoff} s" - return 0 - fi - fi - _dd_tier_at=$SECONDS _dd_tier_pushed=0 - dd_zram_pick session - dd_zram_usage "${_pids[@]}" > /dev/null - [ "$_dd_rss" -ge $((256 * 1024)) ] || return 0 - if ! dd_zram_has_room; then - step "zRAM: low-memory page-out skipped, swap headroom too small ($((_dd_swap_free / 1024)) MB free)" - return 0 - fi - _targets=("${_pids[@]}") _before=$_dd_swap _available_before=$_dd_available - dd_zram_send 1 "low memory (available $((_dd_real_available / 1024)) MB), compressing idle game memory" session - dd_zram_usage "${_targets[@]}" > /dev/null - _dd_tier_pushed=$((_dd_swap - _before)) - dd_tier_note "${_targets[@]}" - if [ "${_dd_pageout_complete:-0}" = 1 ]; then - dd_memory_read - _gain=$((_dd_available - _available_before)) - _min_gain=$((_dd_tier_headroom / 16)) - [ "$_min_gain" -ge $((16 * 1024)) ] || _min_gain=$((16 * 1024)) - if [ "$_gain" -lt "$_min_gain" ]; then - _dd_tier_backoff=$((_dd_tier_backoff * 2 > 300 ? 300 : _dd_tier_backoff * 2)) - _dd_tier_at=$SECONDS _dd_tier_nogain=1 - step "zRAM: low-memory page-out gained only $((_gain / 1024)) MB available, next try in ${_dd_tier_backoff} s" - else - _dd_tier_nogain=0 - fi - fi - } - dd_proc_start() { - local _s= - _dd_start= - read -r _s 2>/dev/null < "/proc/$1/stat" || return 1 - _s=${_s##*) } - set -- $_s - [ "$1" != Z ] && [ "$#" -ge 20 ] || return 1 - _dd_start=${20} - } - dd_tier_note() { - local _p - _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - for _p in "$@"; do - dd_proc_start "$_p" || continue - dd_zram_usage "$_p" > /dev/null - _dd_tier_targets+=("$_p") _dd_tier_swaps+=("$_dd_swap") _dd_tier_starts+=("$_dd_start") - done - } - dd_tier_readback() { - local _i _back=0 - for _i in "${!_dd_tier_targets[@]}"; do - dd_proc_start "${_dd_tier_targets[$_i]}" && [ "$_dd_start" = "${_dd_tier_starts[$_i]}" ] || continue - dd_zram_usage "${_dd_tier_targets[$_i]}" > /dev/null - [ "${_dd_tier_swaps[$_i]}" -le "$_dd_swap" ] || _back=$((_back + _dd_tier_swaps[_i] - _dd_swap)) - done - _dd_tier_back=$_back - } - dd_watch_nap() { - local _i - if [ "$_dd_game" = 1 ] && [ "$_dd_available" -ge 0 ] && [ "$_dd_real_available" -lt "$_dd_fall_headroom" ]; then - for _i in 1 2 3 4 5; do - nap 1 - dd_memory_read - dd_memory_critical && return 0 - done - else - nap 5 - fi - return 0 + dd_pid_key() { + local _s + _dd_key=$1 + read -r _s 2>/dev/null < "/proc/$1/stat" || return 0 + set -- ${_s##*) } + _dd_key=$_dd_key.${20:-} } dd_session_others() { local _p + local -A _known=() _dd_session=() for _p in "${_dd_others[@]}"; do - grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null && _dd_session+=("$_p") + dd_pid_key "$_p" + [ -n "${_dd_preloaded[$_dd_key]:-}" ] || + grep -q -m1 '/libddsession\.so$' "/proc/$_p/maps" 2>/dev/null || continue + _known[$_dd_key]=1 + dd_zram_usage "$_p" > /dev/null + _dd_session+=("$_dd_anon $_p") done + _dd_preloaded=() + for _p in "${!_known[@]}"; do + _dd_preloaded[$_p]=1 + done + [ "${#_dd_session[@]}" -gt 0 ] || return 0 + mapfile -t _dd_session < <(printf '%s\n' "${_dd_session[@]}" | sort -rn) + _dd_session=("${_dd_session[@]#* }") } - dd_zram_pick() { - if [ "$1" = game ]; then - dd_session_others - _pids=("${_dd_session[@]}") - [ "${DD_ZRAM_CLIENT:-1}" != 1 ] || _pids+=("${_dd_pids[@]}") - elif [ "$1" = session ]; then - dd_session_others - _pids=("${_dd_session[@]}") + dd_memory_relieved() { + local _k _v _u + while read -r _k _v _u; do + [ "$_k" = MemAvailable: ] || continue + case $_v in ''|*[!0-9]*) return 1 ;; esac + [ "$_v" -ge "$_dd_goal" ] + return + done 2>/dev/null < /proc/meminfo + return 1 + } + dd_zram_trim() { + local _mode=$1 _left=$2 _p _k _n _i _acks=() + shift 2 + _dd_trimmed=0 + for _k in "${!_dd_deaf[@]}"; do + [ "${_dd_deaf[$_k]}" -gt "$SECONDS" ] || unset "_dd_deaf[$_k]" + done + for _p in "$@"; do + [ "$_left" -ge 4096 ] && [ "$_dd_polls" -lt 250 ] && [ $((SECONDS - _dd_pass_at)) -lt 6 ] && + [ ! -e /tmp/.dd-zram.hold ] || break + ! dd_memory_relieved || break + dd_pid_key "$_p" + _k=$_dd_key + [ "${_dd_deaf[$_k]:-0}" -le "$SECONDS" ] || continue + dd_zram_usage "$_p" > /dev/null + [ "$_dd_anon" -ge 8192 ] || continue + printf %s - > "/tmp/.dd-zram.trim.$_p" + _acks+=("/tmp/.dd-zram.trim.$_p") + printf '%s %s\n' "$_mode" "$_left" > /tmp/.dd-zram + kill -URG "$_p" 2>/dev/null || continue + _dd_deaf[$_k]=$((SECONDS + 60)) + for ((_i = 0; _dd_polls < 250 && SECONDS - _dd_pass_at < 6; _i++, _dd_polls++)); do + [ ! -e /tmp/.dd-zram.hold ] || { _dd_deaf[$_k]=0; break; } + _n= + read -r _n 2>/dev/null < "/tmp/.dd-zram.trim.$_p" || : + case $_n in + -) [ "$_i" -lt 25 ] || break ;; + ''|*[!0-9]*) ;; + *) _dd_trimmed=$((_dd_trimmed + _n)) _left=$((_left - _n)) _dd_deaf[$_k]=0; break ;; + esac + nap 0.02 + done + done + [ ! -e /tmp/.dd-zram.hold ] || return 0 + printf '2 0\n' > /tmp/.dd-zram + [ "${#_acks[@]}" = 0 ] || rm -f "${_acks[@]}" + } + dd_memory_relieve() { + local _mode=2 _budget _gain=0 _rest _cap=$((256 * 1024)) _all=$((1024 * 1024)) + dd_memory_need + _dd_polls=0 _dd_pass_at=$SECONDS + if [ "$_dd_need" -le 0 ]; then + _dd_rest=0 + return 0 + fi + [ "$_dd_rest" = 0 ] || [ "$_dd_force" = 1 ] || [ "$SECONDS" -ge "$_dd_rest_until" ] || + [ "$_dd_available" -lt $((_dd_rest_available - _dd_floor / 8)) ] || return 0 + if [ "$_dd_swap_room" -lt $((64 * 1024)) ]; then + if [ $((SECONDS - _dd_full_at)) -ge 60 ]; then + _dd_full_at=$SECONDS + step "memory: available $((_dd_available / 1024)) MB and zRAM has no room left" + fi + return 0 + fi + if [ "$_dd_force" = 1 ] && [ $((SECONDS - _dd_forced_at)) -ge 10 ]; then + _mode=3 _dd_forced_at=$SECONDS _cap=$_all else - _pids=("${_dd_pids[@]}") + _cap=$((_cap - _dd_returned)) _all=$((_all - _dd_returned)) + fi + if [ "${#_dd_pids[@]}" -gt 0 ] && [ "$_all" -ge 4096 ] && + { [ "$_dd_hard" -gt 0 ] || + { [ "$_dd_game" = 1 ] && [ "$_dd_focus" != 1 ] && [ $((SECONDS - _dd_back_at)) -ge 30 ]; }; }; then + _budget=$((_dd_need * 1000 / _dd_saving)) + [ "$_budget" -le "$_all" ] || _budget=$_all + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_need)) + dd_zram_trim "$_mode" "$_budget" "${_dd_pids[@]}" + _gain=$((_dd_trimmed * _dd_saving / 1000)) + _dd_swap_room=$((_dd_swap_room - _dd_trimmed)) _all=$((_all - _dd_trimmed)) + [ "$_cap" -le "$_all" ] || _cap=$_all + _dd_client_out=$((_dd_client_out + _dd_trimmed)) _dd_note_client=$((_dd_note_client + _dd_trimmed)) + [ "$_dd_trimmed" = 0 ] || _dd_trim_at=$SECONDS + fi + _rest=$((_dd_hard - _gain)) + if [ "$_rest" -gt 0 ] && [ "$_cap" -ge 4096 ] && [ "$_dd_swap_room" -ge $((64 * 1024)) ]; then + [ "$_dd_session_at" = "$_dd_scan_at" ] || dd_session_others + _dd_session_at=$_dd_scan_at + _budget=$((_rest * 1000 / _dd_saving)) + [ "$_budget" -le "$_cap" ] || _budget=$_cap + [ "$_budget" -le "$_dd_swap_room" ] || _budget=$_dd_swap_room + _dd_goal=$((_dd_available + _dd_hard)) + dd_zram_trim "$_mode" "$_budget" "${_dd_session[@]}" + _gain=$((_gain + _dd_trimmed * _dd_saving / 1000)) + _dd_note_session=$((_dd_note_session + _dd_trimmed)) + fi + _dd_freed=$((_dd_freed + _gain)) + if [ "$_dd_hard" -gt 0 ] && [ "$_gain" -lt $((_dd_hard / 4)) ]; then + _dd_rest=$((_dd_rest > 0 ? _dd_rest * 2 : 5)) + [ "$_dd_rest" -le 60 ] || _dd_rest=60 + _dd_rest_until=$((SECONDS + _dd_rest)) _dd_rest_available=$_dd_available + else + _dd_rest=0 fi } - dd_zram_wait() { - local _p _left _start=$SECONDS - while [ $((SECONDS - _start)) -lt 12 ]; do - _left=0 - for _p in "$@"; do - [ -s "/tmp/.dd-zram.ack.$_p" ] && continue - [ -d "/proc/$_p" ] || continue - [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.dd-zram.ack.$_p" ] && continue - _left=1 - done - [ "$_left" = 1 ] || break - nap 0.2 - done - _dd_pageout_complete=1 - for _p in "$@"; do - if [ -d "/proc/$_p" ] && [ ! -s "/tmp/.dd-zram.ack.$_p" ]; then _dd_pageout_complete=0; fi - rm -f "/tmp/.dd-zram.ack.$_p" - done + dd_memory_note() { + [ $((_dd_note_client + _dd_note_session)) -ge $((16 * 1024)) ] && [ $((SECONDS - _dd_noted_at)) -ge 5 ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, falling $((_dd_rate / 1024)) MB/s, compressed $((_dd_note_client / 1024)) MB of the client and $((_dd_note_session / 1024)) MB of the session" + _dd_note_client=0 _dd_note_session=0 _dd_noted_at=$SECONDS } - dd_zram_send() { - local _mode=$1 _what=$2 _which=$3 _pids _p - dd_zram_pick "$_which" - step "zRAM: $_what ($(dd_zram_usage "${_pids[@]}"))" - for _p in "${_pids[@]}"; do rm -f "/tmp/.dd-zram.ack.$_p"; done - printf '%s' "$_mode" > /tmp/.dd-zram - [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null - _dd_zram_targets=("${_pids[@]}") - [ "${4:-}" != defer ] || return 0 - dd_zram_finish "$_mode" "${_pids[@]}" - } - dd_zram_finish() { - local _mode=$1 - shift - if [ "$_mode" = 1 ]; then dd_zram_wait "$@"; else nap 5; fi - dd_zram_scan - step "zRAM: done ($(dd_zram_usage "$@"))" + dd_client_readback() { + [ "$_dd_client_out" -gt 0 ] && [ "${#_dd_pids[@]}" -gt 0 ] || return 0 + [ "$_dd_game" = 0 ] || { [ -n "$_dd_away" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; } || return 0 + [ $((SECONDS - _dd_trim_at)) -ge 30 ] || return 0 + dd_zram_usage "${_dd_pids[@]}" > /dev/null + if [ "$_dd_swap" -lt $((16 * 1024)) ]; then + _dd_client_out=0 + return 0 + fi + [ $((_dd_available - _dd_swap)) -ge $((_dd_target + _dd_floor)) ] || return 0 + step "memory: available $((_dd_available / 1024)) MB, reading $((_dd_swap / 1024)) MB of the client back" + printf 0 > /tmp/.dd-zram || return 0 + kill -URG "${_dd_pids[@]}" 2>/dev/null || return 0 + _dd_freed=$((_dd_freed - _dd_swap * _dd_saving / 1000)) + _dd_client_out=0 _dd_back_at=$SECONDS } dd_game_focused() { if [ "${DD_DESKTOP:-}" = 1 ] || [ -z "${DD_LAUNCH_DIR:-}" ]; then @@ -1131,92 +1076,40 @@ case $mode in esac return 1 } - dd_over_cap() { - [ "$_dd_ram_cap" -gt 0 ] || return 1 - _dd_measured=$SECONDS - dd_session_others - dd_zram_usage "${_dd_pids[@]}" "${_dd_session[@]}" > /dev/null - [ "$_dd_rss" -gt "$_dd_ram_cap" ] - } - dd_cap_due() { - [ "$_dd_ram_cap" -gt 0 ] && { [ "$_dd_measured" -lt 0 ] || [ $((SECONDS - _dd_measured)) -ge 30 ]; } - } - _dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 - _dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - _dd_client_pending=0 _dd_client_reserve=0 _dd_client_targets=() _dd_away= - _dd_sample_at= _dd_sample_available=0 _dd_sample_gpu=0 _dd_sample_unevictable=0 _dd_sample_shmem=0 - while kill -0 $$ 2>/dev/null; do - dd_zram_scan - dd_memory_read - if dd_cap_due; then - if dd_over_cap; then - if [ "$_dd_capped" -lt 0 ] || [ $((SECONDS - _dd_capped)) -ge "$_dd_backoff" ]; then - dd_zram_usage "${_dd_pids[@]}" > /dev/null - if [ "$_dd_rss" -ge $((512 * 1024)) ]; then - dd_zram_send 1 "over the ${DD_RAM_CAP_MB} MB RAM cap, compressing the client" client - [ "$_dd_game" = 1 ] && _dd_packed=$SECONDS - else - step "RAM cap: over, client already small ($((_dd_rss / 1024)) MB resident), skipping it" - fi - dd_over_cap && dd_zram_send 1 "still over the RAM cap, compressing the rest of the session" session - if dd_over_cap; then - _dd_backoff=$((_dd_backoff * 2 > 600 ? 600 : _dd_backoff * 2)) - step "RAM cap: still over after paging out, next try in ${_dd_backoff} s" - else - _dd_backoff=30 - fi - _dd_capped=$SECONDS - fi - else - _dd_backoff=30 + dd_memory_tick() { + if [ $((SECONDS - _dd_scan_at)) -ge 5 ]; then + _dd_scan_at=$SECONDS + dd_zram_scan + _dd_focus=1 + if [ "$_dd_game" = 1 ]; then + dd_game_focused && _dd_focus=0 || _dd_focus=$? fi - fi - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_client_pressure defer - _dd_preserved_growth=$_dd_growth _dd_preserved_fall=$_dd_fall - dd_session_pressure - dd_client_pressure_finish - _dd_focus=1 - [ "$_dd_game" = 1 ] && { dd_game_focused && _dd_focus=0 || _dd_focus=$?; } - if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 0 ]; then - _dd_away= - if [ "$_dd_since" -lt 0 ] || [ "$_dd_since_apps" != "$_dd_apps" ]; then - _dd_since=$SECONDS _dd_since_apps=$_dd_apps - fi - if [ "${DD_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _dd_since)) -ge 20 ] && [ "${#_dd_pids[@]}" -gt 0 ] && - { [ "$_dd_packed" -lt 0 ] || [ $((SECONDS - _dd_packed)) -ge 300 ]; } && dd_client_can_pageout; then - dd_zram_send 1 "compressing the client" client - _dd_packed=$SECONDS - fi - elif [ "$_dd_game" != 1 ]; then - _dd_away= - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi - _dd_since=-1 _dd_packed=-1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_nogain=0 _dd_tier_pushed=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() - else - _dd_since=-1 - if [ "$_dd_focus" = 1 ]; then - [ -n "${_dd_away-}" ] || _dd_away=$SECONDS + if [ "$_dd_game" = 1 ] && [ "$_dd_focus" = 1 ]; then + [ -n "$_dd_away" ] || _dd_away=$SECONDS else _dd_away= fi - if [ "$_dd_packed" -ge 0 ]; then - _dd_unpack=1 - fi fi - if [ "$_dd_unpack" = 1 ] && - { [ "$_dd_game" = 0 ] || { [ "${_dd_ram_cap:-0}" = 0 ] && [ -n "${_dd_away-}" ] && [ $((SECONDS - _dd_away)) -ge 5 ]; }; } && - ! dd_over_cap && dd_client_can_readback; then - if [ "$_dd_game" = 0 ]; then - dd_zram_send 0 "memory recovered, reading the client back" client - else - dd_zram_send 0 "the client is in front of the game, reading it back" client - _dd_packed=-1 - fi - _dd_unpack=0 + dd_memory_read + [ ! -e /tmp/.dd-zram.hold ] || return 0 + dd_memory_relieve + dd_memory_note + [ "$_dd_need" -gt 0 ] || dd_client_readback + } + declare -A _dd_deaf=() _dd_preloaded=() + _dd_scan_at=-5 _dd_session_at=-1 _dd_session=() _dd_focus=1 _dd_away= + _dd_page_kb=$(($(getconf PAGESIZE 2>/dev/null || echo 4096) / 1024)) _dd_returned=0 _dd_polls=0 _dd_pass_at=0 _dd_goal=0 + _dd_sample_at= _dd_freed=0 _dd_client_out=0 _dd_note_client=0 _dd_note_session=0 + _dd_trim_at=-30 _dd_back_at=-30 _dd_forced_at=-10 _dd_full_at=-60 _dd_noted_at=-5 + _dd_rest=0 _dd_rest_until=0 _dd_rest_available=0 + while kill -0 $$ 2>/dev/null; do + dd_memory_tick + if [ "$_dd_available" -ge 0 ] && + { [ "$_dd_available" -lt $((_dd_mem_total * 2 / 5)) ] || [ "$_dd_rate" -ge $((16 * 1024)) ]; }; then + nap 1 + else + nap 5 fi - dd_watch_nap done ) & fi diff --git a/tools/linuxfs/preload/zram.c b/tools/linuxfs/preload/zram.c index 177fe8efef..551a6e148c 100644 --- a/tools/linuxfs/preload/zram.c +++ b/tools/linuxfs/preload/zram.c @@ -20,7 +20,16 @@ #define ZR_CTL "/tmp/.dd-zram" #endif #define ZR_SWAPPED (1ULL << 62) +#define ZR_PRESENT (1ULL << 63) #define ZR_BATCH 512 +#define ZR_CHUNK (1UL << 20) +#define ZR_SLOTS 32768UL +#define ZR_PROBES 16 +#define ZR_HEAT_MAX 3 +#define ZR_SKIP 32U +#define ZR_INLINE_KB (32UL << 10) +#define ZR_INLINE_CHUNKS 512UL +#define ZR_FAILED (~0UL) #define ZR_FUTEX_WAIT 0 #define ZR_FUTEX_WAKE 1 @@ -33,18 +42,43 @@ static char zr_maps[8192]; static uint64_t zr_entries[ZR_BATCH]; static struct iovec zr_iov[ZR_BATCH]; static char zr_sink[ZR_BATCH]; +static struct zr_slot { + unsigned long key; + uint16_t gen; + uint16_t pushed; + uint16_t kept; + uint8_t heat; + uint8_t skip; +} zr_slots[ZR_SLOTS]; +static uint16_t zr_gen = 1; +static unsigned long zr_cursor; +static unsigned long zr_visits; static int zr_open(const char *path) { return (int)zr_sys(SYS_openat, AT_FDCWD, path, O_RDONLY | O_CLOEXEC, 0); } -static int zr_mode(void) { - char c = 0; - int fd = zr_open(ZR_CTL); - if (fd < 0) return -1; - long n = zr_sys(SYS_read, fd, &c, 1); - zr_sys(SYS_close, fd); - return n == 1 && (c == '0' || c == '1') ? c - '0' : -1; +static int zr_mode(unsigned long *want) { + char text[24]; + long n = 0; + int fd = zr_open(ZR_CTL ".hold"); + if (fd >= 0) { + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1) { + fd = zr_open(ZR_CTL); + if (fd < 0) return -1; + n = zr_sys(SYS_read, fd, text, sizeof(text)); + zr_sys(SYS_close, fd); + } + if (n < 1 || text[0] < '0' || text[0] > '3') return -1; + unsigned long kb = 0; + for (long i = 2; i < n && text[i] >= '0' && text[i] <= '9'; i++) + kb = kb * 10 + (unsigned long)(text[i] - '0'); + *want = kb / (zr_page / 1024); + if (text[0] >= '2' && *want == 0) return -1; + return text[0] - '0'; } static unsigned long zr_hex(const char **p) { @@ -96,16 +130,103 @@ static void zr_read_back(int pagemap, unsigned long start, unsigned long end) { } } -static void zr_walk(int compress) { - int maps = zr_open("/proc/self/maps"); - if (maps < 0) return; - int pagemap = compress ? -1 : zr_open("/proc/self/pagemap"); - if (!compress && pagemap < 0) { - zr_sys(SYS_close, maps); - return; +static unsigned long zr_count(int pagemap, unsigned long start, unsigned long end, uint64_t bit) { + unsigned long count = 0; + long size = (long)((end - start) / zr_page * sizeof(uint64_t)); + long got; + do { + if (zr_sys(SYS_lseek, pagemap, (long)(start / zr_page * sizeof(uint64_t)), SEEK_SET) < 0) return ZR_FAILED; + got = zr_sys(SYS_read, pagemap, zr_entries, size); + } while (got < 0 && errno == EINTR); + if (got != size) return ZR_FAILED; + for (long i = 0; i < got / (long)sizeof(uint64_t); i++) + if (zr_entries[i] & bit) count++; + return count; +} + +static struct zr_slot *zr_slot(unsigned long addr, int create) { + unsigned long key = addr / zr_page + 1; + unsigned long home = key * 2654435761UL % ZR_SLOTS; + for (unsigned long i = 0; i < ZR_PROBES; i++) { + struct zr_slot *slot = &zr_slots[(home + i) % ZR_SLOTS]; + if (slot->key == key) return slot; + if (slot->key == 0 && !create) return NULL; + if (slot->key == 0) { + slot->key = key; + return slot; + } } + if (!create) return NULL; + memset(&zr_slots[home], 0, sizeof(zr_slots[home])); + zr_slots[home].key = key; + return &zr_slots[home]; +} + +static unsigned long zr_trim(int pagemap, unsigned long start, unsigned long end, + unsigned long want, int force, unsigned long lo, unsigned long hi) { + unsigned long done = 0; + for (unsigned long addr = start, next; addr < end && done < want; addr = next) { + next = (addr | (ZR_CHUNK - 1)) + 1; + if (next > end || next < addr) next = end; + if (next <= lo || addr >= hi) continue; + if (zr_visits == 0) break; + zr_visits--; + zr_cursor = next; + if (addr < (unsigned long)(zr_slots + ZR_SLOTS) && next > (unsigned long)zr_slots) continue; + unsigned long present = zr_count(pagemap, addr, next, ZR_PRESENT); + if (present == ZR_FAILED) continue; + struct zr_slot *slot = zr_slot(addr, 0); + if (slot != NULL && slot->gen == zr_gen && slot->pushed > 0) { + if (present > slot->kept && (present - slot->kept) * 4 > slot->pushed) { + if (slot->heat < ZR_HEAT_MAX) slot->heat++; + slot->skip = (uint8_t)(ZR_SKIP << slot->heat > 255 ? 255 : ZR_SKIP << slot->heat); + slot->pushed = 0; + } else if (slot->heat > 0) { + slot->heat--; + } + } + if (slot != NULL && slot->skip > 0 && !force) { + slot->skip--; + continue; + } + if (present == 0) continue; + unsigned long from = addr < lo ? lo : addr; + unsigned long left = present; + while (from < next && done + present - left < want) { + unsigned long budget = want - done - (present - left); + unsigned long i = (from - addr) / zr_page; + for (; i < (next - addr) / zr_page && budget > 0; i++) + if (zr_entries[i] & ZR_PRESENT) budget--; + unsigned long to = addr + i * zr_page; + zr_sys(SYS_madvise, from, to - from, MADV_PAGEOUT); + from = to; + unsigned long now = zr_count(pagemap, addr, next, ZR_PRESENT); + if (now == ZR_FAILED) break; + left = now < present ? now : present; + } + if (from < next) zr_cursor = from; + if (left >= present) continue; + if (slot == NULL) slot = zr_slot(addr, 1); + if (slot->gen != zr_gen) slot->pushed = 0; + slot->gen = zr_gen; + slot->pushed = (uint16_t)(slot->pushed + present - left); + slot->kept = (uint16_t)left; + done += present - left; + } + return done; +} + +static unsigned long zr_walk(int mode, unsigned long want, unsigned long lo, unsigned long hi) { + int maps = zr_open("/proc/self/maps"); + if (maps < 0) return 0; + int pagemap = mode == 1 ? -1 : zr_open("/proc/self/pagemap"); + if (mode != 1 && pagemap < 0) { + zr_sys(SYS_close, maps); + return 0; + } + unsigned long done = 0; size_t have = 0; - for (;;) { + while (done < want && zr_visits > 0) { long n = zr_sys(SYS_read, maps, zr_maps + have, sizeof(zr_maps) - 1 - have); if (n < 0 && errno == EINTR) continue; if (n <= 0) break; @@ -113,12 +234,13 @@ static void zr_walk(int compress) { zr_maps[have] = 0; char *line = zr_maps; char *nl; - while ((nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { + while (done < want && zr_visits > 0 && (nl = memchr(line, '\n', have - (size_t)(line - zr_maps))) != NULL) { *nl = 0; unsigned long s, e; - if (zr_eligible(line, compress, &s, &e) && e > s) { - if (compress) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); - else zr_read_back(pagemap, s, e); + if (zr_eligible(line, mode != 0, &s, &e) && e > s) { + if (mode == 0) zr_read_back(pagemap, s, e); + else if (mode == 1) zr_sys(SYS_madvise, s, e - s, MADV_PAGEOUT); + else done += zr_trim(pagemap, s, e, want - done, mode == 3, lo, hi); } line = nl + 1; } @@ -128,11 +250,12 @@ static void zr_walk(int compress) { } if (pagemap >= 0) zr_sys(SYS_close, pagemap); zr_sys(SYS_close, maps); + return done; } -static void zr_ack(int done) { - static const char suffix[] = ".ack."; - char path[sizeof(ZR_CTL) + sizeof(suffix) + 20]; +static void zr_ack(long value, int trim) { + const char *suffix = trim ? ".trim." : ".ack."; + char path[sizeof(ZR_CTL) + sizeof(".trim.") + 20]; char digits[20]; size_t n = 0, d = 0; for (const char *p = ZR_CTL; *p; p++) path[n++] = *p; @@ -143,15 +266,29 @@ static void zr_ack(int done) { path[n] = 0; int fd = (int)zr_sys(SYS_openat, AT_FDCWD, path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600); if (fd < 0) return; - if (done) zr_sys(SYS_write, fd, "1", 1UL); + for (d = 0; value >= 0 && (d == 0 || value > 0); value /= 10) digits[d++] = (char)('0' + value % 10); + for (n = 0; d > 0;) path[n++] = digits[--d]; + if (n > 0) zr_sys(SYS_write, fd, path, n); zr_sys(SYS_close, fd); } -static void zr_request(void) { - int mode = zr_mode(); - if (mode == 1) zr_ack(0); - if (mode >= 0) zr_walk(mode); - if (mode == 1) zr_ack(1); +static void zr_request(int worker) { + unsigned long want = 0; + int mode = zr_mode(&want); + if (mode < 0) return; + if (!worker && want > ZR_INLINE_KB / (zr_page / 1024)) want = ZR_INLINE_KB / (zr_page / 1024); + zr_visits = worker ? ZR_FAILED : ZR_INLINE_CHUNKS; + if (mode > 0) zr_ack(-1, mode > 1); + if (mode < 2) { + zr_walk(mode, 1, 0, 0); + zr_gen++; + if (mode == 1) zr_ack(1, 0); + return; + } + unsigned long from = zr_cursor; + unsigned long done = zr_walk(mode, want, from, ~0UL); + if (done < want && from > 0) done += zr_walk(mode, want - done, 0, from); + zr_ack((long)(done * (zr_page / 1024)), 1); } static void *zr_worker_main(void *unused) { @@ -160,7 +297,7 @@ static void *zr_worker_main(void *unused) { for (;;) { while (!__atomic_exchange_n(&zr_pending, 0, __ATOMIC_SEQ_CST)) zr_sys(SYS_futex, &zr_pending, ZR_FUTEX_WAIT, 0, NULL, NULL, 0); - zr_request(); + zr_request(1); } return NULL; } @@ -176,7 +313,7 @@ static void zr_handler(int sig, siginfo_t *info, void *context) { } else while (__atomic_load_n(&zr_pending, __ATOMIC_SEQ_CST) && !__atomic_exchange_n(&zr_busy, 1, __ATOMIC_SEQ_CST)) { __atomic_store_n(&zr_pending, 0, __ATOMIC_SEQ_CST); - zr_request(); + zr_request(0); __atomic_store_n(&zr_busy, 0, __ATOMIC_SEQ_CST); } errno = saved; diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 16d4c9342c..4b02d29c26 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -100,8 +100,7 @@ def required(): 'layer/VK_LAYER_DROIDDECK_vr.json', 'layer/VK_LAYER_DROIDDECK_vr_implicit.json', 'layer/libdroiddeck_vr_scheduling.so']] paths += ['assets/linuxfs/usr/local/lib/droiddeck-gpuload/' + name for name in - ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json', - 'libVkLayer_droiddeck_vramcap.so', 'VK_LAYER_DROIDDECK_vram_cap.json']] + ['libVkLayer_droiddeck_gpuload.so', 'VK_LAYER_DROIDDECK_gpu_load.json']] for side in ['left', 'right']: paths += [f'assets/linuxfs/usr/local/lib/droiddeck-vr/droiddeck/resources/rendermodels/droiddeck_hand_{side}/{name}' for name in [f'droiddeck_hand_{side}.json', 'hand.mtl', 'hand.png', 'hand_open.obj', 'hand_fist.obj', diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index 4a69f47ed7..be8e1dc31c 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -18,6 +18,15 @@ def run_bash(script, env=None): return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env) +def state_source(): + source = SCRIPT.read_text() + start = source.index(' declare -A _dd_deaf=()') + return source[start:source.index(' while kill -0', start)] + + +STATE = state_source() + + class ClientZramFocusTest(unittest.TestCase): def test_the_hidden_epic_launcher_is_compressed_with_the_client(self): with tempfile.TemporaryDirectory() as tmp: @@ -78,217 +87,59 @@ class ClientZramFocusTest(unittest.TestCase): self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) - def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): - source = SCRIPT.read_text() - start = source.index(' _dd_focus=1\n') - stop = source.index(' dd_watch_nap\n', start) - body = source[start:stop] - harness = ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_unpack=0 _dd_apps=" 413150" -_dd_pids=(123) -dd_game_focused() { [ "$focused" = 1 ]; } -dd_over_cap() { return 1; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { return 0; } -dd_zram_send() { echo "send:$1"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 -''' + body + ''' -} -tick 0 1 1 -tick 5 1 0 -tick 30 1 1 -echo "refocus:$_dd_packed" -tick 49 1 1 -tick 50 1 1 -tick 55 1 0 -tick 60 0 0 -''' - result = run_bash(harness) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) - - def monitor_harness(self): - source = SCRIPT.read_text() - start = source.index(' dd_zram_scan\n dd_memory_read\n') - stop = source.index(' dd_watch_nap\n', start) - return ''' -_dd_since=-1 _dd_since_apps= _dd_packed=-1 _dd_measured=-1 _dd_unpack=0 _dd_capped=-1 _dd_backoff=30 -_dd_apps=" 413150" -_dd_pids=(123) + TICK = ''' +dd_zram_scan() { _dd_game=$game _dd_pids=(10) _dd_others=() _dd_apps=" 413150"; } +dd_game_focused() { return $focus; } +dd_memory_read() { _dd_available=$((available * 1024)) _dd_mem_total=$((7168 * 1024)) _dd_floor=$((896 * 1024)); _dd_target=$((target * 1024)) _dd_swap_room=$((4096 * 1024)) _dd_saving=500 _dd_rate=0 _dd_psi=0; } +dd_zram_trim() { echo "trim:$NOW"; _dd_trimmed=$((64 * 1024)); } +dd_zram_usage() { _dd_swap=$((64 * 1024)); } +dd_session_others() { :; } step() { :; } -dd_zram_scan() { :; } -dd_memory_read() { :; } -dd_client_pressure() { :; } -dd_client_pressure_finish() { :; } -dd_session_pressure() { :; } -dd_client_can_pageout() { return 0; } -dd_client_can_readback() { [ "${readback:-1}" = 1 ]; } -dd_game_focused() { [ "$focused" = 1 ] && return 0; [ "$focused" = 2 ] && return 2; return 1; } -dd_cap_due() { [ "$cap_due" = 1 ]; } -dd_over_cap() { [ "$over_cap" = 1 ]; } -dd_zram_send() { echo "send:$1:$3"; } -tick() { - SECONDS=$1 _dd_game=$2 focused=$3 over_cap=$4 cap_due=$5 -''' + source[start:stop] + '\n}\n' +kill() { echo "back:$NOW"; } +game=1 focus=0 available=1500 target=1600 +run() { for NOW in $(seq "$1" "$2"); do dd_memory_tick; done; } +''' - def test_client_toggle_still_disables_automatic_compression(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 1 0 0 -tick 30 0 0 0 0 -''') + def tick(self, body): + functions = '\n'.join(function_source(name) for name in ( + 'dd_memory_need', 'dd_memory_relieve', 'dd_memory_note', 'dd_client_readback', 'dd_memory_tick')) + with tempfile.TemporaryDirectory() as tmp: + script = (functions + self.TICK + body).replace('/tmp/.dd-zram', tmp + '/ctl') + result = run_bash(('NOW=0\nset -u\n' + STATE + script).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + return result.stdout.splitlines() - def test_a_new_game_restarts_the_compression_delay(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -_dd_apps=" 413150 1245620" -tick 15 1 1 0 0 -tick 20 1 1 0 0 -echo "starting:$_dd_packed" -tick 34 1 1 0 0 -tick 35 1 1 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['starting:-1', 'send:1:client'], result.stdout.splitlines()) + def test_the_client_behind_a_game_is_trimmed_while_memory_is_short_of_the_target(self): + self.assertEqual(['trim:0', 'trim:1', 'trim:2'], self.tick('run 0 2\navailable=1700; run 3 9\n')) - def test_ram_cap_can_still_compress_an_unfocused_client(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 DD_RAM_CAP_MB=1024 -dd_zram_usage() { _dd_rss=$((768 * 1024)); } -tick 0 1 0 1 1 -echo "cap:$_dd_packed:$_dd_since:$_dd_backoff" -tick 5 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'send:1:session', 'cap:0:-1:60', 'send:0:client'], result.stdout.splitlines()) + def test_nothing_is_requested_while_the_app_holds_the_control_file(self): + self.assertEqual(['trim:3'], self.tick( + ': > /tmp/.dd-zram.hold; run 0 2\nrm /tmp/.dd-zram.hold; run 3 3\n')) - def test_game_exit_defers_restore_until_the_session_is_under_the_ram_cap(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 30 0 0 1 0 -echo "deferred:$_dd_unpack:$_dd_packed" -tick 35 0 0 0 0 -echo "restored:$_dd_unpack" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1:-1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_nothing_is_read_back_while_memory_is_still_needed(self): + self.assertEqual(['trim:0'], self.tick( + 'run 0 0\ngame=0 available=4000; dd_memory_need() { _dd_need=1 _dd_hard=0 _dd_force=0; }\n' + 'dd_memory_relieve() { dd_memory_need; }; run 1 40\n')) - def test_game_exit_defers_readback_under_pressure_even_without_a_ram_cap(self): - result = run_bash(self.monitor_harness() + """ -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 0 0 0 0 -echo "deferred:$_dd_unpack" -readback=1 -tick 30 0 0 0 0 -echo "restored:$_dd_unpack" -""") - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'deferred:1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + def test_game_exit_reads_the_client_back_after_a_quiet_half_minute(self): + self.assertEqual(['trim:0', 'back:30'], self.tick('run 0 0\ngame=0 available=4000; run 1 40\n')) - def test_client_in_front_of_a_running_game_is_read_back_and_compressed_again_later(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -echo "away:$_dd_packed" -tick 30 1 0 0 0 -echo "read:$_dd_packed:$_dd_unpack" -tick 35 1 0 0 0 -tick 40 1 1 0 0 -tick 55 1 1 0 0 -tick 60 1 1 0 0 -echo "again:$_dd_packed" -tick 65 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'away:20', 'send:0:client', 'read:-1:0', 'send:1:client', 'again:60', 'send:0:client'], - result.stdout.splitlines()) - - def test_unknown_focus_keeps_the_client_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 2 0 0 -tick 40 1 2 0 0 -echo "unknown:$_dd_packed:$_dd_unpack" -tick 45 1 0 0 0 -tick 48 1 2 0 0 -tick 52 1 0 0 0 -tick 56 1 0 0 0 -echo "flicker:$_dd_packed" -tick 57 1 0 0 0 -echo "read:$_dd_packed" -tick 60 0 2 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'unknown:20:1', 'flicker:20', 'send:0:client', 'read:-1'], - result.stdout.splitlines()) + def test_client_in_front_of_a_running_game_is_read_back_and_trimmed_again_later(self): + self.assertEqual(['trim:0', 'back:30', 'trim:60'], + self.tick('run 0 0\nfocus=1 available=4000; run 1 44\nfocus=0 available=1500; run 45 60\n')) def test_a_short_look_at_the_client_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -tick 25 1 0 0 0 -tick 28 1 1 0 0 -tick 30 1 0 0 0 -tick 34 1 0 0 0 -echo "packed:$_dd_packed" -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'packed:20'], result.stdout.splitlines()) + self.assertEqual(['trim:0'], self.tick('run 0 0\navailable=4000; run 1 34\nfocus=1; run 35 38\nfocus=0; run 39 60\n')) - def test_client_in_front_waits_for_memory_and_a_ram_cap_keeps_it_compressed(self): - result = run_bash(self.monitor_harness() + ''' -tick 0 1 1 0 0 -tick 20 1 1 0 0 -readback=0 -tick 25 1 0 0 0 -tick 35 1 0 0 0 -echo "tight:$_dd_packed" -readback=1 -tick 40 1 0 0 0 -echo "eased:$_dd_packed" -_dd_ram_cap=1048576 -tick 60 1 1 0 0 -tick 80 1 1 0 0 -tick 85 1 0 0 0 -tick 100 1 0 0 0 -echo "capped:$_dd_packed" -tick 105 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual(['send:1:client', 'tight:20', 'send:0:client', 'eased:-1', 'send:1:client', 'capped:80', 'send:0:client'], - result.stdout.splitlines()) + def test_unknown_focus_keeps_the_client_compressed(self): + self.assertEqual(['trim:0'], self.tick('run 0 0\nfocus=2 available=4000; run 1 60\n')) - def test_client_in_front_without_compression_reads_nothing_back(self): - result = run_bash(self.monitor_harness() + ''' -DD_ZRAM_CLIENT=0 -tick 0 1 1 0 0 -tick 25 1 0 0 0 -tick 40 1 0 0 0 -tick 45 0 0 0 0 -''') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - self.assertEqual('', result.stdout) + def test_client_in_front_waits_for_memory(self): + self.assertEqual(['trim:0', 'back:50'], self.tick('run 0 0\nfocus=1 available=1800 target=896; run 1 49\navailable=2500; run 50 60\n')) + + def test_a_client_that_was_never_trimmed_reads_nothing_back(self): + self.assertEqual([], self.tick('focus=1 available=4000; run 0 60\n')) def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): temp = tempfile.TemporaryDirectory() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 18435ffb9c..fbc7bdc026 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -824,7 +824,6 @@ class GameEnvironmentTest(unittest.TestCase): "offline_without_anticheat": lambda command, env: command, "game_logs": lambda command, env, app_id: env, "directaudio_settings": lambda env: env, - "vram_cap": lambda env: env, "render_path_defaults": lambda *args: None, "bridge_feature_level": lambda env: None, "force_ssbs": lambda command, env: env, @@ -1304,22 +1303,6 @@ class GameEnvironmentTest(unittest.TestCase): link.symlink_to(other, target_is_directory=True) self.assertTrue(chromium(str(link))) - def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): - cap = MODULE["vram_cap"] - self.assertEqual(cap({"DD_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096; dxgi.maxSharedMemory = 4096") - self.assertEqual(cap({"DD_VRAM_MB": "8192"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 8192; dxgi.maxSharedMemory = 8192") - self.assertEqual(cap({"DD_VRAM_MB": "4095"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4095; dxgi.maxSharedMemory = 4095; d3d9.maxAvailableMemory = 4095") - self.assertEqual(cap({"DD_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], - "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048; dxvk.maxFrameRate = 60") - for off in ({}, {"DD_VRAM_MB": "0"}, {"DD_VRAM_MB": "lots"}, {"DD_VRAM_MB": "²"}, {"DD_VRAM_MB": "-1"}): - self.assertNotIn("DXVK_CONFIG", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP", cap(off)) - self.assertNotIn("DROIDDECK_VRAM_CAP_MB", cap(off)) - - def test_the_vram_cap_also_turns_on_the_vulkan_layer_that_holds_the_game_to_it(self): - env = MODULE["vram_cap"]({"DD_VRAM_MB": "3072", "DXVK_CONFIG": "dxgi.maxDeviceMemory = 16384"}) - self.assertEqual((env["DROIDDECK_VRAM_CAP"], env["DROIDDECK_VRAM_CAP_MB"]), ("1", "3072")) - def test_a_games_wine_sync_choice_also_reaches_its_setup_runs(self): env = {"DD_SYNC": "1", "DD_SYNC_FALLBACK": "1", "DD_FSYNC_FIRST": "0", "OTHER": "kept"} config = {"version": 1, "games": {"42": {"DD_SYNC": "0", "DD_FSYNC_FIRST": "1", "PROTON_NO_ESYNC": "1", "FEX_TSOENABLED": "1"}}} diff --git a/tools/tests/test_memory_pressure.py b/tools/tests/test_memory_pressure.py index d32fa1f809..aeac289acc 100644 --- a/tools/tests/test_memory_pressure.py +++ b/tools/tests/test_memory_pressure.py @@ -2,7 +2,9 @@ from pathlib import Path import tempfile import unittest -from tools.tests.test_client_zram_focus import SCRIPT, function_source, run_bash +from tools.tests.test_client_zram_focus import STATE, function_source, run_bash + +MB = 1024 class MemoryPressureTest(unittest.TestCase): @@ -10,629 +12,336 @@ class MemoryPressureTest(unittest.TestCase): self.directory = tempfile.TemporaryDirectory() self.addCleanup(self.directory.cleanup) self.root = Path(self.directory.name) - self.memory() - def memory(self, available=1024, swap_free=4096, total=7168, swap_total=6144, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') + def sample(self, available=3000, total=7168, stall=0, zram=(6144, 0), other=(4096, 0), stored=None, swapped_in=None): + lines = [f'MemTotal: {total * MB} kB', f'MemAvailable: {available * MB} kB', + f'SwapTotal: {(zram[0] + other[0]) * MB} kB', + f'SwapFree: {(zram[0] - zram[1] + other[0] - other[1]) * MB} kB'] + swaps = ['Filename Type Size Used Priority'] + if zram[0]: + swaps.append(f'/dev/block/zram0 partition {zram[0] * MB} {zram[1] * MB} 100') + if other[0]: + swaps.append(f'/data/swap/swapfile file {other[0] * MB} {other[1] * MB} 50') + text = "printf '%s\\n' " + ' '.join(f"'{line}'" for line in lines) + f" > {self.root}/meminfo\n" + text += "printf '%s\\n' " + ' '.join(f"'{line}'" for line in swaps) + f" > {self.root}/swaps\n" + text += f"echo 'some avg10=0.00 avg60=0.00 avg300=0.00 total={stall}' > {self.root}/pressure\n" + if swapped_in is None: + text += f'rm -f {self.root}/vmstat\n' + else: + text += f"printf '%s\\n' 'pgfault 9' 'pswpin {swapped_in * MB // 4}' 'pswpout 7' > {self.root}/vmstat\n" + if stored is None: + text += f'rm -f {self.root}/mm_stat\n' + else: + text += f'echo "{stored[0] << 20} {stored[1] << 20} {stored[1] << 20} 0 0 0 0 0 0" > {self.root}/mm_stat\n' + return text - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', 'dd_client_can_pageout', - 'dd_client_can_readback', 'dd_client_pressure', 'dd_client_pressure_result', 'dd_zram_has_room')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_pids=(123) _dd_game=1 _dd_packed=-1 _dd_pressure_at=-1 _dd_pressure_backoff=30 -rss=$((384 * 1024)) client_swap=$((512 * 1024)) reclaimed=$((128 * 1024)) -step() { :; } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$client_swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - reclaimed)); _dd_pageout_complete=${pageout_complete:-1}; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) + def run_policy(self, body, *names): + functions = '\n'.join(function_source(name) for name in ('dd_memory_read', 'dd_memory_need') + names) + for name in ('meminfo', 'swaps', 'pressure/memory', 'vmstat'): + functions = functions.replace('/proc/' + name, str(self.root / name.split('/')[0])) + functions = functions.replace('/sys/block/zram0/mm_stat', str(self.root / 'mm_stat')) + functions = functions.replace('/tmp/.dd-zram', str(self.root / 'ctl')) + result = run_bash(('NOW=0\nset -u\n' + STATE + functions + '\n' + body).replace('SECONDS', 'NOW')) self.assertEqual(0, result.returncode, result.stderr) self.assertEqual('', result.stderr) return result.stdout.splitlines() - def test_pressure_reclaims_before_the_focus_delay_and_respects_cooldown(self): - self.assertEqual(['send:1:client', 'send:1:client'], self.run_policy(''' -SECONDS=0; dd_client_pressure -SECONDS=5; dd_client_pressure -SECONDS=29; dd_client_pressure -SECONDS=30; dd_client_pressure -''')) - - def test_no_game_or_disabled_client_compression_does_not_reclaim(self): - self.assertEqual([], self.run_policy(''' -_dd_game=0; dd_client_pressure -_dd_game=1 DD_ZRAM_CLIENT=0; dd_client_pressure -''')) - - def test_high_available_memory_does_not_reclaim_even_with_stalls(self): - self.memory(available=4096, psi='12.34') - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_psi_reclaims_with_moderate_headroom(self): - self.memory(available=2048, psi='01.23') - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_psi_still_uses_memory_headroom(self): - (self.root / 'pressure').unlink() - self.assertEqual(['send:1:client'], self.run_policy('dd_client_pressure')) - - def test_missing_meminfo_never_reclaims_or_prefetches(self): - (self.root / 'meminfo').write_text('SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_missing_available_memory_does_not_trigger_pressure(self): - p = self.root / 'meminfo' - p.write_text('\n'.join(line for line in p.read_text().splitlines() if not line.startswith('MemAvailable:'))) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_swap_reserve_includes_the_clients_resident_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['no'], self.run_policy(''' -dd_client_pressure -if dd_client_can_pageout; then echo yes; else echo no; fi -''')) - - def test_client_swap_budget_excludes_file_backed_memory(self): - self.memory(swap_free=1536) - self.assertEqual(['send:1:client'], self.run_policy(''' -rss=$((2048 * 1024)) anon=$((256 * 1024)) -dd_client_pressure -''')) - - def test_without_swap_automatic_pageout_is_disabled(self): - self.memory(swap_total=0, swap_free=0) - self.assertEqual([], self.run_policy('dd_client_pressure')) - - def test_recent_periodic_pageout_prevents_an_immediate_pressure_repeat(self): - self.assertEqual([], self.run_policy('_dd_packed=$SECONDS; dd_client_pressure')) - - def test_ineffective_reclaim_backs_off_and_success_resets_it(self): - self.assertEqual(['send:1:client', 'backoff:60', 'send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -SECONDS=30; dd_client_pressure -reclaimed=$((128 * 1024)) -SECONDS=60; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_readback_requires_room_for_the_swapped_client_plus_headroom(self): - self.memory(available=2048) - self.assertEqual(['yes', 'no'], self.run_policy(''' -if dd_client_can_readback; then echo yes; else echo no; fi -client_swap=$((1024 * 1024)) -if dd_client_can_readback; then echo yes; else echo no; fi -''')) - - def test_unfinished_pageout_does_not_increase_the_ineffective_reclaim_backoff(self): - self.assertEqual(['send:1:client', 'backoff:30'], self.run_policy(''' -reclaimed=0 pageout_complete=0 -SECONDS=0; dd_client_pressure -echo "backoff:$_dd_pressure_backoff" -''')) - - def test_pageout_completion_requires_a_finished_ack_from_every_live_target(self): - proc = self.root / 'proc' - proc.mkdir() - for pid in (123, 456): - (proc / str(pid)).mkdir() - source = function_source('dd_zram_wait').replace('/proc/', str(proc) + '/') - source = source.replace('/tmp/.dd-zram.ack.', str(self.root / 'ack.')) - for pending in ('done', 'running', 'not_started'): - with self.subTest(pending=pending): - (self.root / 'ack.123').write_text('1') - if pending != 'not_started': - (self.root / 'ack.456').write_text('1' if pending == 'done' else '') - result = run_bash('nap() { SECONDS=$((SECONDS + 1)); }\n' + source + - '\nSECONDS=0; dd_zram_wait 123 456; echo "$_dd_pageout_complete"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('1' if pending == 'done' else '0', result.stdout.strip()) - - def test_pressure_prevents_prefetch_even_if_the_client_would_fit(self): - self.memory(available=2048, psi='2.00') - self.assertEqual(['no'], self.run_policy('if dd_client_can_readback; then echo yes; else echo no; fi')) - - -class SessionPressureTest(unittest.TestCase): - def setUp(self): - self.directory = tempfile.TemporaryDirectory() - self.addCleanup(self.directory.cleanup) - self.root = Path(self.directory.name) - self.memory() - - def memory(self, available=1024, swap_free=6144, total=7168, swap_total=8192, psi='0.00'): - (self.root / 'meminfo').write_text( - f'MemTotal: {total * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {swap_total * 1024} kB\nSwapFree: {swap_free * 1024} kB\n') - (self.root / 'pressure').write_text(f'some avg10={psi} avg60=0.00 avg300=0.00 total=1234\n') - - def run_policy(self, body): - functions = '\n'.join(function_source(name) for name in ( - 'dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_client_can_pageout', 'dd_client_pressure', 'dd_client_pressure_result', - 'dd_session_pressure', 'dd_zram_has_room', 'dd_watch_nap', 'dd_zram_pick', 'dd_tier_note', 'dd_tier_readback')) - functions = functions.replace('/proc/meminfo', str(self.root / 'meminfo')) - functions = functions.replace('/proc/pressure/memory', str(self.root / 'pressure')) - harness = ''' -set -u -_dd_game=1 _dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 _dd_tier_back=0 _dd_tier_targets=() _dd_tier_swaps=() _dd_tier_starts=() _dd_pids=(999) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -rss=$((1536 * 1024)) swap=0 pushed=$((1024 * 1024)) alive="999 321 654" started=100 complete=1 -step() { :; } -meminfo=''' + repr(str(self.root / 'meminfo')) + ''' -dd_game_focused() { [ "${focused:-1}" = 1 ]; } -dd_proc_start() { _dd_start=; case " $alive " in *" $1 "*) _dd_start=$started; return 0 ;; esac; return 1; } -nap() { echo "nap:$1"; } -dd_session_others() { _dd_session=(321 654); } -dd_zram_usage() { _dd_rss=$rss _dd_anon=${anon:-$rss} _dd_swap=$swap; } -dd_zram_send() { echo "send:$1:$3"; rss=$((rss - pushed)); swap=$((swap + pushed)); next_available=${available_after:-$(( $(awk '/^MemAvailable:/ { print $2 }' "$meminfo") / 1024 + 128 ))}; sed -i "s/^MemAvailable:.*/MemAvailable: $((next_available * 1024)) kB/" "$meminfo"; _dd_pageout_complete=$complete; } -''' + functions + '\ndd_memory_read\n' + body - result = run_bash('NOW=0\n' + harness.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - - def test_low_headroom_compresses_the_game_session_at_most_every_30_seconds(self): - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -SECONDS=10; dd_session_pressure -SECONDS=29; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_pressure_policy_is_independent_of_ram_size(self): - for total, expected in ((11264, ['send:1:session']), (12288, ['send:1:session']), (16384, ['send:1:session'])): - with self.subTest(total=total): - self.memory(total=total) - self.assertEqual(expected, self.run_policy('dd_session_pressure')) - - def test_large_device_with_real_headroom_does_not_reclaim(self): - self.memory(total=16384, available=5120, psi='12.34') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_large_device_with_psi_and_moderate_headroom_reclaims(self): - self.memory(total=16384, available=3072, psi='1.23') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_a_fast_fall_on_a_large_device_reclaims_above_the_fixed_headroom(self): - self.memory(total=15255, available=6176) - falling = self.root / 'falling' - falling.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {5367 * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - meminfo = self.root / 'meminfo' - self.assertEqual(['send:1:session'], self.run_policy( - f'cp {falling} {meminfo}\nSECONDS=5; dd_session_pressure')) - - def test_a_fall_split_across_one_second_polls_still_reclaims(self): - self.memory(total=15255, available=6300) - steps = [] - for second, available in ((5, 6100), (6, 6020), (7, 5940), (8, 5860), (9, 5780)): - sample = self.root / f'meminfo-{second}' - sample.write_text( - f'MemTotal: {15255 * 1024} kB\nMemAvailable: {available * 1024} kB\n' - f'SwapTotal: {8192 * 1024} kB\nSwapFree: {6144 * 1024} kB\n') - steps.append(f'cp {sample} {self.root / "meminfo"}; SECONDS={second}; dd_session_pressure') - self.assertEqual(['send:1:session'], self.run_policy('\n'.join(steps))) - - def test_no_game_does_not_compress_the_session(self): - self.assertEqual([], self.run_policy('_dd_game=0; dd_session_pressure')) - - def test_disabled_idle_compression_does_not_compress_the_session(self): - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_disabled_idle_compression_signals_only_launcher_processes(self): - sender = (function_source('dd_zram_send') + '\n' + function_source('dd_zram_finish')).replace('/tmp/.dd-zram', str(self.root / 'control')) - self.assertEqual(['kill:-URG 999 998', 'mode:1'], self.run_policy(''' -_dd_pids=(999 998) -kill() { echo "kill:$*"; } -dd_zram_wait() { _dd_pageout_complete=1; } -dd_zram_scan() { :; } -''' + sender + ''' -DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure -echo "mode:$(cat ''' + str(self.root / 'control') + ''')" -''')) - - def test_disabled_idle_compression_reclaims_only_the_launcher_before_focus(self): - self.memory(available=1700) - self.assertEqual(['send:1:client'], self.run_policy(''' -DD_ZRAM_IDLE=0 focused=0 -dd_client_pressure -dd_session_pressure -''')) - - def test_disabled_idle_compression_respects_launcher_setting_and_threshold(self): - self.memory(available=1700) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0 DD_ZRAM_CLIENT=0; dd_client_pressure; dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_game_reclaim_requires_focus(self): - self.assertEqual([], self.run_policy('focused=0; dd_session_pressure')) - - def test_game_reclaim_runs_when_focus_is_unknown(self): - launch = self.root / 'launch' - (launch / 'agent').mkdir(parents=True) - body = function_source('dd_game_focused') + f'\nDD_LAUNCH_DIR={launch} _dd_apps=7\n' - self.assertEqual(['send:1:session'], self.run_policy(body + 'dd_session_pressure')) - (launch / 'agent' / 'focus.json').write_text('{"focusedApp": 9}') - self.assertEqual([], self.run_policy(body + 'dd_session_pressure')) - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - (launch / 'agent' / 'focus.json').unlink() - self.assertEqual(['unfocused'], self.run_policy(body + 'dd_game_focused || echo unfocused')) - - def test_launcher_pressure_remains_available_on_larger_devices(self): - self.memory(total=15360, available=1400) - self.assertEqual(['send:1:client'], self.run_policy('DD_ZRAM_IDLE=0; dd_client_pressure; dd_session_pressure')) - - def test_enough_available_memory_does_not_compress_even_with_stalls(self): - self.memory(available=3072, psi='5.00') - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_stalls_with_moderate_headroom_compress_before_the_hard_limit(self): - self.memory(available=2048, psi='1.50') - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - - def test_moderate_headroom_without_stalls_waits(self): - self.memory(available=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_same_second_memory_read_preserves_the_pressure_baseline(self): - self.memory(available=2048) - meminfo = self.root / 'meminfo' - self.assertEqual(['1048576:524288:2097152'], self.run_policy(f''' -SECONDS=100 -_dd_sample_at=100 _dd_sample_available=2097152 _dd_growth=0 _dd_fall=524288 -sed -i 's/MemAvailable: 2097152 kB/MemAvailable: 1048576 kB/' {meminfo} -dd_memory_read -echo "$_dd_available:$_dd_fall:$_dd_sample_available" -''')) - - def test_game_reading_back_most_of_a_pageout_skips_and_doubles_the_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:60', - 'send:1:session', 'backoff:30'], self.run_policy(''' -pushed=$((512 * 1024)) -SECONDS=0; dd_session_pressure -swap=$((swap / 4)) -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=150; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_repeated_read_back_keeps_doubling_up_to_five_minutes(self): - self.assertEqual(['backoff:300'], self.run_policy(''' -_dd_tier_backoff=240 _dd_tier_at=0 _dd_tier_targets=(999) _dd_tier_swaps=($((1024 * 1024))) _dd_tier_starts=(100) _dd_tier_pushed=$((1024 * 1024)) swap=0 -SECONDS=240; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_no_gain_pageout_doubles_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session', 'backoff:120'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_meaningful_available_gain_keeps_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:30', 'send:1:session', 'backoff:30'], self.run_policy(''' -available_after=1300 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1600 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_recovered_available_memory_resets_the_tier_wait(self): - self.assertEqual(['send:1:session', 'backoff:60', 'backoff:30', 'send:1:session'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=2000 -sed -i "s/^MemAvailable:.*/MemAvailable: 2048000 kB/" "$meminfo" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -available_after=1024 -sed -i "s/^MemAvailable:.*/MemAvailable: 1048576 kB/" "$meminfo" -SECONDS=60; dd_session_pressure -''')) - - def test_critical_memory_still_compresses_after_a_no_gain_pass(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_a_no_gain_pass_still_skips_memory_the_game_read_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session'], self.run_policy(''' -available_after=512 -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_ignores_the_backoff_but_keeps_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -_dd_tier_backoff=300 -SECONDS=0; dd_session_pressure -SECONDS=20; dd_session_pressure -SECONDS=30; dd_session_pressure -''')) - - def test_nearly_out_of_memory_still_backs_off_when_the_game_reads_its_pageout_back(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'backoff:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -SECONDS=59; dd_session_pressure -SECONDS=60; dd_session_pressure -SECONDS=90; dd_session_pressure -''')) - - def test_nearly_out_of_memory_retries_a_skipped_pageout_after_30_seconds(self): - self.memory(available=512) - self.assertEqual(['send:1:session', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -_dd_tier_backoff=300 -saved=$rss; rss=$((128 * 1024)) -SECONDS=330; dd_session_pressure -rss=$saved -SECONDS=359; dd_session_pressure -SECONDS=360; dd_session_pressure -''')) - - def test_small_swap_headroom_skips_the_pageout(self): - self.memory(swap_free=1536, swap_total=2048) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - def test_file_backed_resident_memory_does_not_consume_the_swap_budget(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual(['send:1:session'], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1024 * 1024)) -dd_session_pressure -''')) - - def test_anonymous_memory_and_pending_client_still_need_the_full_swap_reserve(self): - self.memory(swap_free=3088, swap_total=6144) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((2048 * 1024)) -dd_session_pressure -''')) - self.assertEqual([], self.run_policy(''' -rss=$((4096 * 1024)) anon=$((1536 * 1024)) _dd_client_reserve=$((512 * 1024)) -dd_session_pressure -''')) - - def test_small_session_is_left_alone(self): - self.assertEqual([], self.run_policy('rss=$((128 * 1024)); dd_session_pressure')) - - def test_watch_polls_every_second_near_the_limit_and_stops_when_critical(self): - self.memory(available=2560) - self.assertEqual(['nap:1', 'nap:1', 'nap:1', 'nap:1', 'nap:1'], self.run_policy('dd_watch_nap')) - self.memory(available=1024) - self.assertEqual(['nap:1'], self.run_policy('_dd_available=$((2560 * 1024)); dd_watch_nap')) - self.memory(available=4096) - self.assertEqual(['nap:5'], self.run_policy('dd_watch_nap')) - self.assertEqual(['nap:5'], self.run_policy('_dd_game=0; dd_watch_nap')) - - def test_session_push_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'pids:321 654', 'client:-1:-1'], self.run_policy(''' -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_launcher_compression_turned_off_keeps_the_launcher_out(self): - self.assertEqual(['pids:321 654', 'client:-1:-1'], self.run_policy(''' -DD_ZRAM_CLIENT=0 -SECONDS=0; dd_session_pressure -dd_zram_pick session; echo "pids:${_pids[*]}" -echo "client:$_dd_pressure_at:$_dd_packed" -''')[1:]) - - def test_low_ram_devices_compress_with_a_quarter_of_memory_left(self): - self.memory(available=1700) - self.assertEqual(['send:1:session'], self.run_policy('dd_session_pressure')) - self.memory(available=1900) - self.assertEqual([], self.run_policy('dd_session_pressure')) - - - def test_a_compressed_process_that_exits_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -alive=""; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_a_process_that_starts_after_a_pageout_is_not_in_its_read_back(self): - self.assertEqual(['send:1:session', 'targets:321 654', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -echo "targets:${_dd_tier_targets[*]}" -alive="999 1234" -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_read_back_wait_holds_above_the_critical_level(self): - self.assertEqual(['send:1:session', 't:60', 'send:1:session'], self.run_policy(''' -SECONDS=0; dd_session_pressure -swap=0 -SECONDS=30; dd_session_pressure -SECONDS=60; dd_session_pressure; echo t:60 -SECONDS=90; dd_session_pressure -''')) - - def test_a_no_gain_pageout_preserves_client_timestamps(self): - self.assertEqual(['send:1:session', 'backoff:60', 'client:-1:-1'], self.run_policy(''' -available_after=1024 -SECONDS=0; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - def test_an_incomplete_pageout_does_not_restart_the_launcher_wait(self): - self.assertEqual(['send:1:session', 'client:-1:-1'], self.run_policy(''' -complete=0 -SECONDS=0; dd_session_pressure -echo "client:$_dd_pressure_at:$_dd_packed" -''')) - - - def test_a_reused_process_id_is_not_counted_as_read_back(self): - self.assertEqual(['send:1:session', 'send:1:session', 'backoff:30'], self.run_policy(''' -SECONDS=0; dd_session_pressure -started=200; swap=0 -SECONDS=30; dd_session_pressure -echo "backoff:$_dd_tier_backoff" -''')) - - def test_process_start_comes_from_stat_and_zombies_have_none(self): - stat = self.root / 'stat' - source = function_source('dd_proc_start').replace('/proc/$1/stat', str(stat)) - fields = ' '.join(['0'] * 17) - for state, expected in (('S', ['ok:4242']), ('Z', ['gone:'])): - with self.subTest(state=state): - stat.write_text(f'77 (Wow (arm64).exe) {state} 1 {fields} 4242 99 0\n') - result = run_bash(source + '\nif dd_proc_start 77; then echo "ok:$_dd_start"; else echo "gone:$_dd_start"; fi') - self.assertEqual(expected, result.stdout.split()) - stat.unlink() - result = run_bash(source + '\ndd_proc_start 77 || echo gone') - self.assertEqual(['gone'], result.stdout.split()) - - -class ReclaimDispatchTest(unittest.TestCase): - def run_cycle(self, client=1, game=1, anonymous=384, complete=1, reclaimed=128, body=None, available=1024, fall=0, tick=0): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - (root / 'meminfo').write_text( - f'MemTotal: 7340032 kB\nMemAvailable: {available * 1024} kB\n' - 'SwapTotal: 6291456 kB\nSwapFree: 4194304 kB\n') - (root / 'pressure').write_text('some avg10=0.00 avg60=0.00 avg300=0.00 total=0\n') - names = ('dd_memory_read', 'dd_memory_tight', 'dd_memory_critical', - 'dd_zram_has_room', 'dd_client_can_pageout', 'dd_client_pressure', - 'dd_client_pressure_result', 'dd_client_pressure_finish', - 'dd_session_pressure', 'dd_zram_send', 'dd_zram_finish', 'dd_zram_pick') - source = '\n'.join(function_source(name) for name in names) - source = source.replace('/proc/meminfo', str(root / 'meminfo')) - source = source.replace('/proc/pressure/memory', str(root / 'pressure')) - source = source.replace('/tmp/.dd-zram', str(root / 'ctl')) - monitor = SCRIPT.read_text() - start = monitor.index(' _dd_preserved_growth=$_dd_growth', monitor.index('while kill -0 $$')) - stop = monitor.index(' _dd_focus=1\n', start) - cycle = monitor[start:stop] if body is None else body - script = f''' -set -u -DD_ZRAM_CLIENT={client} _dd_game={game} _dd_pids=(123) _dd_others=(321) -_dd_pressure_at=-1 _dd_pressure_backoff=30 _dd_packed=-1 -_dd_tier_at=-1 _dd_tier_backoff=30 _dd_tier_pushed=0 -_dd_client_reserve=0 client_rss=393216 client_anon={anonymous * 1024} -step() {{ :; }} -dd_session_others() {{ _dd_session=(321); }} -dd_zram_scan() {{ _dd_pids=(456); }} -nap() {{ echo "nap:$*:at:$NOW"; }} -dd_zram_usage() {{ - if [ "$1" = 123 ]; then - _dd_rss=$client_rss _dd_anon=$client_anon _dd_swap=0 - else - _dd_rss=3145728 _dd_anon=1572864 _dd_swap=0 - fi -}} -kill() {{ echo "signal:$*:at:$NOW"; NOW=$((NOW + {tick})); }} -dd_zram_wait() {{ - echo "wait:$*:at:$NOW" - NOW=$((NOW + 12)) - _dd_pageout_complete={complete} - [ "$1" != 123 ] || client_rss=$((client_rss - {reclaimed * 1024})) -}} -dd_tier_note() {{ :; }} -dd_game_focused() {{ :; }} -''' + source + f''' -dd_memory_read -_dd_fall={fall * 1024} -''' + cycle + ''' -echo "client:$_dd_pressure_backoff:${_dd_client_reserve:-0}:${_dd_client_pending:-0}" + def test_the_floor_follows_device_memory_within_limits(self): + body = ''.join(self.sample(total=total) + 'dd_memory_read; echo $((_dd_floor / 1024))\n' + for total in (3584, 7168, 15360)) + self.assertEqual(['640', '896', '1280'], self.run_policy(body)) + + def test_the_target_grows_with_how_fast_memory_is_falling(self): + body = (self.sample(available=3000) + 'dd_memory_read; echo $_dd_rate $((_dd_target / 1024))\n' + + self.sample(available=2800) + 'NOW=1; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $((_dd_target / 1024))\n' + + self.sample(available=3400) + 'NOW=3; dd_memory_read; echo $((_dd_rate / 1024))\n') + self.assertEqual(['0 896', '200 2896', '150 2396', '112'], self.run_policy(body)) + + def test_memory_the_monitor_freed_itself_does_not_hide_a_fall(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=$((300 * 1024))\n' + + 'NOW=2; dd_memory_read; echo $((_dd_rate / 1024)) $_dd_freed\n') + self.assertEqual(['150 0'], self.run_policy(body)) + + def test_two_reads_in_the_same_second_keep_the_sample(self): + body = (self.sample(available=2000) + 'dd_memory_read\n_dd_freed=4096\n' + + self.sample(available=1000) + 'dd_memory_read; echo $_dd_rate $_dd_freed $_dd_sample_available\n') + self.assertEqual([f'0 4096 {2000 * MB}'], self.run_policy(body)) + + def test_stall_time_becomes_a_share_of_the_interval(self): + body = (self.sample(stall=1000) + 'dd_memory_read; echo $_dd_psi\n' + + self.sample(stall=41000) + 'NOW=2; dd_memory_read; echo $_dd_psi\n' + + 'NOW=3; dd_memory_read; echo $_dd_psi\n') + self.assertEqual(['0', '200', '0'], self.run_policy(body)) + + def test_room_counts_zram_only_and_keeps_a_reserve(self): + body = (self.sample(zram=(6144, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(6144, 5632)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(512, 0), other=(0, 0)) + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n' + + self.sample(zram=(0, 0), other=(4096, 1024)) + f'rm {self.root}/swaps\n' + + 'dd_memory_read; echo $((_dd_swap_room / 1024))\n') + self.assertEqual(['4352', '-256', '-128', '384', '2560'], self.run_policy(body)) + + def test_memory_read_back_from_swap_is_remembered_for_half_a_minute(self): + body = '_dd_page_kb=4\n' + ''.join( + f'NOW={now}\n' + self.sample(swapped_in=total) + 'dd_memory_read; echo $((_dd_returned / 1024))\n' + for now, total in ((0, 500), (1, 800), (2, 800), (16, 800), (17, None), (18, 900), (19, 1000), (60, 1000))) + self.assertEqual(['0', '300', '290', '154', '149', '144', '239', '0'], self.run_policy(body)) + + def test_saving_comes_from_what_zram_really_stores(self): + body = ''.join(self.sample(stored=stored) + 'dd_memory_read; echo $_dd_saving\n' + for stored in (None, (32, 30), (1000, 250), (1000, 950), (1000, 20))) + self.assertEqual(['600', '600', '750', '167', '833'], self.run_policy(body)) + + def need(self, available, rate=0, psi=0): + return (self.sample(available=available) + + f'dd_memory_read; _dd_rate=$(({rate} * 1024)) _dd_psi={psi}\n' + '_dd_target=$((_dd_floor + _dd_rate * 10))\n' + 'dd_memory_need; echo $((_dd_need / 1024)) $((_dd_hard / 1024)) $_dd_force\n') + + def test_steady_memory_above_the_floor_needs_nothing(self): + self.assertEqual(['0 0 0'], self.run_policy(self.need(2000))) + + def test_memory_under_the_floor_must_be_freed(self): + self.assertEqual(['96 96 0'], self.run_policy(self.need(800))) + + def test_a_slow_fall_is_met_ten_seconds_ahead(self): + self.assertEqual(['196 0 0'], self.run_policy(self.need(1000, rate=30))) + + def test_a_fast_fall_is_matched_once_memory_is_under_two_fifths(self): + self.assertEqual(['0 0 0', '200 0 0', '0 0 0'], + self.run_policy(self.need(2500, rate=20) + self.need(2500, rate=100) + self.need(4000, rate=100))) + + def test_stalls_make_a_fall_urgent(self): + self.assertEqual(['200 0 0', '200 200 0', '0 0 0'], + self.run_policy(self.need(2500, rate=100) + self.need(2500, rate=100, psi=100) + + self.need(2000, psi=900))) + + def test_half_the_floor_forces(self): + self.assertEqual(['446 446 0', '456 456 1'], self.run_policy(self.need(450) + self.need(440))) + + RELIEVE = ''' +step() { echo "step:$*"; } +dd_session_others() { echo others; _dd_session=(70 80); } +dd_zram_trim() { echo "trim:$1:$(($2 / 1024)):${*:3}"; _dd_trimmed=${paged:-$2}; } +relieve() { dd_memory_read; _dd_returned=${returned:-0}; _dd_rate=$((${2:-0} * 1024)) _dd_target=$((_dd_floor + ${2:-0} * 10240)); dd_memory_relieve; } +_dd_pids=(10 20) _dd_game=1 _dd_focus=0 _dd_saving=500 ''' - result = run_bash('NOW=0\n' + script.replace('SECONDS', 'NOW')) - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('', result.stderr) - return result.stdout.splitlines() - def test_both_requests_are_sent_before_either_wait(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], self.run_cycle()) + def relieve(self, body): + return self.run_policy(self.RELIEVE + body, 'dd_memory_relieve', 'dd_memory_note') - def test_disabled_client_is_never_signalled_or_waited_for(self): - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0)) + def test_a_fall_trims_the_client_behind_a_game_by_what_zram_gives_back(self): + self.assertEqual(['trim:2:326:10 20', f'{196 * MB} {334506 * 600 // 1000} 334506'], self.relieve( + self.sample(available=1000) + 'relieve 1000 30; echo $_dd_need $_dd_freed $_dd_client_out\n')) - def test_no_game_requests_nothing(self): - self.assertEqual(['client:30:0:0'], self.run_cycle(game=0)) + def test_the_client_in_front_is_left_alone_until_memory_is_under_the_floor(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_a_client_with_no_anonymous_pages_still_finishes_its_request(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:0', - 'wait:321:at:0', 'wait:123:at:12', 'client:30:0:0'], - self.run_cycle(anonymous=0)) + def test_unknown_focus_still_trims_the_client(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve(self.sample(available=1000) + '_dd_focus=2; relieve 1000 30\n')) - def test_falling_headroom_survives_a_tick_between_requests(self): - self.assertEqual(['signal:-URG 123:at:0', 'signal:-URG 321:at:1', - 'wait:321:at:2', 'wait:123:at:14', 'client:30:0:0'], - self.run_cycle(available=2304, fall=512, tick=1)) + def test_the_client_is_not_trimmed_right_after_it_was_read_back(self): + self.assertEqual(['trim:2:326:10 20'], self.relieve( + self.sample(available=1000) + 'NOW=100 _dd_back_at=80; relieve 1000 30\nNOW=110; relieve 1000 30\n')) - def test_deferred_ineffective_reclaim_still_doubles_the_backoff(self): - self.assertEqual('client:60:0:0', self.run_cycle(reclaimed=0)[-1]) + def test_without_a_game_only_the_floor_trims(self): + self.assertEqual(['trim:2:160:10 20'], self.relieve( + self.sample(available=1000) + '_dd_game=0 _dd_focus=1; relieve 1000 30\n' + + self.sample(available=800) + 'relieve 800\n')) - def test_deferred_incomplete_reclaim_does_not_double_the_backoff(self): - self.assertEqual('client:30:0:0', self.run_cycle(reclaimed=0, complete=0)[-1]) + def test_the_session_gives_what_the_client_could_not(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:256:70 80', 'trim:2:660:10 20', 'trim:2:256:70 80'], + self.relieve(self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) - def test_explicit_combined_send_keeps_its_synchronous_wait(self): - self.assertEqual(['signal:-URG 321 123:at:0', 'wait:321 123:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 1 cap game\n')) - self.assertEqual(['signal:-URG 321:at:0', 'wait:321:at:0', 'client:30:0:0'], - self.run_cycle(client=0, body='dd_zram_send 1 cap game\n')) + def test_the_session_gets_what_the_client_left_of_the_pass(self): + self.assertEqual(['trim:3:1024:10 20', 'others', 'trim:3:24:70 80'], self.relieve( + self.sample(available=100) + f'paged={1000 * MB}; relieve 100\n')) - def test_readback_keeps_its_synchronous_delay(self): - self.assertEqual(['signal:-URG 123:at:0', 'nap:5:at:0', 'client:30:0:0'], - self.run_cycle(body='dd_zram_send 0 readback client\n')) + def test_memory_that_keeps_coming_back_is_taken_off_what_a_pass_may_move(self): + self.assertEqual(['trim:2:660:10 20', 'others', 'trim:2:156:70 80', 'trim:2:660:10 20', 'trim:2:24:10 20'], self.relieve( + self.sample(available=500) + f'paged={256 * MB}\nreturned={100 * MB}; relieve 500\n' + + f'NOW=1 returned={300 * MB}; relieve 500\nNOW=2 returned={1000 * MB}; relieve 500\n')) - def test_usage_sums_anonymous_rss_and_falls_back_per_process(self): - with tempfile.TemporaryDirectory() as directory: - root = Path(directory) - for pid, contents in ((123, 'VmRSS: 2000 kB\nRssAnon: 300 kB\nVmSwap: 100 kB\n'), - (321, 'VmRSS: 4000 kB\nVmSwap: 200 kB\n'), - (654, 'VmRSS: 1000 kB\nRssAnon: 0 kB\n')): - (root / str(pid)).mkdir() - (root / str(pid) / 'status').write_text(contents) - source = function_source('dd_zram_usage').replace('/proc/', str(root) + '/') - result = run_bash(source + '\ndd_zram_usage 123 321 654 > /dev/null; echo "$_dd_rss:$_dd_anon:$_dd_swap"') - self.assertEqual(0, result.returncode, result.stderr) - self.assertEqual('7000:4300:300', result.stdout.strip()) + def test_forcing_moves_memory_whatever_came_back(self): + self.assertEqual(['trim:3:993:10 20', 'others', 'trim:3:993:70 80'], self.relieve( + self.sample(available=300) + f'paged=0 returned={2048 * MB}; relieve 300\n')) + + def test_the_session_is_scanned_again_after_a_new_process_scan(self): + self.assertEqual(['others', 'others'], [line for line in self.relieve( + self.sample(available=500) + f'paged={256 * MB}; relieve 500\n_dd_scan_at=5; relieve 500\n') if line == 'others']) + + def test_forcing_ignores_heat_once_in_ten_seconds(self): + lines = self.relieve(self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=5; relieve 300\nNOW=10; relieve 300\n') + self.assertEqual(['3', '3', '2', '2', '3', '3'], [line.split(':')[1] for line in lines if line.startswith('trim')]) + self.assertIn('trim:3:993:70 80', lines) + + def trims(self, body): + return [line.split(':')[2] for line in self.relieve(body) if line.startswith('trim') and line.endswith('10 20')] + + def test_passes_that_free_little_come_further_and_further_apart(self): + passes = ''.join(f'NOW={now}; relieve 500; echo at:{now}\n' for now in (0, 4, 5, 14, 15, 34, 35)) + lines = self.relieve(self.sample(available=500) + f'paged={8 * MB}\n' + passes) + self.assertEqual(['0', '5', '15', '35'], + [after.split(':')[1] for line, after in zip(lines, lines[1:] + ['']) if line == 'trim:2:256:70 80']) + + def test_the_wait_between_passes_stops_at_a_minute(self): + self.assertEqual(['60 195'], self.relieve( + self.sample(available=500) + f'paged={8 * MB}\nfor NOW in 0 5 15 35 75 135; do relieve 500; done > /dev/null\n' + 'echo $_dd_rest $_dd_rest_until\n')) + + def test_a_pass_that_frees_enough_is_followed_at_once(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={128 * MB}; relieve 500\nNOW=1; relieve 500\n')) + + def test_memory_that_keeps_falling_ends_the_wait(self): + self.assertEqual(['326', '526'], self.trims( + self.sample(available=700) + f'paged={8 * MB}; relieve 700\nNOW=1; relieve 700\n' + + self.sample(available=600) + 'NOW=2; relieve 600\n' + self.sample(available=580) + 'NOW=3; relieve 580\n')) + + def test_forcing_does_not_wait(self): + self.assertEqual(['993', '993'], self.trims( + self.sample(available=300) + 'paged=0\nrelieve 300\nNOW=1; relieve 300\n')) + + def test_the_wait_is_forgotten_once_memory_is_back(self): + self.assertEqual(['660', '660'], self.trims( + self.sample(available=500) + f'paged={8 * MB}; relieve 500\n' + + self.sample(available=3000) + 'NOW=1; relieve 3000\n' + self.sample(available=500) + 'NOW=2; relieve 500\n')) + + def test_trims_stop_at_the_room_zram_has(self): + self.assertEqual(['trim:2:100:10 20', 'step:memory: available 800 MB and zRAM has no room left'], self.relieve( + self.sample(available=800, zram=(6144, 5276)) + 'relieve 800\n' + + self.sample(available=800, zram=(6144, 5400)) + 'relieve 800\nNOW=30; relieve 800\n')) + + def test_small_trims_are_not_logged(self): + self.assertEqual(['step:memory: available 1000 MB, falling 30 MB/s, compressed 20 MB of the client and 0 MB of the session'], + [line for line in self.relieve( + self.sample(available=1000) + f'paged={10 * MB}\nrelieve 1000 30; dd_memory_note\n' + 'NOW=1; relieve 1000 30; dd_memory_note\nNOW=2; dd_memory_note\n') + if line.startswith('step')]) + + TRIM = ''' +declare -A anon=() reply=() born=() +nap() { :; } +dd_pid_key() { _dd_key=$1.${born[$1]:-0}; } +dd_zram_usage() { _dd_anon=${anon[$1]}; } +kill() { + echo "signal:$2:$(< "$ROOT/ctl")" + case ${reply[$2]} in + deaf) ;; + gone) return 1 ;; + *) printf %s "${reply[$2]}" > "$ROOT/ctl.trim.$2" ;; + esac +} +''' + + def trim(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.TRIM + body + '\nls "$ROOT"; cat "$ROOT/ctl"', 'dd_memory_relieved', 'dd_zram_trim') + + def test_a_trim_spends_its_budget_across_processes_in_order(self): + self.assertEqual(['signal:10:2 100000', 'signal:20:2 60000', '100000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=40000 [20]=60000 [30]=1) +dd_zram_trim 2 100000 10 20 30 +echo $_dd_trimmed''')) + + def test_a_trim_skips_small_and_gone_processes_and_stops_when_little_is_left(self): + self.assertEqual(['signal:20:3 50000', 'signal:30:3 50000', 'signal:40:3 50000', '47000', 'ctl', '2 0'], self.trim(''' +anon=([10]=4096 [20]=500000 [30]=500000 [40]=500000 [50]=500000) reply=([20]=gone [30]=0 [40]=47000 [50]=1) +dd_zram_trim 3 50000 10 20 30 40 50 +echo $_dd_trimmed''')) + + def test_a_process_that_never_answers_is_left_alone_for_a_minute(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', '500', 'signal:20:2 9000', 'signal:10:2 9000', + 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +NOW=59 _dd_pass_at=59; dd_zram_trim 2 9000 10 20 +NOW=60 _dd_pass_at=60; dd_zram_trim 2 9000 10 20''')) + + def test_a_new_process_with_a_silent_ones_number_is_asked(self): + self.assertEqual(['signal:10:2 9000', 'signal:10:2 9000', '1', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=deaf) +dd_zram_trim 2 9000 10 +NOW=5 _dd_pass_at=5; dd_zram_trim 2 9000 10 +born[10]=7 +dd_zram_trim 2 9000 10 +NOW=62 _dd_pass_at=62 anon=(); dd_zram_trim 2 9000 +echo ${#_dd_deaf[@]}''')) + + def test_one_pass_waits_five_seconds_in_all(self): + self.assertEqual(['signal:10:2 9000', 'signal:20:2 9000', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000 [30]=500000) reply=([10]=- [20]=deaf [30]=deaf) +_dd_polls=215 +dd_zram_trim 2 9000 10 +dd_zram_trim 2 9000 20 30''')) + + def test_one_pass_ends_six_seconds_after_it_began_however_slow_the_polls(self): + self.assertEqual(['signal:10:2 9000', '6', 'ctl', '2 0'], self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=deaf [20]=500) +nap() { NOW=$((NOW + 1)); } +dd_zram_trim 2 9000 10 20 +echo $_dd_polls''')) + + def test_a_trim_stops_once_memory_is_back_where_it_should_be(self): + self.assertEqual(['signal:10:2 9000', '500', 'signal:10:2 9000', 'signal:20:2 8500', '1000', 'ctl', 'meminfo', '2 0'], + self.trim(''' +anon=([10]=500000 [20]=500000) reply=([10]=500 [20]=500) +available() { echo "MemAvailable: $1 kB" > "$ROOT/meminfo"; } +signal=$(declare -f kill) +eval "raw_${signal}" +kill() { raw_kill "$@"; available $((after)); } +available 800000 +_dd_goal=900000 after=900000 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed +available 800000 +after=899999 +dd_zram_trim 2 9000 10 20 +echo $_dd_trimmed''')) + + def test_a_held_control_file_keeps_its_acknowledgements(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.hold', 'ctl.trim.10', '2 9000'], self.trim(''' +anon=([10]=500000) +kill() { echo "signal:$2:$(< "$ROOT/ctl")"; : > "$ROOT/ctl.hold"; printf 1 > "$ROOT/ctl.trim.$2"; } +dd_zram_trim 2 9000 10''')) + + def test_a_trim_leaves_the_acknowledgement_of_a_suspend_page_out_alone(self): + self.assertEqual(['signal:10:2 9000', 'ctl', 'ctl.ack.10', '2 0'], self.trim(''' +anon=([10]=500000) reply=([10]=9000) +: > "$ROOT/ctl.ack.10" +dd_zram_trim 2 9000 10''')) + + READBACK = ''' +step() { echo "step:$*"; } +kill() { echo "signal:$*:$(< "$ROOT/ctl")"; } +dd_zram_usage() { _dd_swap=$((swap * 1024)); } +back() { dd_memory_read; _dd_rate=0 _dd_target=$_dd_floor; dd_client_readback; } +_dd_pids=(10 20) _dd_game=0 _dd_client_out=4096 _dd_trim_at=0 swap=400 NOW=30 +''' + + def readback(self, body): + return self.run_policy(f'ROOT={self.root}\n' + self.READBACK + body, 'dd_client_readback') + + def test_the_client_is_read_back_once_memory_can_hold_it_with_a_floor_to_spare(self): + self.assertEqual(['step:memory: available 2192 MB, reading 400 MB of the client back', 'signal:-URG 10 20:0', + f'0 {-400 * MB * 600 // 1000} 30'], self.readback( + self.sample(available=2191) + 'back\n' + self.sample(available=2192) + 'back\n' + + 'echo $_dd_client_out $_dd_freed $_dd_back_at\nback\n')) + + def test_nothing_is_read_back_right_after_a_trim(self): + self.assertEqual([], self.readback(self.sample(available=4000) + 'NOW=29; back\n')) + + def test_a_running_game_keeps_the_client_compressed_until_the_client_is_in_front(self): + self.assertEqual(['signal:-URG 10 20:0'], [line for line in self.readback( + self.sample(available=4000) + '_dd_game=1\nback\n_dd_away=27; back\n_dd_away=25; back\n') + if line.startswith('signal')]) + + def test_a_client_the_kernel_already_brought_back_needs_no_request(self): + self.assertEqual(['0'], self.readback(self.sample(available=4000) + 'swap=8; back; echo $_dd_client_out\n')) if __name__ == '__main__': diff --git a/tools/tests/test_zram_preload.py b/tools/tests/test_zram_preload.py index 8e4af1aa26..bf1e8391cd 100644 --- a/tools/tests/test_zram_preload.py +++ b/tools/tests/test_zram_preload.py @@ -60,6 +60,19 @@ static long status(const char *key) { return v; } +static long resident(char *start, size_t size) { + long page = sysconf(_SC_PAGESIZE), kb = 0; + int fd = open("/proc/self/pagemap", O_RDONLY); + if (fd < 0) exit(8); + for (size_t i = 0; i < size; i += page) { + uint64_t entry; + if (pread(fd, &entry, sizeof(entry), ((uintptr_t)start + i) / page * sizeof(entry)) != sizeof(entry)) exit(8); + if (entry >> 63) kb += page / 1024; + } + close(fd); + return kb; +} + static void send_request(char mode) { int fd = open(ctl, O_WRONLY | O_TRUNC); if (fd < 0 || write(fd, &mode, 1) != 1) exit(3); @@ -91,6 +104,25 @@ static void request(char mode) { usleep(1000000); } +static long trim(char mode, long kb) { + char ack[256], text[32]; + snprintf(ack, sizeof(ack), "%s.trim.%d", ctl, getpid()); + unlink(ack); + FILE *f = fopen(ctl, "w"); + if (!f) exit(3); + fprintf(f, "%c %ld\n", mode, kb); + fclose(f); + kill(getpid(), SIGURG); + for (int i = 0; i < 1200; i++) { + f = fopen(ack, "r"); + char *line = f ? fgets(text, sizeof(text), f) : NULL; + if (f) fclose(f); + if (line) return atol(text); + usleep(10000); + } + exit(5); +} + static uint64_t sum(const unsigned char *p, size_t n) { uint64_t s = 0; for (size_t i = 0; i < n; i += 64) s = s * 31 + p[i]; @@ -167,6 +199,80 @@ int main(int argc, char **argv) { int status_code; waitpid(child, &status_code, 0); printf("childack %d\n", WIFEXITED(status_code) && WEXITSTATUS(status_code) == 0); + } else if (!strcmp(argv[4], "trim")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + printf("first %ld\n", trim('2', 8192)); + printf("second %ld\n", trim('2', 8192)); + printf("swapped %ld\n", status("VmSwap:")); + printf("rest %ld\n", trim('2', 1L << 30)); + printf("touched %d\n", sum(shared, size) != 0); + printf("hot %ld\n", trim('2', 1L << 30)); + printf("forced %ld\n", trim('3', 1L << 30)); + request('0'); + printf("again %ld\n", trim('2', 1L << 30)); + printf("intact %d\n", sum(data, size) == before); + return 0; + } else if (!strcmp(argv[4], "trim-small")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + long total = 0, largest = 0; + for (int i = 0; i < 112; i++) { + long step = trim('2', 512); + total += step; + if (step > largest) largest = step; + } + printf("small %ld\n", total); + printf("largest %ld\n", largest); + return 0; + } else if (!strcmp(argv[4], "trim-sparse")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + size_t wide = 32UL << 20; + char *thin = mmap(NULL, wide, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (thin == MAP_FAILED) exit(7); + for (size_t i = 0; i < wide; i += 2 * page) thin[i] = 1; + printf("sparse %ld\n", resident(thin, wide)); + for (int i = 0; i < 240; i++) trim('2', 512); + printf("kept %ld\n", resident(thin, wide)); + return 0; + } else if (!strcmp(argv[4], "hold")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + char hold[256]; + snprintf(hold, sizeof(hold), "%s.hold", ctl); + FILE *f = fopen(hold, "w"); + if (!f) exit(3); + fclose(f); + printf("empty %ld\n", trim('2', 512)); + f = fopen(hold, "w"); + if (!f) exit(3); + fputs("1", f); + fclose(f); + f = fopen(ctl, "w"); + if (!f) exit(3); + fputs("2 512\n", f); + fclose(f); + kill(getpid(), SIGURG); + wait_ack(); + printf("held %ld\n", status("VmSwap:")); + unlink(hold); + return 0; + } else if (!strcmp(argv[4], "trim-fork")) { + stop = 1; + for (int i = 0; i < 2; i++) pthread_join(t[i], NULL); + fflush(stdout); + pid_t child = fork(); + if (child < 0) exit(6); + if (child == 0) { + for (size_t i = 0; i < size; i += page) data[i]++; + printf("inline_trim %ld\n", trim('2', 1L << 30)); + fflush(stdout); + _exit(0); + } + waitpid(child, NULL, 0); + printf("worker_trim %ld\n", trim('2', 1L << 30)); + return 0; } else if (!strcmp(argv[4], "burst")) { send_request('0'); usleep(10000); @@ -280,8 +386,9 @@ class ZramPreloadTest(unittest.TestCase): def setUp(self): self.ctl.write_text("0") - for ack in self.dir.glob("ctl.ack.*"): + for ack in [*self.dir.glob("ctl.ack.*"), *self.dir.glob("ctl.trim.*")]: ack.unlink() + (self.dir / "ctl.hold").unlink(missing_ok=True) def run_program(self, program=None, mb=48, cycles=1, *extra): environment = dict(os.environ, LD_PRELOAD=str(self.lib)) @@ -347,7 +454,9 @@ class ZramPreloadTest(unittest.TestCase): os.kill(process.pid, signal.SIGURG) os.kill(process.pid, signal.SIGUSR1) self.assertEqual(f"received {_ + 1}", process.stdout.readline().strip()) - output, _ = process.communicate(timeout=10) + process.stdin.close() + process.wait(timeout=10) + output = process.stdout.read() values = dict(line.split() for line in output.splitlines()) self.assertNotEqual(0, int(values["urg"])) self.assertNotEqual(0, int(values["usr"])) @@ -388,6 +497,50 @@ class ZramPreloadTest(unittest.TestCase): out = self.run_program(None, 48, 0, "fork") self.assertEqual([1], out["childack"]) + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_stops_at_its_budget_and_continues_where_it_stopped(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(7168 < out["first"][0] <= 8192, out) + self.assertTrue(7168 < out["second"][0] <= 8192, out) + self.assertGreater(out["swapped"][0], 15 * 1024) + self.assertGreater(out["rest"][0], 40 * 1024) + self.assertEqual([1], out["intact"]) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_trim_leaves_memory_that_came_straight_back(self): + out = self.run_program(None, 32, 0, "trim") + self.assertLess(out["hot"][0], 4 * 1024, out) + self.assertGreater(out["forced"][0], 28 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_requested_read_back_does_not_count_as_heat(self): + out = self.run_program(None, 32, 0, "trim") + self.assertTrue(28 * 1024 < out["again"][0] < 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_budgets_smaller_than_a_chunk_still_reach_all_of_it(self): + out = self.run_program(None, 32, 0, "trim-small") + self.assertLessEqual(out["largest"][0], 512) + self.assertGreater(out["small"][0], 52 * 1024) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_small_budgets_reach_the_end_of_a_thinly_used_chunk(self): + out = self.run_program(None, 8, 0, "trim-sparse") + self.assertEqual([16 * 1024], out["sparse"]) + self.assertLess(out["kept"][0], 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_a_request_in_the_hold_file_wins_over_the_control_file(self): + out = self.run_program(None, 32, 0, "hold") + self.assertTrue(0 < out["empty"][0] <= 512, out) + self.assertGreater(out["held"][0], 40 * 1024, out) + + @unittest.skipUnless(swap_total_kb() > 256 * 1024, "needs swap") + def test_process_without_a_worker_trims_in_small_steps(self): + out = self.run_program(None, 48, 0, "trim-fork") + self.assertTrue(16 * 1024 < out["inline_trim"][0] <= 32 * 1024, out) + self.assertGreater(out["worker_trim"][0], 64 * 1024, out) + def test_worker_acknowledges_back_to_back_requests(self): out = self.run_program(None, 48, 0, "burst") self.assertEqual([1], out["burstack"]) From f180d98da79e5772083aba889838918a5d53f57c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:13:49 -0500 Subject: [PATCH 44/60] Ubisoft: show art for owned games the profile list leaves out (#2865) Games Connect owns but the GraphQL game list does not name were added with no image. Take their art from the product configuration's background_image and thumb_image, following localisation keys, from Ubisoft's launcher asset CDN. --- .../launcher/stores/ubisoft/UbisoftBackend.kt | 32 ++++++++++++++++--- .../launcher/stores/ubisoft/UbisoftTest.kt | 17 ++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt index ba3053ef7c..35fd96ed9a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftBackend.kt @@ -168,14 +168,14 @@ object UbisoftLibrary { internal fun assemble(listed: List, owned: JSONObject?): List { val known = owned?.optJSONArray("games") != null && owned.optString("error").isEmpty() val bySpace = ownedBySpace(owned) - val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: g } + val matched = listed.map { g -> bySpace[g.id]?.let { withArt(g.copy(extra = g.extra + download(it)), it) } ?: g } .filter { !known || it.extra["productId"] != null } .let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } } .let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } } val products = matched.mapNotNull { it.extra["productId"] }.toSet() val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) -> val title = title(o.optString("configuration")) ?: return@mapNotNull null - CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)) + withArt(CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)), o) } return (matched + unlisted).sortedBy { it.title.lowercase() } } @@ -184,12 +184,36 @@ object UbisoftLibrary { private val NAME = Regex("""^\s{1,4}name:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE) + /** The default text of a localisation key such as `l1` or `THUMBIMAGE`. */ + private fun localized(configuration: String, key: String): String? { + if (!Regex("""\w+""").matches(key)) return null + val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return null + return Regex("""^\s+${key}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() + } + /** The product's name from its configuration, following a localisation key such as `l1` to its default text. */ internal fun title(configuration: String): String? { val raw = NAME.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } ?: return null if (!Regex("""l\d+""").matches(raw)) return raw - val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return raw - return Regex("""^\s+${raw}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() ?: raw + return localized(configuration, raw) ?: raw + } + + private const val ASSETS = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/" + private val ASSET = Regex("""[\w.-]+\.(?:jpe?g|png)""", RegexOption.IGNORE_CASE) + + /** The URL of an image the configuration's `root` names, such as `thumb_image`, following a localisation key to its file. */ + internal fun image(configuration: String, key: String): String? { + val raw = Regex("""^ {1,2}${key}:[ \t]*['"]?([^'"\r\n]+?)['"]?[ \t]*$""", RegexOption.MULTILINE).find(configuration)?.groupValues?.get(1)?.trim() ?: return null + val file = raw.takeIf { ASSET.matches(it) } ?: localized(configuration, raw)?.takeIf { ASSET.matches(it) } ?: return null + return ASSETS + file + } + + /** Art the profile's game list lacks, from the product's configuration: games Connect owns but the list leaves out have none. */ + private fun withArt(g: CatalogItem, owned: JSONObject): CatalogItem { + if (g.imageUrl != null && g.tallImageUrl != null) return g + val configuration = owned.optString("configuration") + val thumb = image(configuration, "thumb_image") + return g.copy(imageUrl = g.imageUrl ?: image(configuration, "background_image") ?: thumb, tallImageUrl = g.tallImageUrl ?: thumb) } /** The first launch path under `start_game` in a product's configuration. */ diff --git a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt index b0aea68660..75e2df58cb 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/ubisoft/UbisoftTest.kt @@ -40,6 +40,23 @@ class UbisoftTest { assertEquals("Steam", UbisoftLibrary.thirdParty(steamConfig)) } + @Test fun gamesTheProfileLeavesOutTakeTheirArtFromTheConfiguration() { + val config = "version: 2.0\r\nroot:\r\n name: l1\r\n thumb_image: THUMBIMAGE\r\n background_image: 'b4c1.jpg'\r\n" + + " installer:\r\n thumb_image: nested.jpg\r\nlocalizations:\r\n default:\r\n l1: \"Assassin's Creed\u2122\"\r\n THUMBIMAGE: a3a6.jpg\r\n" + val owned = JSONObject().put("games", JSONArray() + .put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", config)) + .put(JSONObject().put("productId", 82).put("spaceId", "space-ac").put("productType", 0).put("owned", true).put("manifest", "CD").put("configuration", config))) + val art = CatalogItem(Store.UBISOFT, "space-sc", "Splinter Cell", "https://x/wide.jpg", tallImageUrl = "https://x/tall.jpg", owned = true, extra = mapOf("spaceId" to "space-sc")) + val games = UbisoftLibrary.assemble(listOf(art), owned) + val assets = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/" + val unlisted = games.first { it.id == "space-ac" } + assertEquals("Assassin's Creed\u2122", unlisted.title) + assertEquals(assets + "b4c1.jpg", unlisted.imageUrl) + assertEquals(assets + "a3a6.jpg", unlisted.tallImageUrl) + assertEquals("https://x/wide.jpg", games.first { it.id == "space-sc" }.imageUrl) + assertNull(UbisoftLibrary.image("root:\n thumb_image: THUMBIMAGE\n", "thumb_image")) + } + @Test fun withoutAnOwnershipAnswerTheProfileListStays() { val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-gone", "Free Weekend")) assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, JSONObject().put("error", "demux closed")).map { it.id }) From c35da09d1a4957d9c42d5b0f14352b93c3018dae Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Wed, 18 Nov 2026 23:26:45 -0500 Subject: [PATCH 45/60] feat(proton): offer DroidDeck-Proton test builds in Components (#2831) Components > Proton offers a DroidDeck-Proton pre-release that is ahead of Stable through the existing channel toggle. Automatic installs and updates stay on Stable. --- .../droiddeck/launcher/FrontEndActivity.kt | 1 + .../java/com/droiddeck/launcher/ProtonMenu.kt | 10 +- .../launcher/session/ProtonExtras.kt | 117 +++++++++++----- .../droiddeck/launcher/ui/ComponentsPage.kt | 55 +++++--- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../droiddeck/launcher/CompatLaunchTest.kt | 2 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 24 ++-- .../launcher/session/ProtonExtrasTest.kt | 131 ++++++++++++++++++ 40 files changed, 297 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 56787a7146..37e92c04b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -2431,6 +2431,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, + onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c8fe30c9e1..22d7b2ec0d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -34,10 +34,10 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = - { tool, progress -> ProtonExtras.install(activity, tool, progress) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = + { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } - fun installProton(id: String, automatic: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -47,7 +47,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool) { label, value -> + installer(tool, test) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -89,7 +89,7 @@ internal class ProtonMenu( fun refreshProtons() { protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index b27326969c..63307c1596 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -9,13 +9,15 @@ import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File +import java.util.Locale import org.json.JSONArray import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15" + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGES = 5 const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -104,6 +106,12 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } + fun testBuild(context: Context, tool: Tool): String? = + testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) + + internal fun testFor(installed: List, test: String?): String? = + test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } + private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -120,22 +128,27 @@ object ProtonExtras { if (due.isEmpty() || !force && (now - lastAttempt) in 0 until RETRY_MS) return false lastAttempt = now for (tool in due) { - val tag = findLatestAsset(tool)?.tag ?: continue - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) + updateLatest(cache, tool, releases(tool), now) } runCatching { file.writeText(cache.toString()) } return true } } - private fun record(context: Context, tool: Tool, dir: String?, tag: String) { + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { + if (test) return false + val entry = latest.optJSONObject(tool.id) + val known = entry?.optString("tag") + if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false + val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + return true + } + + private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { runCatching { val latest = readJson(latestFile(context)) - val known = latest.optJSONObject(tool.id)?.optString("tag") - if (known.isNullOrEmpty() || compareVersions(tag, known) >= 0) { - latest.put(tool.id, JSONObject().put("tag", tag).put("at", System.currentTimeMillis())) - latestFile(context).writeText(latest.toString()) - } + if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -208,17 +221,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = findLatestAsset(tool) ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -313,7 +326,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag) + record(context, tool, placed, asset.tag, test) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -331,36 +344,68 @@ object ProtonExtras { } } - private fun findLatestAsset(tool: Tool): Asset? { - val releases = Downloader.downloadString(RELEASES.format(tool.repo)) ?: return null - return try { - pickAsset(tool, JSONArray(releases)) - } catch (e: Exception) { - Log.w(TAG, "release metadata for ${tool.id}", e) - null + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + try { + JSONArray(body) + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null + } } } - internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { - for (i in 0 until array.length()) { - val release = array.getJSONObject(i) - if (release.optBoolean("draft", false) || release.optBoolean("prerelease", false)) continue - val assets = release.optJSONArray("assets") ?: continue - val entries = (0 until assets.length()).map { assets.getJSONObject(it) } - val archive = entries.sortedBy { it.optString("name") }.firstOrNull { tool.assetPattern.containsMatchIn(it.optString("name")) } ?: continue + internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + val all = fetch(1) ?: return null + var page = 1 + var last = all.length() + while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + val next = fetch(++page) ?: return null + for (i in 0 until next.length()) all.put(next.opt(i)) + last = next.length() + } + return all + } + + internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + val candidates = (0 until array.length()).asSequence() + .mapNotNull { array.optJSONObject(it) } + .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } + if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } + val stable = pickAsset(tool, array)?.tag ?: return null + return candidates + .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } + .mapNotNull { assetOf(tool, it, requireChecksum = true) } + .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + } + + internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { + if (array == null) return + val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null + val tag = pickAsset(tool, array)?.tag + if (tag == null) { + cache.optJSONObject(tool.id)?.remove("test") + return + } + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + } + + private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + val assets = release.optJSONArray("assets") + val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() + entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } - return Asset( - release.optString("tag_name"), name, - archive.optString("browser_download_url").takeIf { it.startsWith("http") } ?: continue, checksum, - archive.optLong("size", 0L), - Hashes.githubSha256(archive.optString("digest")), - ) - } - return null + archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + } + }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } + } catch (e: Exception) { + Log.w(TAG, "release metadata for ${tool.id}", e) + null } private fun requestLines(context: Context): List = diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index b00edeb98a..62ce4cf73d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -524,7 +524,7 @@ fun ComponentsPage( } val availableTitle: @Composable (String) -> String = { l -> when (l) { - PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count { it.installed == null || it.update != null }) + PROTON_TAB -> stringResource(R.string.comp_available_count, protons.rows.count(ProtonRow::available)) else -> stringResource(R.string.comp_nightlies_count, availableRows(l, catalog, snapshot).size) } } @@ -589,21 +589,29 @@ fun ComponentsPage( val availableRows: @Composable ColumnScope.(String) -> Unit = { l -> when (l) { PROTON_TAB -> { - val rows = protons.rows.filter { it.installed == null || it.update != null } + val rows = protons.rows.filter(ProtonRow::available) if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) - for (row in rows) GetLine( - row.name, - when { - row.update != null -> stringResource(R.string.proton_update_available, row.update) - row.queued -> stringResource(R.string.proton_queued) - else -> stringResource(R.string.proton_not_installed) - }, - progress = if (protons.busyId == row.id) protons.percent else null, - stage = if (protons.busyId == row.id) protons.stage else null, - enabled = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning, - onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (row.update != null) stringResource(R.string.common_update) else null, - ) { protonActions.onInstall(row.id) } + for (row in rows) { + val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) + GetLine( + row.name, + when { + test -> row.test!! + row.update != null -> stringResource(R.string.proton_update_available, row.update) + row.queued -> stringResource(R.string.proton_queued) + else -> stringResource(R.string.proton_not_installed) + }, + progress = if (protons.busyId == row.id) protons.percent else null, + stage = if (protons.busyId == row.id) protons.stage else null, + enabled = idle, + onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, + action = if (!test && row.update != null) stringResource(R.string.common_update) else null, + channel = if (row.test != null) ({ + ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } + }) else null, + ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + } } else -> { val available = availableRows(l, catalog, snapshot) @@ -1528,12 +1536,12 @@ private fun GetLine( } @Composable -private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit) { +private fun ChannelToggle(nightly: Boolean, enabled: Boolean, other: Int = R.string.comp_channel_nightly, onFlip: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) && enabled - val state = stringResource(if (nightly) R.string.comp_channel_nightly else R.string.comp_channel_stable) + val state = stringResource(if (nightly) other else R.string.comp_channel_stable) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), modifier = Modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(10.dp)) @@ -1544,12 +1552,12 @@ private fun ChannelToggle(nightly: Boolean, enabled: Boolean, onFlip: () -> Unit .semantics { stateDescription = state } .padding(4.dp), ) { - for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, R.string.comp_channel_nightly to nightly)) { + for ((label, on) in listOf(R.string.comp_channel_stable to !nightly, other to nightly)) { Text( stringResource(label), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, - color = if (!enabled) colors.onSurfaceVariant else if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, + color = if (on) (if (hot) pal.onSignal else pal.signal) else colors.onSurfaceVariant, modifier = Modifier.clip(RoundedCornerShape(7.dp)) - .background(if (on && enabled) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) + .background(if (on) (if (hot) pal.signal else pal.signal.copy(alpha = 0.16f)) else Color.Transparent) .padding(horizontal = 10.dp, vertical = 6.dp), ) } @@ -1634,6 +1642,7 @@ class ProtonsState( class ProtonsActions( val onInstall: (String) -> Unit = {}, + val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, @@ -1641,8 +1650,10 @@ class ProtonsActions( class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, -) + val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, +) { + val available: Boolean get() = installed == null || update != null || test != null +} @Composable private fun gpuCardValue(gpu: GpuDriversState, auto: String): String { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 943fa41584..49440fa057 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,6 +585,7 @@ في الإصدارات الليلية · %1$d مستقر ليلي + تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 1351982627..745e505055 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f44b98d75d..15dd8ac28b 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,6 +577,7 @@ В Nightlies · %1$d Стабилна Нощна + Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c27da890b3..d1c055687c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,6 +581,7 @@ Na Nightlies · %1$d Stabilní Noční + Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4eb0484c1f..ecb0723ccb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b60fceb58d..0c202baf5f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,6 +577,7 @@ In den Nightlies · %1$d Stabil Nightly + Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index faa6c9727f..749f779141 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,6 +577,7 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή + Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 15a280bac0..e734ac3ab0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,6 +579,7 @@ En las Nightlies · %1$d Estable Nocturna + Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2abc70d958..75505a4d0c 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,6 +577,7 @@ Nightliesissä · %1$d Vakaa Yöversio + Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ef705ec2eb..cbe2334cf5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,6 +579,7 @@ Dans Nightlies · %1$d Stable Nightly + Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f758c55481..199a262959 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,6 +577,7 @@ Nightlies पर · %1$d स्थिर नाइटली + परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e00b2643c9..aa74d6799a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,6 +577,7 @@ A Nightliesen · %1$d Stabil Nightly + Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b52adf60a2..935869a359 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,6 +575,7 @@ Di Nightlies · %1$d Stabil Nightly + Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b8495afa08..6aad28b977 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,6 +579,7 @@ Nelle Nightlies · %1$d Stabile Nightly + Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fc7485bac0..fa800884aa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,6 +575,7 @@ Nightlies内 · %1$d 安定版 ナイトリー + テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9c7bf0671a..49c59c7fe4 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,6 +575,7 @@ Nightlies 내 · %1$d 안정판 나이틀리 + 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 95bde0cbb5..20c5977e38 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,6 +575,7 @@ Pada Nightlies · %1$d Stabil Nightly + Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 6c64167883..5350381287 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,6 +577,7 @@ På Nightlies · %1$d Stabil Nightly + Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1176b01733..ed67b367e6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,6 +577,7 @@ In de Nightlies · %1$d Stabiel Nightly + Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index da0c0e4c1f..2ac1cbfbfa 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,6 +581,7 @@ W wersjach nightly · %1$d Stabilna Nightly + Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f36d346b39..54cca5da98 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index bc8927ea3c..8116d22156 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,6 +579,7 @@ Nas Nightlies · %1$d Estável Nightly + Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 4ef9d1d8cb..9315e8d9fb 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,6 +579,7 @@ Pe versiunile nightly · %1$d Stabilă Nightly + Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f2005f1af4..b4105decd9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,6 +581,7 @@ В Nightlies · %1$d Стабильная Ночная + Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 670a8019c6..ed197424fe 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,6 +577,7 @@ I nattbyggena · %1$d Stabil Nattbygge + Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 576b285e7b..97e4ae05ca 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,6 +575,7 @@ ใน Nightlies · %1$d เสถียร Nightly + ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 3fe7a74c55..5ee9d6ae24 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,6 +577,7 @@ Nightlies içinde · %1$d Kararlı Nightly + Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f7354e66e2..20b12469d1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,6 +581,7 @@ У нічних збірках · %1$d Стабільна Нічна + Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 896a787697..1e1dd18566 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,6 +575,7 @@ Trên Nightlies · %1$d Ổn định Nightly + Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e91a58b486..8b99d82853 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,6 +575,7 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 + 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 25a9d22aea..bfe3e076fa 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,6 +575,7 @@ Nightlies · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 66a0480c55..1a1c502bd3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,6 +575,7 @@ Nightlies 中 · %1$d 穩定版 每夜版 + 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c72a92b84b..14bfd4d601 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,6 +605,7 @@ On the Nightlies · %1$d Stable Nightly + Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index e19b1d6347..8e48d3c353 100644 --- a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -202,7 +202,7 @@ class CompatLaunchTest { val entered = CountDownLatch(1) val finish = CountDownLatch(1) protons.protonBusyId = null - protons.installer = { _, progress -> + protons.installer = { _, _, progress -> progress("Verifying download", 64) entered.countDown() check(finish.await(5, TimeUnit.SECONDS)) diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 14dbdb8338..270b9de489 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -60,7 +60,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, progress -> + menu.installer = { tool, _, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -116,7 +116,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +139,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _ -> "failed" } + watched.installer = { _, _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +152,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> + menu.installer = { tool, _, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +171,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +183,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +208,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +222,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _ -> "failed" } + menu.installer = { _, _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +236,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 43571a3ff0..5f3f3891fc 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -83,6 +83,20 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } + @Test + fun aTestBuildChoosesACompatibleArchiveWithVerification() { + val release = release( + "DroidDeck-Proton-11-12.9", + asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), + asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), + prerelease = true, + ) + val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) + val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! + assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) + assertEquals("ab".repeat(32), picked.sha256) + } + @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -242,4 +256,121 @@ class ProtonExtrasTest { assertNull(ProtonExtras.missing(context, tool("droiddeck"))) assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } + + @Test + fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { + val releases = JSONArray() + .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + } + + @Test + fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.9")) + .put(droiddeckRelease("11-12.8", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) + } + + @Test + fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) + assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) + } + + @Test + fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { + val releases = JSONArray() + .put(droiddeckRelease("11-12.7", prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8.5", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun noTestBuildWithoutAStableBaseline() { + val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) + } + + @Test + fun aTestBuildWithNoChecksumIsNotOffered() { + val releases = JSONArray() + .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) + .put(droiddeckRelease("11-12.9", prerelease = true)) + .put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) + } + + @Test + fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { + val tool = tool("droiddeck") + val pages = mapOf( + 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 2 to JSONArray().put(droiddeckRelease("11-12.8")), + 3 to JSONArray().put(droiddeckRelease("11-12.7")), + ) + val asked = mutableListOf() + val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! + assertEquals(listOf(1, 2), asked) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) + assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) + + asked.clear() + ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } + assertEquals(listOf(1), asked) + + asked.clear() + assertEquals(0, ProtonExtras.releases(tool) { asked += it; JSONArray() }!!.length()) + assertEquals(listOf(1), asked) + assertNull(ProtonExtras.releases(tool) { null }) + + asked.clear() + assertNull(ProtonExtras.releases(tool) { page -> + asked += page + if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + }) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + ProtonExtras.updateLatest(cache, tool, null, 1L) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { + val tool = tool("droiddeck") + val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) + assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) + assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) + assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) + assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) + assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) + assertFalse(cache.getJSONObject(tool.id).has("test")) + } + + @Test + fun malformedReleaseEntriesAreSkipped() { + val releases = JSONArray("[null, 5, {\"tag_name\": \"x\", \"assets\": [null]}]").put(droiddeckRelease("11-12.8")) + assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) + assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) + } } From 44ade5eeeea28b4dd3854f05f4c38372cf4cfee5 Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 07:32:30 +0000 Subject: [PATCH 46/60] feat(proton): install experimental Proton builds from a .zip (#2864) Components > Proton gains an Experimental builds card that installs a Proton build from a .zip, lists it as Experimental- and removes it with its stored and unpacked originals and selections. Replacing a build keeps its user settings and is safe to interrupt. Co-authored-by: maxjivi05 --- .../droiddeck/launcher/FrontEndActivity.kt | 12 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 46 ++++ .../launcher/session/ComponentsManager.kt | 33 ++- .../launcher/session/ExperimentalProtons.kt | 216 ++++++++++++++++++ .../launcher/session/ProtonExtras.kt | 35 +-- .../droiddeck/launcher/ui/ComponentsPage.kt | 27 ++- app/src/main/res/values-ar/strings.xml | 12 + app/src/main/res/values-b+es+419/strings.xml | 12 + app/src/main/res/values-bg/strings.xml | 12 + app/src/main/res/values-cs/strings.xml | 12 + app/src/main/res/values-da/strings.xml | 12 + app/src/main/res/values-de/strings.xml | 12 + app/src/main/res/values-el/strings.xml | 12 + app/src/main/res/values-es/strings.xml | 12 + app/src/main/res/values-fi/strings.xml | 12 + app/src/main/res/values-fr/strings.xml | 12 + app/src/main/res/values-hi/strings.xml | 12 + app/src/main/res/values-hu/strings.xml | 12 + app/src/main/res/values-in/strings.xml | 12 + app/src/main/res/values-it/strings.xml | 12 + app/src/main/res/values-ja/strings.xml | 12 + app/src/main/res/values-ko/strings.xml | 12 + app/src/main/res/values-ms/strings.xml | 12 + app/src/main/res/values-nb/strings.xml | 12 + app/src/main/res/values-nl/strings.xml | 12 + app/src/main/res/values-pl/strings.xml | 12 + app/src/main/res/values-pt-rPT/strings.xml | 12 + app/src/main/res/values-pt/strings.xml | 12 + app/src/main/res/values-ro/strings.xml | 12 + app/src/main/res/values-ru/strings.xml | 12 + app/src/main/res/values-sv/strings.xml | 12 + app/src/main/res/values-th/strings.xml | 12 + app/src/main/res/values-tr/strings.xml | 12 + app/src/main/res/values-uk/strings.xml | 12 + app/src/main/res/values-vi/strings.xml | 12 + app/src/main/res/values-zh-rCN/strings.xml | 12 + app/src/main/res/values-zh-rHK/strings.xml | 12 + app/src/main/res/values-zh-rTW/strings.xml | 12 + app/src/main/res/values/strings.xml | 12 + .../session/ExperimentalProtonsTest.kt | 155 +++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 19 +- .../overlay/usr/local/bin/steam-compatibility | 40 +++- tools/tests/test_game_environment.py | 116 ++++++++++ 43 files changed, 1059 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 37e92c04b0..629986abf2 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -275,6 +275,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private val pickAnyDriver = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedUri(r.data)?.let { drivers.importDriver(it, linux = null) } } + private val pickExperimentalProton = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> + if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { zip -> + protons.installExperimental { progress -> com.droiddeck.launcher.session.ExperimentalProtons.installFromFile(this, zip, progress) } + } + } private val pickLossless = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } } @@ -2427,7 +2432,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet ), protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, - runtimeReady = ready && !busy, sessionRunning = SessionState.running, + runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, @@ -2435,6 +2440,11 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, + onExperimentalFile = { + pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.xproton_pick), + android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) + }, + onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { com.droiddeck.launcher.ui.ProtonOptions( diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 22d7b2ec0d..c076df2209 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -7,6 +7,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState @@ -27,12 +28,17 @@ internal class ProtonMenu( val stage = mutableStateOf(null) val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) + val experimental = mutableStateOf>(emptyList()) } var protonRows by Operation.rows var protonBusyId by Operation.busyId var protonStage by Operation.stage var protonPercent by Operation.percent var protonProblem by Operation.problem + var experimentalDirs by Operation.experimental + companion object { + const val EXPERIMENTAL = "experimental" + } private val checking = java.util.concurrent.atomic.AtomicBoolean(false) @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } @@ -86,7 +92,47 @@ internal class ProtonMenu( }, "remove-proton-$id").start() } + fun installExperimental(work: ((String, Int) -> Unit) -> String?) { + if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.store_starting) + protonPercent = -1 + Thread({ + val problem = runCatching { + work { label, value -> ui.post { protonStage = label; protonPercent = value } } + }.getOrElse { it.message ?: it.javaClass.simpleName } + ui.post { + protonProblem = problem + protonBusyId = null + protonStage = null + protonPercent = -1 + refreshProtons() + android.widget.Toast.makeText(activity, problem ?: activity.getString(R.string.xproton_installed), android.widget.Toast.LENGTH_LONG).show() + if (problem == null) onInstalled() + } + }, "install-proton-experimental").start() + } + + fun removeExperimental(dir: String) { + if (protonBusyId != null || SessionState.running) return + protonBusyId = EXPERIMENTAL + protonProblem = null + protonStage = activity.getString(R.string.main_removing_named, dir) + protonPercent = -1 + Thread({ + val removed = runCatching { ExperimentalProtons.remove(activity, dir) }.getOrDefault(false) + ui.post { + protonBusyId = null + protonStage = null + refreshProtons() + if (!removed) android.widget.Toast.makeText(activity, activity.getString(R.string.xproton_remove_failed, dir), android.widget.Toast.LENGTH_LONG).show() + } + }, "remove-proton-experimental").start() + } + fun refreshProtons() { + experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index e9409b74cd..749532cddf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -282,6 +282,8 @@ object ComponentsManager { if (parts.size > 1) parts[1] else parts.firstOrNull()?.ifEmpty { null } ?: "unknown" }.getOrDefault("unknown") + internal fun isProtonTree(dir: File): Boolean = File(dir, WINE).isDirectory && File(dir, "proton").isFile + fun protons(context: Context): List { val found = LinkedHashMap() val bases = listOf(File(steam(context), "compatibilitytools.d") to false) + @@ -290,7 +292,7 @@ object ComponentsManager { for ((base, valve) in bases) { val entries = base.listFiles()?.sortedBy { it.name } ?: continue for (dir in entries) { - if (!File(dir, WINE).isDirectory || !File(dir, "proton").isFile) continue + if (!isProtonTree(dir)) continue val real = runCatching { dir.canonicalPath }.getOrDefault(dir.path) if (found.containsKey(real)) continue val guest = if (dir.absolutePath.startsWith(rootPath)) dir.absolutePath.removePrefix(rootPath) else dir.absolutePath @@ -900,15 +902,26 @@ object ComponentsManager { } } - fun forgetProton(context: Context, dirName: String) { - synchronized(lock) { - val id = safeName(dirName) - if (protons(context).any { it.id == id }) return - val state = loadState(context) - val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } - if (selected && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return - File(originalsDir(context), id).deleteRecursively() - } + fun forgetProton(context: Context, dirName: String): Boolean = synchronized(lock) { + val id = safeName(dirName) + if (protons(context).any { it.id == id }) return true + val state = loadState(context) + val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } + val published = File(launchDir(context), "desired.tsv") + val listed = published.takeIf { it.isFile } + ?.useLines { rows -> rows.any { it.split('\t').getOrNull(1) == dirName } } == true + if ((selected || listed) && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return false + val originals = File(originalsDir(context), id) + val store = File(launchDir(context), "store") + val used = published.takeIf { it.isFile }?.useLines { rows -> + rows.mapNotNull { it.substringAfterLast('\t').substringAfter("/store/", "").substringBefore('/').ifEmpty { null } }.toSet() + }.orEmpty() + val unpacked = originals.listFiles().orEmpty().flatMap { version -> + version.listFiles().orEmpty().map { File(store, "original-$id-${version.name}-${it.name.removeSuffix(".wcp")}") } + }.filter { it.name !in used } + if (unpacked.any { File(it, ".complete").delete(); !it.deleteRecursively() && it.exists() }) return false + originals.deleteRecursively() + true } private fun storePackage(context: Context, part: File, dest: File) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt new file mode 100644 index 0000000000..cc2831bc8c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -0,0 +1,216 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.StatFs +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import java.io.File +import java.io.FileOutputStream +import java.nio.file.Files +import java.security.DigestOutputStream +import java.security.MessageDigest +import java.util.zip.ZipFile +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.deleteRecursively +import org.json.JSONObject + +object ExperimentalProtons { + private const val TAG = "ExperimentalProtons" + const val PREFIX = "Experimental-" + private const val MARKER = ".droiddeck-experimental.json" + private const val STAGING = ".droiddeck-experimental" + private const val BACKUPS = ".droiddeck-experimental-old" + private const val INCOMING = ".droiddeck-experimental-new" + private const val GUEST_TOOLS = "/root/.local/share/Steam/compatibilitytools.d" + private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 + private const val USER_SETTINGS = "user_settings.py" + private val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + + data class Installed(val dir: String, val label: String, val source: String) + + private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) + + fun installed(context: Context): List = + toolsDir(context).listFiles() + ?.filter { it.isDirectory && File(it, MARKER).isFile } + ?.map { dir -> + val info = runCatching { JSONObject(File(dir, MARKER).readText()) }.getOrDefault(JSONObject()) + Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source")) + } + ?.sortedBy { it.dir } + ?: emptyList() + + fun remove(context: Context, dir: String): Boolean { + val tools = toolsDir(context) + val target = File(tools, dir) + if (!File(target, MARKER).isFile) return false + val gone = deleteTree(target) && deleteTree(File(File(tools, BACKUPS), dir)) && deleteTree(File(File(tools, INCOMING), dir)) + if (gone) ComponentsManager.forgetProton(context, dir) + return gone + } + + internal fun dirName(tree: String, label: String?): String { + val base = ComponentsManager.safeName(tree) + val tag = label?.let(ComponentsManager::safeName)?.takeIf { it != "unnamed" && !base.contains(it, ignoreCase = true) } + return PREFIX + base + (tag?.let { "-$it" } ?: "") + } + + internal fun compatVdf(name: String): String = """"compatibilitytools" +{ + "compat_tools" + { + "$name" + { + "install_path" "." + "display_name" "$name" + "from_oslist" "windows" + "to_oslist" "linux" + } + } +} +""" + + fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + return context.getString(R.string.xproton_no_space) + } + return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + } + + private fun preflight(context: Context): String? = when { + SessionState.running -> context.getString(R.string.pextra_stop_session) + !LinuxRuntime.isInstalled(context) -> context.getString(R.string.user_apps_runtime_required) + else -> null + } + + private fun install(context: Context, zip: File, label: String, source: String, onProgress: (String, Int) -> Unit): String? { + val tools = toolsDir(context).apply { mkdirs() } + val staging = File(tools, STAGING) + val forget = { name: String -> ComponentsManager.forgetProton(context, name) } + restoreInterrupted(tools, forget) + deleteTree(staging) + staging.mkdirs() + try { + LinuxRuntime.writeAccounts(context) + SessionFiles.stage(context, LinuxRuntime.rootDir(context)) + onProgress(context.getString(R.string.xproton_unzipping), -1) + val tarball = runCatching { extractTarball(zip, staging) } + .getOrElse { return it.message ?: context.getString(R.string.xproton_bad_zip) } + ?: return context.getString(R.string.xproton_bad_zip) + if (SessionState.running) return context.getString(R.string.pextra_session_started) + + onProgress(context.getString(R.string.xproton_unpacking), -1) + val unpacked = File(staging, "unpacked").apply { mkdirs() } + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + tarball.delete() + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + + val tree = buildTree(unpacked) ?: return context.getString(R.string.xproton_no_tree) + val name = dirName(tree.name, label) + ownFile(tree, "compatibilitytool.vdf").writeText(compatVdf(name)) + ownFile(tree, MARKER).writeText( + JSONObject().put("label", name).put("source", source).put("at", System.currentTimeMillis() / 1000).toString(), + ) + val final = File(tools, name) + val settings = File(final, USER_SETTINGS) + if (Files.isRegularFile(settings.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS)) { + settings.copyTo(ownFile(tree, USER_SETTINGS)) + } + if (!placeTree(tree, tools, name, forget)) return context.getString(R.string.xproton_place_failed) + + onProgress(context.getString(R.string.pextra_installing, name), -1) + runGuest(context, listOf("steam-compatibility", "/root/.local/share/Steam")) + return null + } catch (e: Exception) { + Log.e(TAG, "install $source", e) + return e.message ?: context.getString(R.string.xproton_bad_zip) + } finally { + deleteTree(staging) + } + } + + internal fun buildTree(unpacked: File): File? { + val root = unpacked.canonicalFile + return unpacked.listFiles()?.sortedBy { it.name }?.firstOrNull { + !Files.isSymbolicLink(it.toPath()) && it.isDirectory && it.canonicalFile.parentFile == root && + Files.isRegularFile(File(it, "toolmanifest.vdf").toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) && + ComponentsManager.isProtonTree(it) + } + } + + @OptIn(ExperimentalPathApi::class) + internal fun deleteTree(dir: File): Boolean = + runCatching { dir.toPath().deleteRecursively() }.onFailure { Log.w(TAG, "delete $dir", it) }.isSuccess && !Files.exists(dir.toPath(), java.nio.file.LinkOption.NOFOLLOW_LINKS) + + internal fun ownFile(tree: File, name: String): File { + val file = File(tree, name) + Files.deleteIfExists(file.toPath()) + return file + } + + internal fun placeTree(tree: File, tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING).apply { mkdirs() }, name) + if (!deleteTree(incoming) || !tree.renameTo(incoming)) return false + return finishPlacing(tools, name, forget) + } + + private fun finishPlacing(tools: File, name: String, forget: (String) -> Boolean): Boolean { + val incoming = File(File(tools, INCOMING), name) + val final = File(tools, name) + val backup = File(File(tools, BACKUPS).apply { mkdirs() }, name) + val moved = !final.exists() || (deleteTree(backup) && final.renameTo(backup)) + val placed = moved && (!backup.exists() || forget(name)) && incoming.renameTo(final) + if (!placed) { + if (!final.exists()) backup.renameTo(final) + deleteTree(incoming) + } + if (final.exists()) deleteTree(backup) + return placed + } + + internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + File(tools, INCOMING).listFiles()?.forEach { finishPlacing(tools, it.name, forget) } + File(tools, BACKUPS).listFiles()?.forEach { if (File(tools, it.name).exists()) deleteTree(it) else it.renameTo(File(tools, it.name)) } + } + + private fun extractTarball(zip: File, into: File): File? = ZipFile(zip).use { z -> + val entries = z.entries().toList().filter { !it.isDirectory } + val entry = entries.filter { TARBALL.containsMatchIn(it.name) }.maxByOrNull { it.size } ?: return null + val name = File(entry.name).name + val sums = checksumEntry(entries.map { it.name }, name)?.let { checksumName -> entries.first { it.name == checksumName } } + val expected = sums?.let { e -> + z.getInputStream(e).use { checksumIn(it.readBytes().decodeToString()) } + ?: throw IllegalStateException("${File(e.name).name} holds no SHA-512 checksum") + } + val out = File(into, name) + val digest = MessageDigest.getInstance("SHA-512") + z.getInputStream(entry).use { input -> DigestOutputStream(FileOutputStream(out), digest).use { input.copyTo(it, 1 shl 16) } } + if (expected != null && !expected.equals(digest.digest().joinToString("") { "%02x".format(it) }, ignoreCase = true)) { + out.delete() + throw IllegalStateException("Checksum mismatch in $name") + } + out + } + + internal fun checksumIn(text: String): String? = Regex("(?i)\\b[0-9a-f]{128}\\b").find(text)?.value + + internal fun checksumEntry(entries: List, tarball: String): String? { + val stem = tarball.substringBefore(".tar") + return entries.firstOrNull { + val name = File(it).name + !TARBALL.containsMatchIn(name) && (name.startsWith("$tarball.") || name.startsWith("$stem.")) && name.contains("sha512", true) + } + } + + private fun runGuest(context: Context, command: List): Int { + val guest = listOf( + "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", + "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", + ) + command + val child = ProtonExtras.guestProcess(context, guest).start() + child.inputStream.bufferedReader().useLines { lines -> lines.forEach { Log.i(TAG, it) } } + return child.waitFor() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 63307c1596..c277b7b279 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -290,26 +290,12 @@ object ProtonExtras { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) com.droiddeck.launcher.session.SessionFiles.stage(context, root) - val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } val guest = listOf( "/usr/bin/env", "-i", "HOME=/root", "USER=root", "PATH=/usr/local/bin:/usr/bin:/bin", "LANG=C.UTF-8", "XDG_DATA_HOME=/root/.local/share", "/usr/local/bin/droiddeck-proton-extra", "/root/.local/share/Steam", archive.absolutePath, ) - val process = if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { - com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, - LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) - } else { - ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) - .directory(root) - .redirectErrorStream(true) - .also { builder -> - val hostEnv = builder.environment() - hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path - hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path - LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } - } - } + val process = guestProcess(context, guest) val child = process.start() var placed: String? = null child.inputStream.bufferedReader().useLines { lines -> @@ -344,6 +330,25 @@ object ProtonExtras { } } + internal fun guestProcess(context: Context, guest: List): ProcessBuilder { + val root = LinuxRuntime.rootDir(context) + val runtimeDir = File(context.filesDir, ".proton-install-rt").apply { mkdirs() } + return if (com.droiddeck.launcher.runtime.NativeGuest.enabled(context)) { + com.droiddeck.launcher.runtime.NativeGuest.processBuilder(context, root, + LinuxRuntime.binds(context, null, runtimeDir, null, null), guest).redirectErrorStream(true) + } else { + ProcessBuilder(LinuxRuntime.command(context, null, runtimeDir, null, guest)) + .directory(root) + .redirectErrorStream(true) + .also { builder -> + val hostEnv = builder.environment() + hostEnv["PROOT_LOADER"] = LinuxRuntime.prootLoader(context).path + hostEnv["PROOT_TMP_DIR"] = LinuxRuntime.prootTempDir(context).path + LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { hostEnv["LD_LIBRARY_PATH"] = it } + } + } + } + private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 62ce4cf73d..13d300c5f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -539,7 +539,8 @@ fun ComponentsPage( val key = "proton:${v.proton.id}" val swaps = v.components.values.count { it.activeFile != null } val extra = protons.rows.firstOrNull { v.proton.dir.name in it.installedAll } - val removable = extra != null && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + val experimental = v.proton.dir.name in protons.experimental + val removable = (extra != null || experimental) && protons.busyId == null && protons.runtimeReady && !protons.sessionRunning ChoiceLine( v.proton.name, (if (swaps > 0) stringResource(R.string.comp_swapped, v.proton.version, swaps) else stringResource(R.string.comp_all_original, v.proton.version)) @@ -548,7 +549,10 @@ fun ComponentsPage( modifier = (if (i == 0 && !moded(l)) Modifier.focusRequester(firstRow) else Modifier).trackRow(key, rowsAt), onSelect = { if (v.proton.id != view?.proton?.id) { onProton(v.proton.id); flyHome(key, PROTON_TAB) } }, onDelete = { - if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + if (experimental) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { + protonActions.onRemoveExperimental(v.proton.dir.name) + } + else if (extra != null) ask(key, right, ctx.getString(R.string.proton_remove_title, v.proton.name), ctx.getString(R.string.proton_remove_body), ctx.getString(R.string.store_remove), true, v.proton.name) { protonActions.onRemove(extra.id, v.proton.dir.name) } }, @@ -738,6 +742,10 @@ fun ComponentsPage( } } } + if (l == PROTON_TAB && DeveloperTools.on) { + Spacer(Modifier.height(12.dp)) + ExperimentalProtonGroup(protons, protonActions) + } if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) @@ -1631,6 +1639,18 @@ private fun DeviceChip(s: GpuDriversState) { ) { face() } } +@Composable +private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActions) { + val busy = protons.busyId == com.droiddeck.launcher.ProtonMenu.EXPERIMENTAL + val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning + RowGroup(stringResource(R.string.xproton_title)) { + if (busy) GetLine(stringResource(R.string.xproton_title), "", progress = protons.percent, enabled = false, stage = protons.stage) {} + else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { + SmallButton(stringResource(R.string.xproton_pick_zip), enabled = idle, onClick = actions.onExperimentalFile) + } + } +} + class ProtonsState( val rows: List = emptyList(), val busyId: String? = null, @@ -1638,6 +1658,7 @@ class ProtonsState( val percent: Int = -1, val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, + val experimental: List = emptyList(), ) class ProtonsActions( @@ -1646,6 +1667,8 @@ class ProtonsActions( val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, + val onExperimentalFile: () -> Unit = {}, + val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 49440fa057..2e20f14e1f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2406,6 +2406,18 @@ عدم تطابق المجموع الاختباري؛ تم حذف التنزيل بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s + إصدارات تجريبية + اختر ملف .zip لإصدار Proton + تثبيت من ملف .zip + لا توجد مساحة كافية لإصدار Proton هذا + جارٍ فك الضغط + جارٍ تفريغ Proton (بضع دقائق) + ملف .zip لا يحتوي على أرشيف tar لـ Proton + فشل التفريغ (tar %1$d) + الأرشيف لا يحتوي على إصدار Proton + تعذّر وضع إصدار Proton + تعذّرت الإزالة الكاملة لـ %1$s + تم تثبيت Proton التجريبي. اختره في Steam → الخصائص → التوافق. فشل تثبيت %1$s (حالة الخروج %2$d) تعذّر تثبيت %1$s جارٍ جلب حزمة droiddeck-esync diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 745e505055..80faccb1cf 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2398,6 +2398,18 @@ La suma de verificación no coincide; se eliminó la descarga Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s + Versiones experimentales + Elige un .zip de una versión de Proton + Instalar desde .zip + No hay espacio libre suficiente para esta versión de Proton + Descomprimiendo + Desempaquetando Proton (unos minutos) + El .zip no contiene ningún tarball de Proton + Error al desempaquetar (tar %1$d) + El archivo no contiene ninguna versión de Proton + No se pudo colocar la versión de Proton + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 15dd8ac28b..0a333b7f85 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2302,6 +2302,18 @@ Несъответствие в контролната сума; изтеглянето беше изтрито По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s + Експериментални версии + Изберете .zip с версия на Proton + Инсталиране от .zip + Няма достатъчно свободно място за тази версия на Proton + Разархивиране + Разопаковане на Proton (няколко минути) + В .zip няма архив tar на Proton + Разопаковането не успя (tar %1$d) + Архивът не съдържа версия на Proton + Версията на Proton не можа да бъде поставена + %1$s не можа да бъде премахнат напълно + Експерименталният Proton е инсталиран. Изберете го в Steam → Свойства → Съвместимост. Инсталирането на %1$s се провали (код %2$d) %1$s не можа да бъде инсталиран Извличане на пакета droiddeck-esync diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d1c055687c..014b812692 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2354,6 +2354,18 @@ Neshoda kontrolního součtu; stahování bylo odstraněno Během stahování se spustila relace; před instalací nástrojů kompatibility ji zastavte Instalování %1$s + Experimentální sestavení + Vyberte .zip se sestavením Proton + Instalovat ze souboru .zip + Pro toto sestavení Proton není dost volného místa + Rozbalování + Rozbalování Proton (několik minut) + Soubor .zip neobsahuje archiv tar s Proton + Rozbalení se nezdařilo (tar %1$d) + Archiv neobsahuje sestavení Proton + Sestavení Proton se nepodařilo umístit + Nepodařilo se úplně odebrat %1$s + Experimentální Proton je nainstalován. Vyberte ho ve Steam → Vlastnosti → Kompatibilita. Instalace %1$s se nezdařila (návratový kód %2$d) Nepodařilo se nainstalovat %1$s Stahování balíčku droiddeck-esync diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ecb0723ccb..1e4231ae09 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2302,6 +2302,18 @@ Tjeksum stemmer ikke; downloadet blev slettet En session startede under downloadet; stop den før du installerer kompatibilitetsværktøjer Installerer %1$s + Eksperimentelle builds + Vælg en Proton-build som .zip + Installer fra .zip + Der er ikke nok ledig plads til denne Proton-build + Udpakker zip + Udpakker Proton (nogle få minutter) + Filen .zip indeholder ingen Proton-tarball + Udpakning mislykkedes (tar %1$d) + Arkivet indeholder ingen Proton-build + Kunne ikke placere Proton-builden + Kunne ikke fjerne %1$s helt + Eksperimentel Proton er installeret. Vælg den i Steam → Egenskaber → Kompatibilitet. Installation af %1$s mislykkedes (afslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakken diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0c202baf5f..1d4bde9bf7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2294,6 +2294,18 @@ Prüfsumme stimmt nicht überein; der Download wurde gelöscht Während des Downloads wurde eine Sitzung gestartet; beende sie, bevor du Kompatibilitätstools installierst %1$s wird installiert + Experimentelle Builds + Proton-Build als .zip auswählen + Aus .zip installieren + Nicht genug freier Speicher für diesen Proton-Build + Wird entpackt + Proton wird entpackt (einige Minuten) + Die .zip enthält kein Proton-Tarball + Entpacken fehlgeschlagen (tar %1$d) + Das Archiv enthält keinen Proton-Build + Der Proton-Build konnte nicht abgelegt werden + %1$s konnte nicht vollständig entfernt werden + Experimentelles Proton installiert. Wähle es unter Steam → Eigenschaften → Kompatibilität aus. Installation von %1$s fehlgeschlagen (Exit-Code %2$d) %1$s konnte nicht installiert werden droiddeck-esync-Paket wird abgerufen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 749f779141..c50b3adcf1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2302,6 +2302,18 @@ Αναντιστοιχία αθροίσματος ελέγχου· η λήψη διαγράφηκε Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s + Πειραματικές εκδόσεις + Επιλέξτε ένα .zip έκδοσης Proton + Εγκατάσταση από .zip + Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton + Αποσυμπίεση + Αποσυσκευασία του Proton (λίγα λεπτά) + Το .zip δεν περιέχει αρχείο tar του Proton + Η αποσυσκευασία απέτυχε (tar %1$d) + Το αρχείο δεν περιέχει έκδοση Proton + Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton + Δεν ήταν δυνατή η πλήρης κατάργηση του %1$s + Το πειραματικό Proton εγκαταστάθηκε. Επιλέξτε το στο Steam → Ιδιότητες → Συμβατότητα. Η εγκατάσταση του %1$s απέτυχε (έξοδος %2$d) Δεν ήταν δυνατή η εγκατάσταση του %1$s Λήψη πακέτου droiddeck-esync diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e734ac3ab0..bd28c243b6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2328,6 +2328,18 @@ La suma de verificación no coincide; se eliminó la descarga Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s + Versiones experimentales + Elige un .zip de una versión de Proton + Instalar desde .zip + No hay espacio libre suficiente para esta versión de Proton + Descomprimiendo + Desempaquetando Proton (unos minutos) + El .zip no contiene ningún tarball de Proton + Error al desempaquetar (tar %1$d) + El archivo no contiene ninguna versión de Proton + No se pudo colocar la versión de Proton + No se pudo quitar %1$s por completo + Proton experimental instalado. Elígelo en Steam → Propiedades → Compatibilidad. Falló la instalación de %1$s (salida %2$d) No se pudo instalar %1$s Descargando el paquete droiddeck-esync diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 75505a4d0c..042345d84a 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2302,6 +2302,18 @@ Tarkistussumma ei täsmää; lataus poistettiin Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s + Kokeelliset versiot + Valitse Proton-version .zip + Asenna .zip-tiedostosta + Tälle Proton-versiolle ei ole tarpeeksi vapaata tilaa + Puretaan zip + Puretaan Protonia (muutama minuutti) + Tiedostossa .zip ei ole Proton-tar-pakettia + Purku epäonnistui (tar %1$d) + Arkisto ei sisällä Proton-versiota + Proton-versiota ei voitu sijoittaa + Kohdetta %1$s ei voitu poistaa kokonaan + Kokeellinen Proton asennettu. Valitse se kohdassa Steam → Ominaisuudet → Yhteensopivuus. %1$s-asennus epäonnistui (poistumiskoodi %2$d) Kohdetta %1$s ei voitu asentaa Haetaan droiddeck-esync-pakettia diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cbe2334cf5..b11a5a6741 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2327,6 +2327,18 @@ Somme de contrôle incorrecte ; le téléchargement a été supprimé Une session a démarré pendant le téléchargement ; arrêtez-la avant d\'installer des outils de compatibilité Installation de %1$s + Versions expérimentales + Choisir un .zip de version Proton + Installer depuis un .zip + Espace libre insuffisant pour cette version de Proton + Décompression + Extraction de Proton (quelques minutes) + Le .zip ne contient aucune archive tar de Proton + Échec de l\'extraction (tar %1$d) + L\'archive ne contient aucune version de Proton + Impossible de placer la version de Proton + Impossible de supprimer entièrement %1$s + Proton expérimental installé. Sélectionnez-le dans Steam → Propriétés → Compatibilité. Échec de l\'installation de %1$s (code %2$d) Impossible d\'installer %1$s Récupération du pack droiddeck-esync diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 199a262959..0e9ad3ed44 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2302,6 +2302,18 @@ चेकसम मेल नहीं खाया; डाउनलोड हटा दिया गया डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है + प्रायोगिक बिल्ड + Proton बिल्ड की .zip चुनें + .zip से इंस्टॉल करें + इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है + अनज़िप हो रहा है + Proton अनपैक हो रहा है (कुछ मिनट) + .zip में Proton का कोई tar आर्काइव नहीं है + अनपैक करना विफल रहा (tar %1$d) + आर्काइव में कोई Proton बिल्ड नहीं है + Proton बिल्ड को रखा नहीं जा सका + %1$s को पूरी तरह हटाया नहीं जा सका + प्रायोगिक Proton इंस्टॉल हो गया। इसे Steam → गुण → संगतता में चुनें। %1$s इंस्टॉलेशन विफल रहा (exit %2$d) %1$s इंस्टॉल नहीं हो सका droiddeck-esync पैक लिया जा रहा है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index aa74d6799a..f8b6fbc273 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2302,6 +2302,18 @@ Az ellenőrzőösszeg nem egyezik; a letöltés törlésre került Egy munkamenet elindult a letöltés közben; állítsa le a kompatibilitási eszközök telepítése előtt %1$s telepítése + Kísérleti buildek + Válassz egy Proton-build .zip fájlt + Telepítés .zip fájlból + Nincs elég szabad hely ehhez a Proton-buildhez + Kicsomagolás + A Proton kibontása (néhány perc) + A .zip nem tartalmaz Proton tar-csomagot + A kibontás nem sikerült (tar %1$d) + Az archívum nem tartalmaz Proton-buildet + Nem sikerült elhelyezni a Proton-buildet + Nem sikerült teljesen eltávolítani: %1$s + A kísérleti Proton telepítve. Válaszd ki a Steam → Tulajdonságok → Kompatibilitás menüben. A %1$s telepítése sikertelen (kilépési kód: %2$d) Nem sikerült telepíteni a %1$s-t droiddeck-esync csomag letöltése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 935869a359..d85a73b7c4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak cocok; unduhan telah dihapus Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s + Build eksperimental + Pilih .zip build Proton + Instal dari .zip + Ruang kosong tidak cukup untuk build Proton ini + Mengekstrak zip + Membuka paket Proton (beberapa menit) + .zip tidak berisi tarball Proton + Gagal membuka paket (tar %1$d) + Arsip tidak berisi build Proton + Tidak dapat menempatkan build Proton + Tidak dapat menghapus %1$s sepenuhnya + Proton eksperimental terinstal. Pilih di Steam → Properti → Kompatibilitas. Instalasi %1$s gagal (keluar %2$d) Tidak dapat menginstal %1$s Mengambil paket droiddeck-esync diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 6aad28b977..207e3a5756 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2319,6 +2319,18 @@ Checksum non corrispondente; il download è stato eliminato È stata avviata una sessione durante il download; interrompila prima di installare strumenti di compatibilità Installazione di %1$s + Build sperimentali + Scegli uno .zip di una build di Proton + Installa da .zip + Spazio libero insufficiente per questa build di Proton + Decompressione + Estrazione di Proton (qualche minuto) + Lo .zip non contiene alcun tarball di Proton + Estrazione non riuscita (tar %1$d) + L\'archivio non contiene alcuna build di Proton + Impossibile posizionare la build di Proton + Impossibile rimuovere completamente %1$s + Proton sperimentale installato. Selezionalo in Steam → Proprietà → Compatibilità. Installazione di %1$s non riuscita (uscita %2$d) Impossibile installare %1$s Recupero del pacchetto droiddeck-esync diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index fa800884aa..0e0a721ead 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2277,6 +2277,18 @@ チェックサムが一致しないため、ダウンロードを削除しました ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 + 試験版ビルド + Protonビルドの.zipを選択 + .zipからインストール + このProtonビルド用の空き容量が足りません + 解凍中 + Protonを展開中(数分かかります) + .zipにProtonのtarballが含まれていません + 展開に失敗しました(tar %1$d) + アーカイブにProtonビルドが含まれていません + Protonビルドを配置できませんでした + %1$sを完全に削除できませんでした + 試験版Protonをインストールしました。Steam → プロパティ → 互換性 で選択してください。 %1$sのインストールに失敗しました(終了コード %2$d) %1$sをインストールできませんでした droiddeck-esyncパックを取得中 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 49c59c7fe4..281827cb45 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2277,6 +2277,18 @@ 체크섬이 일치하지 않아 다운로드를 삭제했습니다 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 + 실험용 빌드 + Proton 빌드 .zip 선택 + .zip에서 설치 + 이 Proton 빌드를 설치할 여유 공간이 부족합니다 + 압축 해제 중 + Proton 풀는 중 (몇 분 소요) + .zip에 Proton tar 파일이 없습니다 + 압축 풀기 실패 (tar %1$d) + 아카이브에 Proton 빌드가 없습니다 + Proton 빌드를 배치할 수 없습니다 + %1$s을(를) 완전히 제거할 수 없습니다 + 실험용 Proton이 설치되었습니다. Steam → 속성 → 호환성에서 선택하세요. %1$s 설치 실패(종료 코드 %2$d) %1$s을(를) 설치할 수 없습니다 droiddeck-esync 팩 받는 중 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 20c5977e38..a1b1f06c61 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2277,6 +2277,18 @@ Checksum tidak sepadan; muat turun telah dipadam Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s + Binaan eksperimen + Pilih .zip binaan Proton + Pasang daripada .zip + Ruang kosong tidak mencukupi untuk binaan Proton ini + Menyahzip + Membuka pakej Proton (beberapa minit) + .zip tidak mengandungi tarball Proton + Gagal membuka pakej (tar %1$d) + Arkib tidak mengandungi binaan Proton + Tidak dapat meletakkan binaan Proton + Tidak dapat mengalih keluar %1$s sepenuhnya + Proton eksperimen telah dipasang. Pilihnya di Steam → Sifat → Keserasian. Pemasangan %1$s gagal (keluar %2$d) Tidak dapat memasang %1$s Mengambil pek droiddeck-esync diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 5350381287..071642efc6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2302,6 +2302,18 @@ Sjekksummen stemmer ikke; nedlastingen ble slettet En sesjon startet under nedlastingen; avslutt den før du installerer kompatibilitetsverktøy Installerer %1$s + Eksperimentelle bygg + Velg en Proton-bygg som .zip + Installer fra .zip + Ikke nok ledig plass til dette Proton-bygget + Pakker ut zip + Pakker ut Proton (noen få minutter) + .zip-filen inneholder ingen Proton-tarball + Utpakking mislyktes (tar %1$d) + Arkivet inneholder ingen Proton-bygg + Kunne ikke plassere Proton-bygget + Kunne ikke fjerne %1$s helt + Eksperimentell Proton er installert. Velg den i Steam → Egenskaper → Kompatibilitet. Installasjonen av %1$s mislyktes (avslutningskode %2$d) Kunne ikke installere %1$s Henter droiddeck-esync-pakke diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ed67b367e6..ca7a52268f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2302,6 +2302,18 @@ Checksum komt niet overeen; de download is verwijderd Er is een sessie gestart tijdens het downloaden; stop die voordat je compatibiliteitstools installeert %1$s installeren + Experimentele builds + Kies een Proton-build als .zip + Installeren vanuit .zip + Niet genoeg vrije ruimte voor deze Proton-build + Uitpakken van zip + Proton uitpakken (enkele minuten) + De .zip bevat geen Proton-tarball + Uitpakken mislukt (tar %1$d) + Het archief bevat geen Proton-build + Kan de Proton-build niet plaatsen + Kan %1$s niet volledig verwijderen + Experimentele Proton geïnstalleerd. Kies het in Steam → Eigenschappen → Compatibiliteit. Installeren van %1$s is mislukt (afsluitcode %2$d) Kan %1$s niet installeren Pakket droiddeck-esync ophalen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2ac1cbfbfa..37feb93f86 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2354,6 +2354,18 @@ Niezgodna suma kontrolna; pobrany plik usunięto Podczas pobierania uruchomiono sesję; zatrzymaj ją przed instalacją narzędzi zgodności Instalowanie %1$s + Kompilacje eksperymentalne + Wybierz plik .zip z kompilacją Proton + Zainstaluj z pliku .zip + Za mało wolnego miejsca na tę kompilację Proton + Rozpakowywanie + Rozpakowywanie Proton (kilka minut) + Plik .zip nie zawiera archiwum tar z Proton + Rozpakowywanie nie powiodło się (tar %1$d) + Archiwum nie zawiera kompilacji Proton + Nie udało się umieścić kompilacji Proton + Nie udało się całkowicie usunąć %1$s + Eksperymentalny Proton został zainstalowany. Wybierz go w Steam → Właściwości → Zgodność. Instalacja %1$s nie powiodła się (kod %2$d) Nie udało się zainstalować %1$s Pobieranie pakietu droiddeck-esync diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 54cca5da98..d9911b434e 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2319,6 +2319,18 @@ A soma de verificação não corresponde; a transferência foi eliminada Foi iniciada uma sessão durante a transferência; pare-a antes de instalar ferramentas de compatibilidade A instalar %1$s + Versões experimentais + Escolha um .zip de versão do Proton + Instalar a partir de .zip + Não há espaço livre suficiente para esta versão do Proton + A descompactar + A desempacotar o Proton (alguns minutos) + O .zip não contém nenhum tarball do Proton + Falha ao desempacotar (tar %1$d) + O arquivo não contém nenhuma versão do Proton + Não foi possível colocar a versão do Proton + Não foi possível remover totalmente %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação de %1$s (saída %2$d) Não foi possível instalar %1$s A obter o pacote droiddeck-esync diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8116d22156..4358d50e82 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2327,6 +2327,18 @@ A soma de verificação não confere; o download foi excluído Uma sessão foi iniciada durante o download; pare-a antes de instalar ferramentas de compatibilidade Instalando %1$s + Builds experimentais + Escolha um .zip de build do Proton + Instalar a partir de .zip + Não há espaço livre suficiente para este build do Proton + Descompactando + Desempacotando o Proton (alguns minutos) + O .zip não contém nenhum tarball do Proton + Falha ao desempacotar (tar %1$d) + O arquivo não contém nenhum build do Proton + Não foi possível colocar o build do Proton + Não foi possível remover totalmente o %1$s + Proton experimental instalado. Escolha-o em Steam → Propriedades → Compatibilidade. Falha na instalação do %1$s (código de saída %2$d) Não foi possível instalar o %1$s Buscando o pacote droiddeck-esync diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9315e8d9fb..1d3ded24e2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2328,6 +2328,18 @@ Sumă de control incorectă; descărcarea a fost ștearsă O sesiune a pornit în timpul descărcării; oprește-o înainte de a instala instrumente de compatibilitate Se instalează %1$s + Versiuni experimentale + Alege un .zip cu o versiune Proton + Instalează din .zip + Nu există suficient spațiu liber pentru această versiune Proton + Se dezarhivează + Se despachetează Proton (câteva minute) + Fișierul .zip nu conține nicio arhivă tar Proton + Despachetarea a eșuat (tar %1$d) + Arhiva nu conține nicio versiune Proton + Versiunea Proton nu a putut fi plasată + %1$s nu a putut fi eliminat complet + Proton experimental a fost instalat. Selectează-l în Steam → Proprietăți → Compatibilitate. Instalarea %1$s a eșuat (cod de ieșire %2$d) %1$s nu a putut fi instalat Se obține pachetul droiddeck-esync diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b4105decd9..2dbd904979 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2354,6 +2354,18 @@ Контрольная сумма не совпадает; загруженный файл удален Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s + Экспериментальные сборки + Выберите .zip со сборкой Proton + Установить из .zip + Недостаточно свободного места для этой сборки Proton + Распаковка архива + Распаковка Proton (несколько минут) + В .zip нет архива tar с Proton + Не удалось распаковать (tar %1$d) + В архиве нет сборки Proton + Не удалось разместить сборку Proton + Не удалось полностью удалить %1$s + Экспериментальная сборка Proton установлена. Выберите её в Steam → Свойства → Совместимость. Ошибка установки %1$s (код выхода %2$d) Не удалось установить %1$s Загрузка пакета droiddeck-esync diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ed197424fe..697b794933 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2302,6 +2302,18 @@ Kontrollsumman stämmer inte. Nedladdningen togs bort En session startade under nedladdningen. Stoppa den innan du installerar kompatibilitetsverktyg Installerar %1$s + Experimentella byggen + Välj en Proton-version som .zip + Installera från .zip + Inte tillräckligt med ledigt utrymme för den här Proton-versionen + Packar upp zip + Packar upp Proton (några minuter) + .zip-filen innehåller ingen Proton-tarball + Uppackningen misslyckades (tar %1$d) + Arkivet innehåller ingen Proton-version + Det gick inte att placera Proton-versionen + Det gick inte att ta bort %1$s helt + Experimentell Proton installerad. Välj den i Steam → Egenskaper → Kompatibilitet. Installationen av %1$s misslyckades (avslutningskod %2$d) Kunde inte installera %1$s Hämtar droiddeck-esync-paket diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 97e4ae05ca..eb9201563f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2277,6 +2277,18 @@ ค่าตรวจสอบไม่ตรงกัน การดาวน์โหลดถูกลบแล้ว มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s + บิลด์ทดลอง + เลือกไฟล์ .zip ของบิลด์ Proton + ติดตั้งจากไฟล์ .zip + พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ + กำลังแตกไฟล์ zip + กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) + ไฟล์ .zip ไม่มี tarball ของ Proton + แตกไฟล์ไม่สำเร็จ (tar %1$d) + ไฟล์เก็บถาวรไม่มีบิลด์ Proton + ไม่สามารถวางบิลด์ Proton ได้ + ไม่สามารถลบ %1$s ออกให้หมดได้ + ติดตั้ง Proton รุ่นทดลองแล้ว เลือกได้ที่ Steam → คุณสมบัติ → ความเข้ากันได้ การติดตั้ง %1$s ล้มเหลว (ออกด้วยสถานะ %2$d) ไม่สามารถติดตั้ง %1$s ได้ กำลังดึงแพ็ก droiddeck-esync diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5ee9d6ae24..0bdf537643 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2294,6 +2294,18 @@ Sağlama toplamı uyuşmuyor; indirme silindi İndirme sırasında bir oturum başladı; uyumluluk araçlarını yüklemeden önce durdurun %1$s yükleniyor + Deneysel sürümler + Bir Proton sürümü .zip dosyası seçin + Şuradan yükle: .zip + Bu Proton sürümü için yeterli boş alan yok + Zip açılıyor + Proton paketten çıkarılıyor (birkaç dakika) + .zip dosyasında Proton tar arşivi yok + Paketten çıkarma başarısız oldu (tar %1$d) + Arşivde Proton sürümü yok + Proton sürümü yerleştirilemedi + %1$s tamamen kaldırılamadı + Deneysel Proton yüklendi. Steam → Özellikler → Uyumluluk bölümünden seçin. %1$s yüklemesi başarısız oldu (çıkış %2$d) %1$s yüklenemedi droiddeck-esync paketi getiriliyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 20b12469d1..a3ae01f71d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2354,6 +2354,18 @@ Контрольна сума не збіглася; завантаження видалено Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s + Експериментальні збірки + Виберіть .zip зі збіркою Proton + Встановити з .zip + Недостатньо вільного місця для цієї збірки Proton + Розпакування архіву + Розпакування Proton (кілька хвилин) + У .zip немає архіву tar із Proton + Не вдалося розпакувати (tar %1$d) + В архіві немає збірки Proton + Не вдалося розмістити збірку Proton + Не вдалося повністю видалити %1$s + Експериментальну збірку Proton встановлено. Виберіть її в Steam → Властивості → Сумісність. Встановлення %1$s не вдалося (код виходу %2$d) Не вдалося встановити %1$s Отримання пакета droiddeck-esync diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1e1dd18566..67403a00d1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2277,6 +2277,18 @@ Checksum không khớp; tệp tải xuống đã bị xóa Một phiên đã bắt đầu trong khi tải; hãy dừng nó trước khi cài công cụ tương thích Đang cài %1$s + Bản dựng thử nghiệm + Chọn tệp .zip bản dựng Proton + Cài đặt từ .zip + Không đủ dung lượng trống cho bản dựng Proton này + Đang giải nén zip + Đang giải nén Proton (vài phút) + Tệp .zip không chứa tarball Proton + Giải nén thất bại (tar %1$d) + Tệp lưu trữ không chứa bản dựng Proton + Không thể đặt bản dựng Proton + Không thể gỡ hoàn toàn %1$s + Đã cài Proton thử nghiệm. Hãy chọn nó trong Steam → Thuộc tính → Tương thích. Cài %1$s thất bại (mã thoát %2$d) Không thể cài %1$s Đang lấy pack droiddeck-esync diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 8b99d82853..2064b9df53 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2354,6 +2354,18 @@ 校验和不匹配;已删除下载的文件 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s + 实验版本 + 选择 Proton 版本 .zip + 从 .zip 安装 + 可用空间不足,无法安装此 Proton 版本 + 正在解压 + 正在解包 Proton(需要几分钟) + .zip 中不含 Proton tar 包 + 解包失败(tar %1$d) + 压缩包中不含 Proton 版本 + 无法放置 Proton 版本 + 无法完全移除 %1$s + 实验版 Proton 已安装。请在 Steam → 属性 → 兼容性 中选择。 %1$s 安装失败(退出代码 %2$d) 无法安装 %1$s 正在获取 droiddeck-esync 包 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index bfe3e076fa..d1fd71fc10 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2276,6 +2276,18 @@ 校驗和不符;已刪除下載的檔案 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在下載 droiddeck-esync 套件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1a1c502bd3..6c4037861c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2276,6 +2276,18 @@ 校驗碼不符;已刪除下載內容 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s + 實驗版本 + 選擇 Proton 版本 .zip + 從 .zip 安裝 + 可用空間不足,無法安裝此 Proton 版本 + 正在解壓縮 + 正在解包 Proton(需要幾分鐘) + .zip 中不含 Proton tar 包 + 解包失敗(tar %1$d) + 壓縮檔中不含 Proton 版本 + 無法放置 Proton 版本 + 無法完全移除 %1$s + 實驗版 Proton 已安裝。請在 Steam → 內容 → 相容性 中選擇。 %1$s 安裝失敗(結束代碼 %2$d) 無法安裝 %1$s 正在取得 droiddeck-esync 套件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14bfd4d601..d61f0ad01b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2530,6 +2530,18 @@ Checksum mismatch; the download was deleted A session started during the download; stop it before installing compatibility tools Installing %1$s + Experimental builds + Pick a Proton build .zip + Install from .zip + Not enough free space for this Proton build + Unzipping + Unpacking Proton (a few minutes) + The .zip holds no Proton tarball + Unpacking failed (tar %1$d) + The archive holds no Proton build + Could not place the Proton build + Could not fully remove %1$s + Experimental Proton installed. Pick it in Steam → Properties → Compatibility. %1$s installation failed (exit %2$d) Could not install %1$s Fetching droiddeck-esync pack diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt new file mode 100644 index 0000000000..1972a06310 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -0,0 +1,155 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.nio.file.Files +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ExperimentalProtonsTest { + @get:Rule val temp = TemporaryFolder() + + @Test + fun namesNeverCollideWithReleasedBuilds() { + val name = ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "pr34-build") + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64-pr34-build", name) + assertFalse(name.startsWith("DroidDeck-Proton")) + assertEquals("Experimental-DroidDeck-Proton-11-12.8-aarch64", + ExperimentalProtons.dirName("DroidDeck-Proton-11-12.8-aarch64", "DroidDeck-Proton-11-12.8-aarch64")) + } + + @Test + fun buildTreeSkipsLinksOutOfTheArchive() { + val outside = protonTree(temp.newFolder("installed")) + val unpacked = temp.newFolder("unpacked") + Files.createSymbolicLink(File(unpacked, "a-link").toPath(), outside.toPath()) + assertNull(ExperimentalProtons.buildTree(unpacked)) + val real = protonTree(File(unpacked, "b-build")) + assertEquals(real.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + @Test + fun buildTreeNeedsWhatTheCatalogNeeds() { + val unpacked = temp.newFolder("unpacked") + val tree = File(unpacked, "build").apply { mkdirs(); File(this, "toolmanifest.vdf").writeText("x") } + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "proton").writeText("x") + assertNull(ExperimentalProtons.buildTree(unpacked)) + File(tree, "files/lib/wine").mkdirs() + assertEquals(tree.canonicalFile, ExperimentalProtons.buildTree(unpacked)?.canonicalFile) + } + + private fun protonTree(dir: File): File = dir.apply { + File(this, "files/lib/wine").mkdirs() + File(this, "toolmanifest.vdf").writeText("x") + File(this, "proton").writeText("x") + } + + @Test + fun ownFileReplacesALinkWithoutTouchingItsTarget() { + val victim = temp.newFile("compatibilitytool.vdf").apply { writeText("released") } + val tree = temp.newFolder("tree") + Files.createSymbolicLink(File(tree, "compatibilitytool.vdf").toPath(), victim.toPath()) + ExperimentalProtons.ownFile(tree, "compatibilitytool.vdf").writeText("experimental") + assertEquals("released", victim.readText()) + assertFalse(Files.isSymbolicLink(File(tree, "compatibilitytool.vdf").toPath())) + } + + @Test + fun deleteTreeDoesNotFollowLinks() { + val kept = temp.newFolder("kept").apply { File(this, "file").writeText("x") } + val build = temp.newFolder("build") + Files.createSymbolicLink(File(build, "lib").toPath(), kept.toPath()) + assertTrue(ExperimentalProtons.deleteTree(build)) + assertFalse(build.exists()) + assertTrue(File(kept, "file").isFile) + } + + @Test + fun checksumFileWithoutADigestIsRejected() { + assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) + val digest = "a".repeat(128) + assertEquals(digest, ExperimentalProtons.checksumIn("$digest DroidDeck-Proton.tar.gz\n")) + } + + @Test + fun checksumLookupDoesNotSelectTheTarball() { + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-sha512.tar.gz"), "Proton-sha512.tar.gz")) + assertEquals("Proton-sha512.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-sha512.tar.gz", "Proton-sha512.tar.gz.sha512sum"), "Proton-sha512.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton.tar.gz"), "Proton.tar.gz")) + assertEquals("Proton.tar.gz.sha512sum", ExperimentalProtons.checksumEntry( + listOf("Proton-debug.tar.gz.sha512sum", "Proton.tar.gz.sha512sum"), "Proton.tar.gz")) + assertEquals("Proton.sha512sum", ExperimentalProtons.checksumEntry(listOf("Proton.sha512sum"), "Proton.tar.gz")) + assertNull(ExperimentalProtons.checksumEntry(listOf("Proton-debug.tar.gz.sha512sum"), "Proton.tar.gz")) + } + + private fun build(dir: File, marker: String): File = dir.apply { + mkdirs() + File(this, "marker").writeText(marker) + } + + @Test + fun failedPlacementRestoresTheExistingBuild() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + assertFalse(ExperimentalProtons.placeTree(File(tools, "missing"), tools, "Experimental-A") { true }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertFalse(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { false }) + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(tools.walkTopDown().none { it.isFile && it.readText() == "new" }) + } + + @Test + fun aReplacedBuildIsForgottenWhileNeitherBuildIsInstalled() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + val forgotten = ArrayList() + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "new"), tools, "Experimental-A") { + assertFalse(File(tools, it).exists()) + forgotten.add(it) + }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals("new", File(tools, "Experimental-A/marker").readText()) + assertTrue(ExperimentalProtons.placeTree(build(File(tools, "staged"), "first"), tools, "Experimental-B") { forgotten.add(it) }) + assertEquals(listOf("Experimental-A"), forgotten) + assertEquals(listOf("Experimental-A", "Experimental-B"), tools.walkTopDown().filter { it.name == "marker" }.map { it.parentFile.name }.sorted().toList()) + } + + @Test + fun anInterruptedReplacementIsFinishedWithItsOldStateForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, "Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-B"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-B"), "new") + build(File(tools, ".droiddeck-experimental-old/Experimental-C"), "old") + build(File(tools, ".droiddeck-experimental-old/Experimental-D"), "old") + build(File(tools, "Experimental-D"), "new") + val forgotten = ArrayList() + ExperimentalProtons.restoreInterrupted(tools) { forgotten.add(it) } + assertEquals(listOf("Experimental-A", "Experimental-B"), forgotten.sorted()) + assertEquals(listOf("new", "new", "old", "new"), listOf("A", "B", "C", "D").map { File(tools, "Experimental-$it/marker").readText() }) + assertTrue(File(tools, ".droiddeck-experimental-old").listFiles().isNullOrEmpty()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } + + @Test + fun anInterruptedReplacementKeepsTheOldBuildWhenItsStateCannotBeForgotten() { + val tools = temp.newFolder("tools") + build(File(tools, ".droiddeck-experimental-old/Experimental-A"), "old") + build(File(tools, ".droiddeck-experimental-new/Experimental-A"), "new") + ExperimentalProtons.restoreInterrupted(tools) { false } + assertEquals("old", File(tools, "Experimental-A/marker").readText()) + assertTrue(File(tools, ".droiddeck-experimental-new").listFiles().isNullOrEmpty()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 5f3f3891fc..15e0280a76 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -222,8 +222,25 @@ class ProtonExtrasTest { assertFalse(state.getJSONObject("active").has("GE-Proton11-7")) assertFalse(state.getJSONObject("queued").has("GE-Proton11-7")) assertTrue(state.getJSONObject("active").has("GE-Proton11-8")) - ComponentsManager.forgetProton(context, kept.name) + assertTrue(ComponentsManager.forgetProton(context, kept.name)) assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + val published = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/desired.tsv") + published.appendText("*\tExperimental-Gone\t11\tdxvk\tfiles/lib/wine/dxvk/x86_64-windows/dxgi.dll\t-\t-\n") + File(originals, "Experimental-Gone/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Gone")) + assertFalse(published.readLines().any { "Experimental-Gone" in it }) + assertFalse(File(originals, "Experimental-Gone").exists()) + + val store = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/store") + File(originals, "Experimental-Stale/11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + val stale = File(store, "original-Experimental-Stale-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + val other = File(store, "original-Experimental-Stale-2-11-dxvk").apply { mkdirs(); File(this, ".complete").writeText("1\n") } + File(originals, "Experimental-Stale/2-11/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + published.appendText("*\tExperimental-Stale-2\t11\tdxvk\tfiles/a.dll\t0\t/root/.local/share/droiddeck-components/store/${other.name}/files/a.dll\n") + assertTrue(ComponentsManager.forgetProton(context, "Experimental-Stale")) + assertFalse(stale.exists()) + assertTrue(File(other, ".complete").isFile) + assertFalse(File(originals, "Experimental-Stale").exists()) } @Test diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 4ad361e4e3..c8ac2ceb30 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -1089,9 +1089,10 @@ NATIVE_CHOICE = object() def plan_mapping(current, installed, runnable, default, auto, native=None, picks=(), overrides=None, managed=None, - native_choices=(), tools=None): + native_choices=(), tools=None, removed=()): tools = tools or {} runnable = {n.lower() for n in runnable} + removed = {n.lower() for n in removed} - runnable installed = set(installed) picks = set(picks) | {app for app, platforms in tools.items() if "linux" not in platforms} native = native or {} @@ -1121,7 +1122,7 @@ def plan_mapping(current, installed, runnable, default, auto, native=None, picks target = native.get(app, default) if not name and (app in native_choices or (app in current and app in FEX_DEFAULT_APPS)): target = NATIVE_CHOICE - stale = unrunnable(name, runnable) + stale = unrunnable(name, runnable) or name.lower() in removed if name and not stale and (mine is None or name != mine): continue if target is NATIVE_CHOICE: @@ -1163,6 +1164,26 @@ def followers(state, current): return {app: name for app, name in current.items() if app != "0" and name == TOOL} +REPLACING = ".droiddeck-experimental-old" + + +def removed_tools(state, catalog, directory=None): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + previous = {t.get("name") for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name")} + removed = previous - {t["name"] for t in catalog} + if directory is None: + return removed + known_dirs = {t.get("name"): t.get("dir") for t in known if isinstance(t, dict)} + return {name for name in removed if isinstance(known_dirs.get(name), str) and + not os.path.lexists(os.path.join(directory, known_dirs[name])) and + not os.path.lexists(os.path.join(directory, REPLACING, known_dirs[name]))} + + +def removed_dirs(state, removed): + known = state.get("tools") if isinstance(state.get("tools"), list) else () + return {t["dir"] for t in known if isinstance(t, dict) and not t.get("valve") and t.get("name") in removed and isinstance(t.get("dir"), str)} - {""} + + def tool_entry(name, display, path, valve): return {"name": name, "display": display, "dir": os.path.basename(path) if path else "", "valve": valve} @@ -1248,15 +1269,19 @@ def valid_game_request(app, request): request["dir"] != "" and isinstance(request.get("valve"), bool))) -def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False): +def settle_game_requests(requests, state, current, catalog, missing_is_cleared=False, removed=()): recorded = state.get("games_applied") if isinstance(recorded, dict): applied = dict(recorded) else: applied = dict(requests) if "tools" in state else {} by_name = {t["name"]: t for t in catalog} + gone = removed_dirs(state, removed) out = dict(requests) for app, request in requests.items(): + if isinstance(request, dict) and request.get("valve") is False and isinstance(request.get("dir"), str) and request["dir"] in gone: + del out[app] + continue if not valid_game_request(app, request) or app not in applied or applied[app] != request: continue if request is None: @@ -1281,10 +1306,10 @@ def settle_game_requests(requests, state, current, catalog, missing_is_cleared=F return out, out != requests -def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None): +def settled_game_requests(state, current, catalog, missing_is_cleared=False, directory=None, removed=()): for _ in range(2): requests, text = read_game_requests(directory) - settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared) + settled, moved = settle_game_requests(requests, state, current, catalog, missing_is_cleared, removed) if not moved or write_game_requests(settled, text, directory): return settled return None @@ -1579,7 +1604,8 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non set_mappings(tokens, mapping, moved) current.update(moved) steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) - requests = settled_game_requests(state, current, catalog, not steam_running(), directory) + removed = removed_tools(state, catalog, os.path.join(steam_root, "compatibilitytools.d")) + requests = settled_game_requests(state, current, catalog, not steam_running(), directory, removed) overrides = requested_games(requests or {}, catalog) managed = state.get("auto", {}).keys() if isinstance(state.get("auto"), dict) else () native_choices = state.get("native_choices", ()) @@ -1590,7 +1616,7 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non current.setdefault(app, "") changes, auto = plan_mapping( current, apps, names, default, followers(state, current), native, picks, - overrides, managed, native_choices, tool_platforms(steam_root)) + overrides, managed, native_choices, tool_platforms(steam_root), removed) set_mappings(tokens, mapping, changes) text = serialize(tokens) if text != serialize(tokenize(original)): diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index fbc7bdc026..898bd3a22a 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -2254,6 +2254,87 @@ class ProtonDefaultTest(unittest.TestCase): self.assertEqual(changes, {"0": "GE-Proton11-7", "10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) self.assertEqual(auto, {"10": "GE-Proton11-7", "11": "GE-Proton11-7", "14": "GE-Proton11-7"}) + def test_games_on_a_removed_custom_proton_go_back_to_the_default(self): + changes, auto = COMPAT["plan_mapping"]( + {"0": self.TOOL, "311210": "bo3fix-proton", "42": "GE-Proton11-7"}, ["311210", "42"], self.NAMES, self.TOOL, {}, + removed={"bo3fix-proton"}) + self.assertEqual(changes, {"311210": self.TOOL}) + self.assertEqual(auto, {"311210": self.TOOL}) + + def test_removed_tools_are_custom_builds_missing_from_the_catalog(self): + state = {"tools": [ + {"name": self.TOOL, "valve": True}, + {"name": "bo3fix-proton", "valve": False}, + {"name": "GE-Proton11-7", "valve": False}, + ]} + self.assertEqual(COMPAT["removed_tools"](state, self.CATALOG), {"bo3fix-proton"}) + self.assertEqual(COMPAT["removed_tools"]({}, self.CATALOG), set()) + + def test_a_failed_extra_adoption_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + tools.mkdir() + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + (tools / "GE-Proton11-7").mkdir() + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + (tools / "GE-Proton11-7").rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_build_being_replaced_is_not_classified_as_removed(self): + with tempfile.TemporaryDirectory() as tmp: + tools = Path(tmp) / "compatibilitytools.d" + state = {"tools": [{"name": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False}]} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + aside = tools / COMPAT["REPLACING"] / "GE-Proton11-7" + aside.mkdir(parents=True) + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), set()) + aside.rmdir() + self.assertEqual(COMPAT["removed_tools"](state, catalog, str(tools)), {"GE-Proton11-7"}) + + def test_a_request_for_a_removed_tool_is_dropped_and_others_are_kept(self): + state = {"tools": self.CATALOG, "games_applied": {}} + requests = {"10": {"valve": False, "dir": "GE-Proton11-7"}, "11": {"valve": False, "dir": "Never-Installed"}, + "12": {"valve": True, "dir": "GE-Proton11-7"}} + catalog = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + settled, moved = COMPAT["settle_game_requests"](requests, state, {}, catalog, removed={"GE-Proton11-7"}) + self.assertTrue(moved) + self.assertEqual(settled, {"11": requests["11"], "12": requests["12"]}) + self.assertEqual(COMPAT["settle_game_requests"](requests, state, {}, catalog), (requests, False)) + malformed = {"10": {"valve": False, "dir": []}} + self.assertEqual(COMPAT["settle_game_requests"](malformed, state, {}, catalog, removed={"GE-Proton11-7"}), (malformed, False)) + + def test_a_game_on_a_removed_tool_follows_the_default_across_registrations(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", "GE-Proton11-7"), ("11", "GE-Proton11-7")])) + request = {"valve": False, "dir": "GE-Proton11-7"} + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps({"version": 1, "games": {"10": request}})) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG, + })) + for default in (self.TOOL, self.TOOL, COMPAT["TOOL_11"]): + COMPAT["register_default"]( + str(config), ["10", "11"], default=default, catalog=available, + directory=tmp, + ) + self.assertEqual(mapping_of(config.read_text()), + {"0": COMPAT["TOOL_11"], "10": COMPAT["TOOL_11"], "11": COMPAT["TOOL_11"]}) + self.assertEqual(json.loads((Path(tmp) / "games.json").read_text())["games"], {}) + + def test_a_steam_pick_survives_the_removal_of_another_tool(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([("0", self.TOOL), ("10", COMPAT["TOOL_11"])])) + available = [tool for tool in self.CATALOG if tool["name"] != "GE-Proton11-7"] + (Path(tmp) / "games.json").write_text(json.dumps( + {"version": 1, "games": {"10": {"valve": False, "dir": "GE-Proton11-7"}}})) + (Path(tmp) / "state.json").write_text(json.dumps({"default": self.TOOL, "tools": self.CATALOG, "auto": {}})) + COMPAT["register_default"](str(config), ["10"], default=self.TOOL, catalog=available, directory=tmp) + self.assertEqual(mapping_of(config.read_text()), {"0": self.TOOL, "10": COMPAT["TOOL_11"]}) + def test_windows_only_titles_still_follow_the_default(self): changes, auto = COMPAT["plan_mapping"]( {"0": self.TOOL}, ["42"], self.NAMES, self.TOOL, {}) @@ -2597,6 +2678,41 @@ class ProtonDefaultTest(unittest.TestCase): "11": COMPAT["TOOL_11"], }) + def test_per_game_proton_that_was_removed_goes_back_to_the_default(self): + with tempfile.TemporaryDirectory() as tmp: + config = Path(tmp) / "config.vdf" + config.write_text(config_text([ + ("0", self.TOOL), + ("10", "Experimental-DroidDeck-Proton-11-12.8-pr34-build"), + ("12", "GE-Proton9-1"), + ])) + (Path(tmp) / "games.json").write_text(json.dumps({ + "version": 1, + "games": { + "10": {"valve": False, "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build"}, + "12": {"valve": False, "dir": "GE-Proton9-1"}, + }, + })) + (Path(tmp) / "state.json").write_text(json.dumps({ + "default": self.TOOL, + "tools": self.CATALOG + [{ + "name": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "display": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", + "dir": "Experimental-DroidDeck-Proton-11-12.8-pr34-build", "valve": False, + }], + })) + + COMPAT["register_default"]( + str(config), ["10", "12"], default=self.TOOL, + catalog=self.CATALOG, directory=tmp, + ) + + self.assertEqual(mapping_of(config.read_text()), { + "0": self.TOOL, + "10": self.TOOL, + "12": "GE-Proton9-1", + }) + def test_the_last_side_to_change_wins(self): state = {"default": self.TOOL, "applied": 5} default, state = COMPAT["choose_default"]("GE-Proton11-7", state, {"seq": 5, "dir": "Proton 11.0 (ARM64)", "valve": True}, self.CATALOG, now=100) From f2d8e9e8372b7be56e51e8e94ae9afc382deb2c1 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 07:33:17 -0500 Subject: [PATCH 47/60] perf(storage): answer repeated SD library checks from the directory cache (#2881) --- .../thor-sd-storage-investigation.md | 66 +++++ tools/linuxfs/preload/dircache.c | 225 +++++++++++++----- tools/linuxfs/preload/pathcache.c | 27 ++- tools/tests/test_dircache_preload.py | 210 +++++++++++++++- 4 files changed, 457 insertions(+), 71 deletions(-) diff --git a/docs/development/thor-sd-storage-investigation.md b/docs/development/thor-sd-storage-investigation.md index e4315616eb..5079d1dbf2 100644 --- a/docs/development/thor-sd-storage-investigation.md +++ b/docs/development/thor-sd-storage-investigation.md @@ -451,3 +451,69 @@ synchronous directory updates, so SD installs stay bound by them (about 4 to 5 m 2,000 files of reserving plus commit on this card). Removing those costs needs fewer directory operations per file, not faster path translation. + +## Repeated round trips in the Steam client (2026-11-19) + +Measured on an AYANEO Pocket FIT Elite with a SanDisk 128 GB U1 card (exFAT, `dirsync`, +MediaProvider FUSE) as the second Steam library, by timing every file call the Steam +client makes under `/steamapps` during a real uninstall and install. + +Where the time went before, for one install of 3,800 files and directories: + +| Call | Total before | Total after | +| --- | --- | --- | +| `faccessat` | 31.1 s | 0 s | +| `stat` | 29.4 s | 0 s | +| `access` | 40.3 s | 13.2 s | +| `opendir` | 8.6 s | 3.3 s | +| `__xstat64` | 5.4 s | about 0 s | +| `rename` | 124.8 s | 91 to 106 s | +| file creation | about 22 s | about 22 s | + +Most of the removed calls asked the card a question the directory cache could already +answer: + +- A directory the cache holds a fresh listing for is now opened from that listing without + a `stat` of the directory first, and its own create, rename and remove calls update the + listing from what the call returned instead of re-reading the directory and the new + entry. +- `access`, `faccessat` and `__xstat64` on a name that a fresh listing shows is missing + return `ENOENT` without a round trip, including the differently cased spellings the + client probes. An absolute path passed with a directory descriptor takes the same path. +- The path cache spreads its slots with the high hash bits, which stops install paths that + differ only near the end from evicting each other. + +Results on the card (the first four rows are the 3,800 entry install; the moves are +single runs timed to about 3 s): + +| Step | Before | After | +| --- | --- | --- | +| Reserving space | 68.9 s | 27 to 28 s | +| Commit | 150.9 s | 97 to 111 s | +| Whole install | 261.0 s | 172 to 195 s | +| Uninstall | about 31 s | 28.5 to 29.4 s | +| Reserving space, second program (4.4 GB, few files) | 33.9 s | 12.5 s | +| Uninstall, second program | 12.3 s | 9.2 s | +| Steam move, internal storage to card | 156.8 s | 121.7 s | +| Steam move, card to internal storage | 56.5 s | 62.0 s | + +What is left is the card: each rename and each file creation is one synchronous directory +update, and the second program's 4.4 GB download and final commit took the same time +before and after. + +### Launching from the card + +A program started from the card was traced the same way. Three things were measured: + +- Sequential reads through the mount run at the card's own speed (88 MB/s cold), with or + without read-ahead hints. A launch that reads 1 GB spends about 12 s there on this card. +- A warm directory listing takes about 0.8 ms. A cold one takes about 77 ms for every + 128 KB directory cluster, even for a directory with one entry, so listing a 167 + directory install tree takes 12.9 s cold and 0.37 s warm. +- The listings stay warm while the device is idle, but a launch that fills memory pushes + them out again in bursts, so a program that lists its tree more than once pays the cold + price more than once. Keeping the tree warm from outside for the whole launch moved the + traced program's start-up forward by 5.5 to 7 s out of about 89 s. + +The rest of that launch was the program's own launcher and CPU-bound start-up, which did +not wait on the card in these traces. diff --git a/tools/linuxfs/preload/dircache.c b/tools/linuxfs/preload/dircache.c index e322c6cde3..81c7a9ff62 100644 --- a/tools/linuxfs/preload/dircache.c +++ b/tools/linuxfs/preload/dircache.c @@ -23,10 +23,11 @@ #define MAX_ENTRIES 100000 #define MAX_HANDLES 64 #define MAX_UP 32 +#define MAX_ALIASES 4 #define FUSE_MAGIC 0x65735546 -#define WATCHED (IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE_SELF | IN_MOVE_SELF | IN_ONLYDIR) -#define ABOVE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ONLYDIR | IN_MASK_ADD) -#define GONE (IN_DELETE_SELF | IN_MOVE_SELF | IN_IGNORED) +#define WATCHED (IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_ONLYDIR) +#define ABOVE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_ONLYDIR | IN_MASK_ADD) +#define GONE (IN_DELETE_SELF | IN_MOVE_SELF | IN_ATTRIB | IN_IGNORED) #define LINKED (IN_DELETE_SELF | IN_MOVE_SELF | IN_DONT_FOLLOW | IN_MASK_ADD) #if __SIZEOF_POINTER__ == 8 @@ -54,6 +55,9 @@ struct listing { size_t len; char *where; int folds; + int loose; + char *alias[MAX_ALIASES]; + int aliases; }; struct handle { @@ -78,6 +82,7 @@ static struct listing *table[MAX_LISTINGS]; static struct handle *handles[MAX_HANDLES]; static int high_water; static int cached_listings; +static int blind_listings; static int changing; static int notify = -1; static int forked; @@ -171,6 +176,7 @@ static void destroy(struct listing *l) { free(l->e); free(l->recs); free(l->where); + for (int i = 0; i < MAX_ALIASES; i++) free(l->alias[i]); free(l); } @@ -201,6 +207,7 @@ static void let_go(int wd, const int *up, int nup) { static void detach(struct listing *l) { __atomic_sub_fetch(&cached_listings, 1, __ATOMIC_RELEASE); + if (l->blind || l->where == NULL) blind_listings--; l->detached = 1; if (l->refs == 0) destroy(l); } @@ -255,6 +262,7 @@ static void pump(struct expect *x, int nx) { changed(-1, 0); continue; } + if ((ev->mask & IN_ATTRIB) && ev->len) continue; int k = 0; while (k < nx && !(x[k].wd == ev->wd && (ev->mask & x[k].mask) && ev->len && strcmp(ev->name, x[k].name) == 0)) k++; if (k < nx) { @@ -304,6 +312,7 @@ static int push(struct listing *l, ino_t ino, unsigned char type, const char *na static void install(struct listing *l) { l->detached = 0; __atomic_add_fetch(&cached_listings, 1, __ATOMIC_RELEASE); + if (l->blind || l->where == NULL) blind_listings++; int slot = find(l->dev, l->ino); if (slot >= 0) { struct listing *old = table[slot]; @@ -416,10 +425,104 @@ __attribute__((constructor)) static void resolve(void) { } #pragma GCC diagnostic pop +static int named(const struct listing *l, const char *name) { + for (size_t i = 0; i < l->n; i++) + if (strcasecmp(l->e[i].name, name) == 0) return 1; + return 0; +} + +static int folded_match(const char *where, const char *dir) { + const char *at = strstr(where, "/steamapps"); + if (at == NULL) return 0; + size_t n = (size_t)(at - where); + return strncmp(where, dir, n) == 0 && strcasecmp(where + n, dir + n) == 0; +} + +static int same_dir(const struct listing *l, const char *dir) { + struct stat st; + int saved = errno; + int same = stat(dir, &st) == 0 && st.st_dev == l->dev && st.st_ino == l->ino; + errno = saved; + return same; +} + +static int plain(const char *where, char *dir) { + const char *at = strstr(where, "/steamapps"); + int saved = errno, fine = at != NULL; + for (size_t from = fine ? (size_t)(at - where) + 1 : 0; fine && dir[from];) { + size_t to = from + strcspn(dir + from, "/"); + char kept = dir[to]; + struct stat st; + dir[to] = 0; + fine = strcmp(dir + from, ".") != 0 && strcmp(dir + from, "..") != 0 && lstat(dir, &st) == 0 && !S_ISLNK(st.st_mode); + dir[to] = kept; + from = kept ? to + 1 : to; + } + errno = saved; + return fine; +} + +static int aliased(struct listing *l, const char *dir) { + for (int i = 0; i < MAX_ALIASES; i++) + if (l->alias[i] && strcmp(l->alias[i], dir) == 0) return 1; + if (!same_dir(l, dir)) return 0; + char *copy = strdup(dir); + if (copy && !plain(l->where, copy)) { + free(copy); + copy = NULL; + } + if (copy) { + int at = l->aliases++ % MAX_ALIASES; + free(l->alias[at]); + l->alias[at] = copy; + } + return 1; +} + +static struct listing *listed(const char *dir, long long now) { + for (int i = 0; i < MAX_LISTINGS; i++) { + struct listing *l = table[i]; + if (l == NULL || l->where == NULL || l->blind || now - l->filled >= DIR_TTL_NS) continue; + if (strcmp(l->where, dir) == 0) return l; + if (l->folds && folded_match(l->where, dir)) return aliased(l, dir) ? l : NULL; + } + return NULL; +} + +static int watching(const char *path) { + return eligible(path) && __atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) > 0; +} + +static DIR *listed_open(struct handle *h, long long now) { + DIR *d = NULL; + if (__atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) == 0) return NULL; + take(&lock); + if (!changing) { + pump(NULL, 0); + struct listing *l = listed(h->path, now); + if (l && records(l) == 0) { + h->snap = l; + l->refs++; + l->used = now; + d = wrap(h); + if (d == NULL) { + unref(l); + h->snap = NULL; + } + } + } + give(&lock); + return d; +} + static DIR *hit(const struct stat *st, struct handle *h, long long now) { take(&lock); if (!changing) pump(NULL, 0); int slot = find(st->st_dev, st->st_ino); + if (slot >= 0 && table[slot]->loose && now - table[slot]->filled < DIR_TTL_NS) { + stamp(table[slot], st); + table[slot]->loose = 0; + } if (slot >= 0 && same(table[slot], st) && now - table[slot]->filled < DIR_TTL_NS && records(table[slot]) == 0) { h->snap = table[slot]; h->snap->refs++; @@ -509,8 +612,7 @@ static void untrack(struct handle *h) { DIR *opendir(const char *path) { NEXT(opendir); struct stat st; - if (!eligible(path) || stat(path, &st) != 0 || !S_ISDIR(st.st_mode) || !on_fuse(st.st_dev, path)) - return next_opendir(path); + if (!eligible(path)) return next_opendir(path); struct handle *h = calloc(1, sizeof(*h)); char *copy = strdup(path); if (h == NULL || copy == NULL) { @@ -522,7 +624,14 @@ DIR *opendir(const char *path) { h->wd = -1; h->path = copy; long long now = now_ns(); - DIR *d = hit(&st, h, now); + DIR *d = listed_open(h, now); + if (d) return d; + if (stat(path, &st) != 0 || !S_ISDIR(st.st_mode) || !on_fuse(st.st_dev, path)) { + free(h->path); + free(h); + return next_opendir(path); + } + d = hit(&st, h, now); if (d) return d; if (!track(h, path)) { free(h->path); @@ -699,7 +808,9 @@ void seekdir(DIR *d, long pos) { } } -struct side { char dir[PATH_MAX]; const char *name; struct stat before; int known; }; +struct side { char dir[PATH_MAX]; const char *name; struct stat before; int known; int trusted; }; + +struct made { int known; ino_t ino; unsigned char type; }; static int split(const char *path, struct side *s) { size_t n = strlen(path); @@ -713,10 +824,6 @@ static int split(const char *path, struct side *s) { return strchr(s->name, '/') == NULL && strcmp(s->name, ".") != 0 && strcmp(s->name, "..") != 0; } -static int watching(const char *path) { - return eligible(path) && __atomic_load_n(&cached_listings, __ATOMIC_ACQUIRE) > 0; -} - static void begin(void) { take(&lock); pump(NULL, 0); @@ -725,13 +832,42 @@ static void begin(void) { } static void before(struct side *s) { - s->known = stat(s->dir, &s->before) == 0; + take(&lock); + struct listing *l = listed(s->dir, now_ns()); + int unlisted = l == NULL && blind_listings == 0; + s->trusted = l != NULL; + if (l) { + memset(&s->before, 0, sizeof(s->before)); + s->before.st_dev = l->dev; + s->before.st_ino = l->ino; + s->before.st_size = l->size; + s->before.st_nlink = l->nlink; + s->before.st_mtim = l->mtime; + s->before.st_ctim = l->ctime; + } + give(&lock); + s->known = s->trusted || (!unlisted && stat(s->dir, &s->before) == 0); +} + +static unsigned char type_of(mode_t mode) { + return S_ISDIR(mode) ? DT_DIR : S_ISLNK(mode) ? DT_LNK : S_ISREG(mode) ? DT_REG : DT_UNKNOWN; +} + +static int made_at(const struct side *s, const char *target, struct made *m) { + struct stat t; + if (s->trusted && m && m->known) return 1; + if (lstat(target, &t) != 0) return 0; + *m = (struct made){1, t.st_ino, type_of(t.st_mode)}; + return 1; } enum { ADDED, REMOVED }; -static int patch(struct side *s, int what, uint32_t event, int ok, int error, const char *target, struct expect *x) { +static int patch(struct side *s, int what, uint32_t event, int ok, int error, const char *target, struct made *m, + struct expect *x) { struct stat now; + struct made local = {0}; + if (m == NULL) m = &local; if (!s->known) return 0; int slot = find(s->before.st_dev, s->before.st_ino); if (slot < 0) return 0; @@ -750,7 +886,7 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co drop(slot); return 0; } - if (stat(s->dir, &now) != 0 || now.st_ino != l->ino) { + if (!s->trusted && (stat(s->dir, &now) != 0 || now.st_ino != l->ino)) { drop(slot); return 0; } @@ -771,6 +907,7 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co copy->blind = l->blind; copy->where = l->where ? strdup(l->where) : NULL; copy->folds = l->folds; + copy->loose = l->loose; copy->detached = 0; stamp(copy, &s->before); table[slot] = copy; @@ -781,18 +918,17 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co l->recs = NULL; l->len = 0; int fine = 1, expected = 1; - struct stat t; if (what == ADDED) { if (exact < l->n) { - if (lstat(target, &t) == 0) l->e[exact].ino = t.st_ino; + if (event == IN_MOVED_TO && made_at(s, target, m)) l->e[exact].ino = m->ino; expected = event == IN_MOVED_TO; - } else if (folded < l->n || lstat(target, &t) != 0) { + } else if (folded < l->n || !made_at(s, target, m)) { fine = 0; } else { - unsigned char type = S_ISDIR(t.st_mode) ? DT_DIR : S_ISLNK(t.st_mode) ? DT_LNK : S_ISREG(t.st_mode) ? DT_REG : DT_UNKNOWN; - fine = l->n < MAX_ENTRIES && push(l, t.st_ino, type, s->name) == 0; + fine = l->n < MAX_ENTRIES && push(l, m->ino, m->type, s->name) == 0; } } else if (exact < l->n) { + *m = (struct made){1, l->e[exact].ino, l->e[exact].type}; free(l->e[exact].name); memmove(&l->e[exact], &l->e[exact + 1], (l->n - exact - 1) * sizeof(l->e[0])); l->n--; @@ -803,7 +939,8 @@ static int patch(struct side *s, int what, uint32_t event, int ok, int error, co drop(slot); return 0; } - stamp(l, &now); + if (s->trusted) l->loose = 1; + else stamp(l, &now); if (!expected) return 0; *x = (struct expect){l->wd, event, s->name}; return 1; @@ -829,8 +966,11 @@ int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int fd = real(dirfd, path, flags, mode); int saved = errno; struct expect x; + struct stat opened; + struct made m = {0}; + if (fd >= 0 && s.trusted && fstat(fd, &opened) == 0) m = (struct made){1, opened.st_ino, type_of(opened.st_mode)}; take(&lock); - int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &x); + int nx = patch(&s, ADDED, IN_CREATE, fd >= 0, saved, path, &m, &x); give(&lock); end(&x, nx); give(&oplock); @@ -850,7 +990,7 @@ int dd_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int saved = errno; \ struct expect x; \ take(&lock); \ - int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, &x); \ + int nx = patch(&s, what, event, r == 0, saved, what == ADDED ? path : NULL, NULL, &x); \ if (r == 0 && what == REMOVED) forget_below(path); \ give(&lock); \ end(&x, nx); \ @@ -885,12 +1025,13 @@ ONE_PATH(remove, REMOVED, IN_DELETE, dd_descriptor_remove(path, next_remove)) int r = call(from, to); \ int saved = errno; \ struct expect x[2]; \ + struct made m = {0}; \ int nx = 0; \ take(&lock); \ - if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &x[nx]); \ + if (track_a) nx += patch(&a, REMOVED, IN_MOVED_FROM, r == 0, saved, NULL, &m, &x[nx]); \ if (track_b) { \ - if (track_a && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ - nx += patch(&b, ADDED, event, r == 0, saved, to, &x[nx]); \ + if (track_a && !b.trusted && strcmp(a.dir, b.dir) == 0) b.known = stat(b.dir, &b.before) == 0; \ + nx += patch(&b, ADDED, event, r == 0, saved, to, &m, &x[nx]); \ } \ if (r == 0 && gone) { forget_below(from); forget_below(to); } \ give(&lock); \ @@ -907,37 +1048,6 @@ TWO_PATHS(rename, 1, IN_MOVED_TO, moved) TWO_PATHS(link, 0, IN_CREATE, link_or_lock) TWO_PATHS(symlink, 0, IN_CREATE, next_symlink) -static int named(const struct listing *l, const char *name) { - for (size_t i = 0; i < l->n; i++) - if (strcasecmp(l->e[i].name, name) == 0) return 1; - return 0; -} - -static int folded_match(const char *where, const char *dir) { - const char *at = strstr(where, "/steamapps"); - if (at == NULL) return 0; - size_t n = (size_t)(at - where); - return strncmp(where, dir, n) == 0 && strcasecmp(where + n, dir + n) == 0; -} - -static int same_dir(const struct listing *l, const char *dir) { - struct stat st; - int saved = errno; - int same = stat(dir, &st) == 0 && st.st_dev == l->dev && st.st_ino == l->ino; - errno = saved; - return same; -} - -static int listed_absent(const char *dir, const char *name, long long now) { - for (int i = 0; i < MAX_LISTINGS; i++) { - struct listing *l = table[i]; - if (l == NULL || l->where == NULL || l->blind || now - l->filled >= DIR_TTL_NS) continue; - if (strcmp(l->where, dir) == 0) return !named(l, name); - if (l->folds && folded_match(l->where, dir)) return same_dir(l, dir) && !named(l, name); - } - return 0; -} - int dd_dircache_absent(const char *path) __attribute__((visibility("hidden"))); int dd_dircache_absent(const char *path) { struct side s; @@ -949,7 +1059,8 @@ int dd_dircache_absent(const char *path) { int absent = 0; if (!changing) { pump(NULL, 0); - absent = listed_absent(s.dir, s.name, now); + struct listing *l = listed(s.dir, now); + absent = l != NULL && !named(l, s.name); } give(&lock); return absent; diff --git a/tools/linuxfs/preload/pathcache.c b/tools/linuxfs/preload/pathcache.c index 400a1e5786..beefbfbe24 100644 --- a/tools/linuxfs/preload/pathcache.c +++ b/tools/linuxfs/preload/pathcache.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -55,12 +56,16 @@ static unsigned hash_of(const char *s, int kind, int mode, int flags) { return h; } +static struct entry *slot(unsigned h) { + return &table[(h ^ (h >> 16)) % PATH_CACHE_SLOTS]; +} + static int cacheable(const char *path) { return path != NULL && path[0] == '/' && strlen(path) < PATH_CACHE_KEY_MAX && enabled(); } static struct entry *find(const char *path, int kind, int mode, int flags, unsigned h) { - struct entry *e = &table[h % PATH_CACHE_SLOTS]; + struct entry *e = slot(h); if (e->stamp == 0 || e->hash != h || e->kind != kind || e->mode != mode || e->flags != flags) return NULL; if (now_ns() - e->stamp > PATH_CACHE_TTL_NS || strcmp(e->key, path) != 0) return NULL; @@ -68,7 +73,7 @@ static struct entry *find(const char *path, int kind, int mode, int flags, unsig } static void store(const char *path, int kind, int mode, int flags, unsigned h, const char *value) { - struct entry *e = &table[h % PATH_CACHE_SLOTS]; + struct entry *e = slot(h); char *copy = value != NULL ? strdup(value) : NULL; if (value != NULL && copy == NULL) return; @@ -172,6 +177,10 @@ static int check_cwd(const char *path, int mode, int flags) { return result; } +static int absolute(const char *path) { + return path != NULL && path[0] == '/'; +} + int access(const char *path, int mode) { return cached_access(path, mode, 0, check_cwd); } @@ -188,7 +197,7 @@ int faccessat(int dirfd, const char *path, int mode, int flags) { int (*real)(int, const char *, int, int); int err; - if (dirfd == AT_FDCWD) { + if (dirfd == AT_FDCWD || absolute(path)) { return cached_access(path, mode, flags, check_cwd); } real = next_faccessat(); @@ -202,3 +211,15 @@ int faccessat(int dirfd, const char *path, int mode, int flags) { errno = err; return -1; } + +int __xstat64(int version, const char *path, struct stat64 *out) { + static int (*real)(int, const char *, struct stat64 *); + + if (dd_dircache_absent && dd_dircache_absent(path)) { + errno = ENOENT; + return -1; + } + if (real == NULL) real = (int (*)(int, const char *, struct stat64 *))dlsym(RTLD_NEXT, "__xstat64"); + if (real != NULL) return real(version, path, out); + return stat64(path, out); +} diff --git a/tools/tests/test_dircache_preload.py b/tools/tests/test_dircache_preload.py index 9435922b40..7997bf5ae8 100644 --- a/tools/tests/test_dircache_preload.py +++ b/tools/tests/test_dircache_preload.py @@ -24,6 +24,7 @@ FAKE = r""" int real_opendirs; int real_accesses; +int real_stats; static void coarse(const char *path, struct stat *st) { if (getenv("COARSE") && strstr(path, "/fuse/") && S_ISDIR(st->st_mode)) { @@ -33,25 +34,44 @@ static void coarse(const char *path, struct stat *st) { } } -int stat(const char *path, struct stat *st) { - static int (*next)(const char *, struct stat *); - if (!next) next = dlsym(RTLD_NEXT, "stat"); - char folded[4096]; +static const char *fold_case(const char *path, char *folded, size_t size) { const char *fold = getenv("FOLD"); const char *upper = fold ? strstr(path, "/STEAMAPPS") : NULL; if (!upper && fold && !strcmp(fold, "all")) upper = strcasestr(path, "/steamapps/"); - if (upper && strlen(path) < sizeof(folded)) { - strcpy(folded, path); - memcpy(folded + (upper - path) + 1, "steamapps", 9); - if (!strcmp(fold, "all")) - for (char *c = folded + (upper - path); *c; c++) if (*c >= 'A' && *c <= 'Z') *c += 'a' - 'A'; - path = folded; - } + if (!upper || strlen(path) >= size) return path; + strcpy(folded, path); + memcpy(folded + (upper - path) + 1, "steamapps", 9); + if (!strcmp(fold, "all")) + for (char *c = folded + (upper - path); *c; c++) if (*c >= 'A' && *c <= 'Z') *c += 'a' - 'A'; + return folded; +} + +static int fold_stat(const char *name, const char *path, struct stat *st) { + int (*next)(const char *, struct stat *) = dlsym(RTLD_NEXT, name); + char folded[4096]; + if (strstr(path, "/fuse/")) real_stats++; int r = next(path, st); + if (r != 0) r = next(fold_case(path, folded, sizeof(folded)), st); + return r; +} + +int stat(const char *path, struct stat *st) { + int r = fold_stat("stat", path, st); if (r == 0) coarse(path, st); return r; } +int lstat(const char *path, struct stat *st) { + return fold_stat("lstat", path, st); +} + +int __xstat64(int version, const char *path, struct stat64 *st) { + static int (*next)(int, const char *, struct stat64 *); + if (!next) next = dlsym(RTLD_NEXT, "__xstat64"); + if (strstr(path, "/fuse/")) real_stats++; + return next ? next(version, path, st) : stat64(path, st); +} + int fstat(int fd, struct stat *st) { static int (*next)(int, struct stat *); if (!next) next = dlsym(RTLD_NEXT, "fstat"); @@ -221,6 +241,7 @@ static void stress(const char *dir) { int main(int argc, char **argv) { int *opens = dlsym(RTLD_DEFAULT, "real_opendirs"); int *accesses = dlsym(RTLD_DEFAULT, "real_accesses"); + int *stats = dlsym(RTLD_DEFAULT, "real_stats"); for (int i = 1; i < argc; i++) { const char *op = argv[i], *a = argv[i + 1]; if (!strcmp(op, "list")) { list(a); i++; } @@ -309,6 +330,27 @@ int main(int argc, char **argv) { printf("%d %d\n", r, r ? errno : 0); i++; } + else if (!strcmp(op, "accessat")) { + int r = faccessat(STDIN_FILENO, a, F_OK, 0); + printf("%d %d\n", r, r ? errno : 0); + i++; + } + else if (!strcmp(op, "xstat")) { + int (*old)(int, const char *, struct stat64 *) = dlsym(RTLD_DEFAULT, "__xstat64"); + struct stat64 st; + int r = old ? old(0, a, &st) : -2; + printf("%d %d\n", r, r ? errno : 0); + i++; + } + else if (!strcmp(op, "inode")) { + DIR *d = opendir(a); + struct dirent *e; + while (d && (e = readdir(d))) + if (!strcmp(e->d_name, argv[i + 2])) printf("%llu\n", (unsigned long long)e->d_ino); + if (d) closedir(d); + i += 2; + } + else if (!strcmp(op, "stats")) printf("%d\n", stats ? *stats : -1); else if (!strcmp(op, "accesses")) printf("%d\n", accesses ? *accesses : -1); else if (!strcmp(op, "opens")) printf("%d\n", opens ? *opens : -1); } @@ -675,6 +717,152 @@ class DirCachePreloadTest(unittest.TestCase): "access", s / "x.bundle", "accesses", "opens", between=churn) self.assertEqual([s.name, "a.bundle,b.bundle", s.name, "a.bundle,b.bundle", "-1 2", "0", "3"], out) + def test_absolute_paths_checked_against_a_descriptor_are_answered_from_the_listing(self): + s = self.staging + out = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "y.bundle", "accesses", + "accessat", s / "a.bundle", "accessat", s / "a.bundle", "accesses", + "create", s / "x.bundle", "accessat", s / "x.bundle") + self.assertEqual(["-1 2", "-1 2", "0", "0 0", "0 0", "1", "0 0"], out[1:]) + + def test_absolute_paths_checked_against_a_descriptor_elsewhere_reach_the_filesystem(self): + s = self.staging + other = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "x.bundle", "accesses", + program=self.other) + self.assertEqual(["-1 2", "-1 2", "2"], other[1:]) + off = self.run_program("list", s, "accessat", s / "x.bundle", "accessat", s / "x.bundle", "accesses", + env={"DD_NO_DIR_CACHE": "1", "DD_NO_PATH_CACHE": "1"}) + self.assertEqual(["-1 2", "-1 2", "2"], off[1:]) + + def test_missing_names_asked_through_the_old_stat_entry_are_answered_from_the_listing(self): + s = self.staging + out = self.run_program("list", s, "stats", "xstat", s / "x.bundle", "stats", "xstat", s / "a.bundle", "stats", + "create", s / "x.bundle", "xstat", s / "x.bundle") + self.assertEqual(["-1 2", out[1], "0 0", str(int(out[1]) + 1), "0 0"], out[2:]) + other = self.run_program("list", s, "stats", "xstat", s / "z.bundle", "stats", program=self.other) + self.assertEqual(["-1 2", str(int(other[1]) + 1)], other[2:]) + + def test_folders_that_differ_only_in_case_stay_cached_together(self): + s = self.staging + names = ["Content/Data", "content/data", "Content/Characters", "content/characters"] + for name in names: + (s / name).mkdir(parents=True) + checks = [op for name in names for op in ("access", s / name)] + out = self.run_program(*checks, "accesses", *checks, *checks, "accesses") + self.assertEqual(out[4], out[-1]) + + def test_a_cached_listing_is_served_without_asking_the_filesystem(self): + s = self.staging + out = self.run_program("list", s, "stats", "list", s, "list", s, "access", s / "x.bundle", "stats", "opens") + self.assertEqual(out[1], out[-2]) + self.assertEqual("1", out[-1]) + + def test_own_changes_in_a_cached_folder_do_not_ask_the_filesystem(self): + s = self.staging + out = self.run_program( + "list", s, "stats", + "create", s / "c.bundle", "rename", s / "c.bundle", s / "d.bundle", "unlink", s / "a.bundle", "stats", + "list", s, "raw", s, "opens") + self.assertEqual(out[1], out[2]) + self.assertEqual(["b.bundle,d.bundle", "b.bundle,d.bundle", "1"], out[3:]) + + def test_own_changes_in_a_folder_never_listed_do_not_ask_the_filesystem(self): + s = self.staging + out = self.run_program("stats", "create", s / "c.bundle", "rename", s / "c.bundle", s / "d.bundle", + "unlink", s / "d.bundle", "stats", "list", s, "raw", s) + self.assertEqual(out[0], out[1]) + self.assertEqual(["a.bundle,b.bundle", "a.bundle,b.bundle"], out[2:]) + + def test_a_differently_cased_folder_is_checked_once(self): + s = self.staging + upper = Path(str(s).replace("downloading", "DOWNLOADING")) + out = self.run_program("list", s, "access", upper / "x.bundle", "stats", + "access", upper / "y.bundle", "access", upper / "z.bundle", "stats", "accesses", + env={"FOLD": "all"}) + self.assertEqual(out[2], out[5]) + self.assertEqual("0", out[-1]) + + def test_a_folder_reached_through_a_link_follows_the_link(self): + s = self.staging + other = self.lib / "elsewhere" / s.name + other.mkdir(parents=True) + (other / "x.bundle").touch() + link = self.lib / "DOWNLOADING" + link.symlink_to("downloading") + + def repoint(): + link.unlink() + link.symlink_to("elsewhere") + + out = self.run_paused("list", s, "access", link / s.name / "x.bundle", "pause", + "access", link / s.name / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_linked_last_component_follows_the_link(self): + s = self.staging + other = self.lib / "elsewhere" / s.name + other.mkdir(parents=True) + (other / "x.bundle").touch() + twin = self.lib / "DOWNLOADING" + twin.mkdir() + link = twin / s.name + link.symlink_to(s) + + def repoint(): + link.unlink() + link.symlink_to(other) + + out = self.run_paused("list", s, "access", link / "x.bundle", "pause", + "access", link / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_folder_reached_through_a_parent_step_is_checked_each_time(self): + s = self.staging + other = self.lib / "elsewhere" + (other / "branch").mkdir(parents=True) + (other / s.parent.name / s.name).mkdir(parents=True) + (other / s.parent.name / s.name / "x.bundle").touch() + (self.lib / "branch").mkdir() + twin = self.lib / "BRANCH" + twin.mkdir() + listed = self.lib / "branch" / ".." / s.parent.name / s.name + through = twin / ".." / s.parent.name / s.name + + def repoint(): + twin.rmdir() + twin.symlink_to(other / "branch") + + out = self.run_paused("list", listed, "access", through / "x.bundle", "pause", + "access", through / "x.bundle", between=repoint, env={"FOLD": "all"}) + self.assertEqual(["-1 2", "0 0"], out[1:]) + + def test_a_permission_change_on_the_folder_or_above_it_is_noticed(self): + s = self.staging + for target in (s, s.parent): + with self.subTest(target=target.name): + out = self.run_paused("list", s, "opens", "pause", "list", s, "opens", + between=lambda: target.chmod(0o700)) + self.assertEqual(int(out[1]) + 1, int(out[3])) + + def test_a_permission_change_on_a_file_keeps_the_listing(self): + s = self.staging + out = self.run_paused("list", s, "opens", "pause", "list", s, "opens", + between=lambda: (s / "a.bundle").chmod(0o600)) + self.assertEqual(out[1], out[3]) + + def test_opening_an_existing_link_keeps_its_entry(self): + s = self.staging + (s / "l.bundle").symlink_to("a.bundle") + out = self.run_program("list", s, "create", s / "l.bundle", "inode", s, "l.bundle", "raw", s) + self.assertEqual(str((s / "l.bundle").lstat().st_ino), out[1]) + + def test_changes_made_around_the_cache_after_own_changes_are_noticed(self): + s = self.staging + out = self.run_program("list", s, "create", s / "c.bundle", "sneak", s / "y.bundle", "list", s, "raw", s, + "access", s / "y.bundle") + self.assertEqual(out[1], out[2]) + self.assertIn("y.bundle", out[1]) + self.assertEqual("0 0", out[3]) + def test_misses_outside_the_client_or_fuse_steamapps_reach_the_filesystem(self): s = self.staging other = self.run_program("list", s, "access", s / "x.bundle", "access", s / "y.bundle", "accesses", From c2adf3b3dda01b9c4994f5de785b0691cd54f5e8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 07:33:20 -0500 Subject: [PATCH 48/60] feat(performance): switch the GPU top clock hold from the in-game menu (#2882) --- .../com/droiddeck/launcher/SessionActivity.kt | 14 ++++++++++++ .../droiddeck/launcher/session/GpuClockPin.kt | 22 ++++++++++++++++++- .../launcher/ui/DroidDeckHudSettings.kt | 2 ++ .../launcher/ui/PerformanceDialog.kt | 20 +++++++++++------ .../droiddeck/launcher/ui/SessionOverlay.kt | 2 ++ .../droiddeck/launcher/ui/SettingsIndex.kt | 1 + app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-b+es+419/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - docs/settings-map.md | 1 + 40 files changed, 54 insertions(+), 41 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 52e9eeccee..3249d0b3c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -115,6 +115,7 @@ import com.droiddeck.launcher.hud.DroidDeckHudHost import com.droiddeck.launcher.session.PerfMode import com.droiddeck.launcher.session.SteamRepair import com.droiddeck.launcher.session.GameEnvironmentStore +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.GameProfileFollowState import com.droiddeck.launcher.session.GameProfileInventoryCache import com.droiddeck.launcher.session.GameProfileRefreshState @@ -553,6 +554,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var achievementsInFront by mutableStateOf(null) private var achievementsOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) + private var gpuClockPin by mutableStateOf(false) private var hudConfig by mutableStateOf>(emptyMap()) private var hudColor by mutableStateOf(SessionPrefs.HUD_COLOR_MINT) private var hudOpacity by mutableStateOf(SessionPrefs.HUD_OPACITY_DEFAULT) @@ -1407,6 +1409,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde androidApps = androidApps, hudOn = hudOn, hudConfig = hudConfig, + gpuClockPin = gpuClockPin, upscaler = upscaler, upscaleSharpness = upscaleSharpness, effects = effects, screenEffectsTarget = screenEffectsTarget, @@ -1464,6 +1467,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, + onGpuClockPin = { on -> + SessionPrefs.setGpuClockPin(this@SessionActivity, on) + gpuClockPin = on + Thread { + GpuClockPin.sync(applicationContext) + runOnUiThread { gpuClockPin = gpuClockHeld() } + }.start() + }, onHudSetting = { key, value -> hudConfig = DroidDeckHudConfig.set(this@SessionActivity, key, value); hud.applyConfig() }, onHudOrder = { switches, order -> hudConfig = DroidDeckHudConfig.choose(this@SessionActivity, switches, order); hud.applyConfig() }, onHudReset = { hudConfig = DroidDeckHudConfig.reset(this@SessionActivity); hud.applyConfig() }, @@ -2471,6 +2482,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde .show() } + private fun gpuClockHeld() = SessionPrefs.gpuClockPin(this) && !GpuClockPin.failed + private fun readPrefs() { pipAutoEnter = SessionPrefs.pipAutoEnter(this) unfoldedControls = SessionPrefs.unfoldedControls(this) @@ -2478,6 +2491,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde picturePosition = SessionPrefs.picturePosition(this) integerScaling = SessionPrefs.integerScaling(this) hudOn = SessionPrefs.hudEnabled(this) + gpuClockPin = gpuClockHeld() blackFrameInsertion = SessionPrefs.blackFrameInsertion(this) hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt index 40135f08de..e136df2604 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -14,10 +14,22 @@ object GpuClockPin { @Volatile private var pinned = false - private val supported: Boolean by lazy { File(KGSL_NODE).exists() } + @Volatile + var failed = false + private set + + val supported: Boolean by lazy { File(KGSL_NODE).exists() } + + private var live = false @Synchronized fun start(context: Context): String { + live = true + return hold(context) + } + + private fun hold(context: Context): String { + failed = false if (!SessionPrefs.gpuClockPin(context)) return "gpu clock: governed" if (!supported) return "gpu clock: no $KGSL_NODE, left governed" return try { @@ -28,12 +40,20 @@ object GpuClockPin { } catch (t: Throwable) { File(context.filesDir, MARKER).delete() Log.w(TAG, "pin", t) + failed = true "gpu clock: pin failed" } } + @Synchronized + fun sync(context: Context) { + if (!live) return + if (SessionPrefs.gpuClockPin(context)) hold(context) else if (pinned) clear(context) + } + @Synchronized fun stop(context: Context) { + live = false if (pinned) clear(context) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index cb5d4795f8..5e86cf489e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -14,6 +14,7 @@ import androidx.compose.ui.unit.sp import com.droiddeck.launcher.R import com.droiddeck.launcher.hud.DroidDeckHudConfig import com.droiddeck.launcher.hud.DroidDeckHudSize +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.session.StripMetric @@ -47,6 +48,7 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri ToggleRow(host, "hud-snap", stringResource(R.string.hud_snap), stringResource(R.string.hud_snap_hint), on("hudSnap"), chipModifier = track("hud-snap")) { a.onHudSetting("hudSnap", flag(it)) } } + if (GpuClockPin.supported) GpuClockGroup(host, a.gpuClockPin, track("gpuclock"), a.onGpuClockPin) if (a.dashboardAvailable && a.secondScreenDisplays.isNotEmpty()) BottomStripSettings(host, track) if (!a.hudOn) return diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 3c4db68c32..0c3947f986 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -24,6 +24,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.session.GpuClockPin import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) @@ -122,13 +123,7 @@ fun PerformancePage( gamescopeRealtime, onChange = onGamescopeRealtime, ) } - SettingsGroup(stringResource(R.string.perf_gpu)) { - ToggleRow( - host, "gpuclock", stringResource(R.string.perf_gpuclock), - stringResource(R.string.perf_gpuclock_hint), - gpuClockPin, onChange = onGpuClockPin, - ) - } + if (GpuClockPin.supported) GpuClockGroup(host, gpuClockPin, onChange = onGpuClockPin) SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), @@ -220,3 +215,14 @@ fun PerformancePage( onBack = onDismiss, ) { body() } } + +@Composable +internal fun GpuClockGroup(host: MenuHost, on: Boolean, chipModifier: Modifier = Modifier, onChange: (Boolean) -> Unit) { + SettingsGroup(stringResource(R.string.perf_gpu)) { + ToggleRow( + host, "gpuclock", stringResource(R.string.perf_gpuclock), + null, + on, chipModifier = chipModifier, onChange = onChange, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index cd1c3cd9c3..49bf448925 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -218,6 +218,7 @@ class DrawerActions( val androidApps: List, val hudOn: Boolean, val hudConfig: Map = emptyMap(), + val gpuClockPin: Boolean = false, val frameGen: FrameGen.Mode, val frameGenTargetGameId: String? = null, val frameGenTargetGameName: String? = null, @@ -269,6 +270,7 @@ class DrawerActions( val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, val onHudSetting: (String, String) -> Unit = { _, _ -> }, + val onGpuClockPin: (Boolean) -> Unit = {}, val onHudOrder: (Map, List) -> Unit = { _, _ -> }, val onHudOrderReset: () -> Unit = {}, val onHudReset: () -> Unit = {}, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt index 8e3912e433..135cd79a63 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsIndex.kt @@ -126,6 +126,7 @@ internal object SettingsIndex { d(R.string.drawer_page_display, R.string.frame_gen_title, "lsfg", "lossless", "fps"), d(R.string.drawer_page_display, R.string.display_filter, "upscale", "fsr", "sharpness"), d(R.string.drawer_hud, R.string.drawer_hud, "fps", "counter", "overlay", "performance"), + d(R.string.drawer_hud, R.string.perf_gpuclock, "gpu", "clock", "max"), d(R.string.drawer_page_controller, R.string.input_touchscreen, "touch", "mouse", "direct", "touchpad", "click"), d(R.string.drawer_page_controller, R.string.mode_osc, "on-screen", "controls", "touch controls", "buttons"), d(R.string.drawer_page_controller, R.string.osc_steam_layout, "touch layout", "edit layout", "on-screen"), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2e20f14e1f..e8a743233a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -636,7 +636,6 @@ GPU إيقاف تثبيت GPU على أعلى تردد له - لـ Adreno فقط. تقطّع أقل، مع استهلاك أكبر للبطارية والحرارة. إصلاحات الجلسة Turnip: التصيير عبر sysmem ينطبق على عميل Steam والألعاب. مطلوب على Adreno 710/720/722. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 80faccb1cf..5547024fe0 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -630,7 +630,6 @@ GPU Desactivado Mantener la GPU a su reloj máximo - Solo Adreno. Menos microcortes, más consumo de batería y calor. Correcciones de sesión Turnip: renderizado sysmem Se aplica al cliente de Steam y a los juegos. Obligatorio en Adreno 710/720/722. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0a333b7f85..bc7259808d 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -628,7 +628,6 @@ GPU Изкл. Задръжте GPU на максималната му честота - Само за Adreno. По-малко засечки, по-голямо използване на батерията и повече топлина. Корекции на сесията Turnip: рендиране sysmem Прилага се за клиента на Steam и игрите. Изисква се при Adreno 710/720/722. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 014b812692..8b846d2a9b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -632,7 +632,6 @@ GPU Vypnuto Udržet GPU na nejvyšších taktech - Jen Adreno. Méně zadrhávání, více spotřeby baterie a tepla. Opravy relace Turnip: vykreslování sysmem Platí pro klienta Steam i hry. Vyžadováno na Adreno 710/720/722. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 1e4231ae09..ab9d45679e 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -628,7 +628,6 @@ GPU Fra Hold GPU’en på dens højeste clock - Kun Adreno. Færre hak, mere batteribrug og varme. Sessionsrettelser Turnip: sysmem-rendering Gælder Steam-klienten og spil. Påkrævet på Adreno 710/720/722. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1d4bde9bf7..1337f8aa11 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -628,7 +628,6 @@ GPU Aus GPU auf höchstem Takt halten - Nur Adreno. Weniger Ruckler, mehr Akkuverbrauch und Wärme. Sitzungskorrekturen Turnip: Sysmem-Rendering Gilt für den Steam-Client und Spiele. Erforderlich bei Adreno 710/720/722. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c50b3adcf1..3b548067f4 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -628,7 +628,6 @@ GPU Ανενεργό Διατήρηση της GPU στη μέγιστη συχνότητά της - Μόνο Adreno. Λιγότερα κολλήματα, μεγαλύτερη χρήση μπαταρίας και θερμότητα. Διορθώσεις συνεδρίας Turnip: απόδοση sysmem Ισχύει για το πρόγραμμα-πελάτη Steam και τα παιχνίδια. Απαιτείται σε Adreno 710/720/722. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd28c243b6..126aa3b53c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -630,7 +630,6 @@ GPU Desactivado Mantener la GPU a su reloj máximo - Solo Adreno. Menos tirones, más consumo de batería y calor. Correcciones de sesión Turnip: renderizado sysmem Se aplica al cliente de Steam y a los juegos. Obligatorio en Adreno 710/720/722. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 042345d84a..1fd9682566 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -628,7 +628,6 @@ GPU Pois Pidä GPU huippukellotaajuudessaan - Vain Adreno. Vähemmän nykäyksiä, enemmän akun kulutusta ja lämpöä. Istunnon korjaukset Turnip: sysmem-renderöinti Koskee Steam-asiakasohjelmaa ja pelejä. Pakollinen Adreno 710/720/722:lla. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b11a5a6741..575309564d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -630,7 +630,6 @@ GPU Désactivé Maintenir le GPU à sa fréquence maximale - Uniquement pour Adreno. Moins de saccades, mais plus de consommation d\'énergie et de chaleur. Correctifs de session Turnip : rendu sysmem S’applique au client Steam et aux jeux. Requis sur Adreno 710/720/722. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0e9ad3ed44..17d5e5cd6a 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -628,7 +628,6 @@ GPU बंद GPU को उसकी टॉप क्लॉक पर बनाए रखें - सिर्फ़ Adreno के लिए। कम हिचकोले, लेकिन ज़्यादा बैटरी खर्च और गर्मी। सेशन फ़िक्स Turnip: sysmem रेंडरिंग Steam क्लाइंट और गेम पर लागू। Adreno 710/720/722 पर ज़रूरी। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f8b6fbc273..86f9cb5ce2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -628,7 +628,6 @@ GPU Ki A GPU legmagasabb órajelen tartása - Csak Adreno. Kevesebb akadás, nagyobb akkumulátorhasználat és hőtermelés. Munkamenet-javítások Turnip: sysmem renderelés A Steam kliensre és a játékokra vonatkozik. Adreno 710/720/722-n szükséges. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d85a73b7c4..5b149f981d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -626,7 +626,6 @@ GPU Nonaktif Pertahankan GPU pada clock tertingginya - Hanya Adreno. Lebih sedikit tersendat, lebih banyak penggunaan baterai dan panas. Perbaikan sesi Turnip: rendering sysmem Berlaku untuk klien Steam dan gim. Diperlukan pada Adreno 710/720/722. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 207e3a5756..d45d12ebc5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -630,7 +630,6 @@ GPU Disattivo Mantieni la GPU alla frequenza massima - Solo Adreno. Meno scatti, più consumo di batteria e più calore. Correzioni della sessione Turnip: rendering sysmem Si applica al client Steam e ai giochi. Necessario su Adreno 710/720/722. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0e0a721ead..f8f00afd16 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -626,7 +626,6 @@ GPU オフ GPUを最高クロックに保つ - Adrenoのみ。スタッターは減りますが、消費電力と発熱が増えます。 セッション修正 Turnip:sysmemレンダリング Steamクライアントとゲームに適用。Adreno 710/720/722では必須です。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 281827cb45..803c259ed5 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -626,7 +626,6 @@ GPU 끄기 GPU를 최고 클럭으로 유지 - Adreno에만 해당됩니다. 끊김이 줄어들지만 전력 소모와 발열이 증가합니다. 세션 수정 Turnip: sysmem 렌더링 Steam 클라이언트와 게임에 적용됩니다. Adreno 710/720/722에 필수입니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index a1b1f06c61..9e19ba1932 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -626,7 +626,6 @@ GPU Mati Kekalkan GPU pada kelajuan tertinggi - Adreno sahaja. Kurang tersekat-sekat, lebih penggunaan bateri dan haba. Pembetulan sesi Turnip: rendering sysmem Terpakai pada klien Steam dan permainan. Diperlukan pada Adreno 710/720/722. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 071642efc6..35fdb65500 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -628,7 +628,6 @@ GPU Av Hold GPU-en på toppfrekvens - Bare Adreno. Færre hikk, mer batteribruk og varme. Sesjonsfikser Turnip: sysmem-rendering Gjelder Steam-klienten og spill. Påkrevd på Adreno 710/720/722. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ca7a52268f..0bc195044d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -628,7 +628,6 @@ GPU Uit GPU op hoogste kloksnelheid houden - Alleen Adreno. Minder haperingen, meer batterijverbruik en warmte. Sessiefixes Turnip: sysmem-rendering Geldt voor de Steam-client en games. Vereist op Adreno 710/720/722. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 37feb93f86..cb1a3b6b72 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -632,7 +632,6 @@ GPU Wyłączony Utrzymuj GPU na najwyższym taktowaniu - Tylko Adreno. Mniej przycięć, większe zużycie baterii i więcej ciepła. Poprawki sesji Turnip: renderowanie sysmem Dotyczy klienta Steam i gier. Wymagane na Adreno 710/720/722. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index d9911b434e..a6001ca08b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -630,7 +630,6 @@ GPU Desativado Manter a GPU na frequência máxima - Apenas Adreno. Menos soluços, mais consumo de bateria e mais calor. Correções da sessão Turnip: renderização em sysmem Aplica-se ao cliente Steam e aos jogos. Obrigatório no Adreno 710/720/722. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4358d50e82..af3fece9af 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -630,7 +630,6 @@ GPU Desativado Manter a GPU no clock máximo - Só em Adreno. Menos engasgos, mais gasto de bateria e mais calor. Correções da sessão Turnip: renderização sysmem Aplica-se ao cliente Steam e aos jogos. Obrigatório nas Adreno 710/720/722. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1d3ded24e2..753853adc0 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -630,7 +630,6 @@ GPU Dezactivat Fixează GPU-ul la frecvența maximă - Doar Adreno. Mai puține întreruperi, consum mai mare de baterie și căldură. Remedieri de sesiune Turnip: randare sysmem Se aplică clientului Steam și jocurilor. Necesară pe Adreno 710/720/722. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2dbd904979..c47125f62f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -632,7 +632,6 @@ GPU Выкл. Поддерживать максимальную частоту GPU - Только для Adreno. Меньше подтормаживаний, но больше энергопотребления и нагрева. Исправления сессии Turnip: рендеринг sysmem Применяется к клиенту Steam и играм. Требуется на Adreno 710/720/722. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 697b794933..10f07aa95b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -628,7 +628,6 @@ GPU Av Håll GPU:n på dess högsta klockfrekvens - Bara Adreno. Färre hack, högre batteriförbrukning och mer värme. Sessionsfixar Turnip: sysmem-rendering Gäller Steam-klienten och spel. Krävs på Adreno 710/720/722. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index eb9201563f..0962358734 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -626,7 +626,6 @@ GPU ปิด ตรึง GPU ไว้ที่ความเร็วสัญญาณนาฬิกาสูงสุด - สำหรับ Adreno เท่านั้น สะดุดน้อยลง แต่ใช้แบตเตอรี่และเกิดความร้อนมากขึ้น การแก้ไขเซสชัน Turnip: การเรนเดอร์ sysmem ใช้กับไคลเอนต์ Steam และเกม จำเป็นสำหรับ Adreno 710/720/722 diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0bdf537643..93544e4b67 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -628,7 +628,6 @@ GPU Kapalı GPU\'yu en yüksek saat hızında tut - Yalnızca Adreno. Daha az takılma, daha fazla pil tüketimi ve ısınma. Oturum düzeltmeleri Turnip: sysmem işleme Steam istemcisi ve oyunlar için geçerlidir. Adreno 710/720/722\'de gereklidir. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a3ae01f71d..f33b299e17 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -632,7 +632,6 @@ GPU Вимк. Тримати GPU на максимальній частоті - Лише Adreno. Менше запинок, вища витрата заряду та нагрів. Виправлення сеансу Turnip: рендеринг через sysmem Застосовується до клієнта Steam та ігор. Потрібно для Adreno 710/720/722. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 67403a00d1..2b0435fef8 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -626,7 +626,6 @@ GPU Tắt Giữ GPU ở xung nhịp cao nhất - Chỉ dành cho Adreno. Ít giật hơn, dùng nhiều pin và nhiệt hơn. Các bản sửa phiên Turnip: render sysmem Áp dụng cho ứng dụng Steam và trò chơi. Bắt buộc trên Adreno 710/720/722. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2064b9df53..31d9a2ffed 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -626,7 +626,6 @@ GPU 关闭 把 GPU 锁定在最高频率 - 仅限 Adreno。卡顿更少,但更耗电、更发热。 会话修复 Turnip:sysmem 渲染 适用于 Steam 客户端和游戏。Adreno 710/720/722 必需。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index d1fd71fc10..b19a92cd34 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -626,7 +626,6 @@ GPU 關閉 讓 GPU 保持最高頻率 - 只限 Adreno。減少卡頓,但更耗電、更發熱。 會話修正 Turnip:sysmem 渲染 適用於 Steam 用戶端和遊戲。Adreno 710/720/722 必須開啟。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6c4037861c..5d6a885a63 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -626,7 +626,6 @@ GPU 關閉 讓 GPU 保持最高頻率 - 僅適用於 Adreno。卡頓更少,但耗電和發熱更多。 工作階段修復 Turnip:sysmem 渲染 適用於 Steam 用戶端和遊戲。Adreno 710/720/722 必需。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d61f0ad01b..36924a96c7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -656,7 +656,6 @@ GPU Off Hold the GPU at its top clock - Adreno only. Fewer hitches, more battery use and heat. Session fixes Turnip: sysmem rendering Applies to the Steam client and games. Required on Adreno 710/720/722. diff --git a/docs/settings-map.md b/docs/settings-map.md index 694717ff8b..cfbdf196de 100644 --- a/docs/settings-map.md +++ b/docs/settings-map.md @@ -75,6 +75,7 @@ Links of the form `droiddeck://settings/
` open a Settings section direc | Frame generation | In-game menu › Display | lsfg, lossless, fps | | Scaling filter | In-game menu › Display | upscale, fsr, sharpness | | Performance HUD | In-game menu › Performance HUD | fps, counter, overlay, performance | +| Hold the GPU at its top clock | In-game menu › Performance HUD | gpu, clock, max | | Touchscreen | In-game menu › Controller | touch, mouse, direct, touchpad, click | | On-screen controls | In-game menu › Controller | on-screen, controls, touch controls, buttons | | Steam touch layout | In-game menu › Controller | touch layout, edit layout, on-screen | From c4f4e18f871edea69bf8f5fa45878f45ce53a0e7 Mon Sep 17 00:00:00 2001 From: kingokksa <47888451+kingokksa@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:37:43 +0800 Subject: [PATCH 49/60] fix: the virtual pads reach non-Steam programs, where udev is resolved through dlsym (#1593) --- tools/linuxfs/preload/inputudev.c | 979 ++++++++++++++++++++++++-- tools/linuxfs/preload/robust.c | 8 +- tools/tests/test_inputudev_preload.py | 529 ++++++++++++++ 3 files changed, 1456 insertions(+), 60 deletions(-) create mode 100644 tools/tests/test_inputudev_preload.py diff --git a/tools/linuxfs/preload/inputudev.c b/tools/linuxfs/preload/inputudev.c index d33a0adaac..823614bfd3 100644 --- a/tools/linuxfs/preload/inputudev.c +++ b/tools/linuxfs/preload/inputudev.c @@ -4,15 +4,20 @@ #define _GNU_SOURCE #include +#include #include #include #include +#include +#include +#include #include #include #include #include #include #include +#include #define RING_MAX 4 #define UINPUT_BASE 16 @@ -29,17 +34,43 @@ "NAME=\"Xbox 360 Controller (%d)\"\n" \ "PHYS=\"usb-fakeinput/input%d\"\n" +#define PARENT_NAME "droiddeck-input" +#define PARENT_SYSPATH_FORMAT "/sys/devices/droiddeck%d/" PARENT_NAME "%d" +#define EVENT_SYSPATH_FORMAT PARENT_SYSPATH_FORMAT "/event%d" + struct pad { - char syspath[64]; + char syspath[80]; char devnode[32]; - char sysname[16]; + char sysname[24]; char uevent[256]; dev_t devnum; + int node; + int parent; + int live; }; static struct pad pads[PAD_MAX]; +static struct pad parents[PAD_MAX]; static int pad_count; static pthread_mutex_t virtual_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t enumerate_lock = PTHREAD_MUTEX_INITIALIZER; + +/* The event device's parent has to answer as a separate device so that its syspath differs from + * the child's: consumers compare parent syspaths to tell gamepads apart. */ +static void make_parent(int node, const struct pad *pad, struct pad *parent) { + snprintf(parent->syspath, sizeof(parent->syspath), PARENT_SYSPATH_FORMAT, node, node); + snprintf(parent->sysname, sizeof(parent->sysname), PARENT_NAME "%d", node); + parent->devnode[0] = '\0'; + memcpy(parent->uevent, pad->uevent, sizeof(parent->uevent)); + parent->devnum = makedev(0, 0); + parent->node = node; + parent->parent = 1; + parent->live = pad->live; +} + +static void sync_parent(int node) { + make_parent(node, &pads[node], &parents[node]); +} static void discover_pads(void) { const char *spec = getenv("FAKE_EVDEV_MEMFD_PATHS"); @@ -55,12 +86,15 @@ static void discover_pads(void) { if (pad->devnode[0] == '\0') { snprintf(pad->sysname, sizeof(pad->sysname), "event%ld", slot); - snprintf(pad->syspath, sizeof(pad->syspath), "/sys/devices/virtual/input/droiddeck%ld", - slot); + snprintf(pad->syspath, sizeof(pad->syspath), EVENT_SYSPATH_FORMAT, (int)slot, (int)slot, + (int)slot); snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%ld", slot); snprintf(pad->uevent, sizeof(pad->uevent), PAD_UEVENT_FORMAT, (int)slot, (int)slot); pad->devnum = makedev(13, EVENT_MINOR_BASE + (unsigned int)slot); + pad->node = (int)slot; + pad->live = 1; if (slot >= pad_count) pad_count = (int)slot + 1; + sync_parent((int)slot); } } entry = strchr(entry, ';'); @@ -103,70 +137,304 @@ static int any_virtual_pad(void) { return 0; } -static void refresh_pad(int node) { - struct pad *pad; +static void refresh_locked(int node) { + struct pad *pad = &pads[node]; - if (node < 0 || node >= PAD_MAX) return; - pad = &pads[node]; - pthread_mutex_lock(&virtual_lock); if (node >= UINPUT_BASE) { char uevent[sizeof(pad->uevent)]; if (read_virtual_uevent(node, uevent, sizeof(uevent))) { snprintf(pad->sysname, sizeof(pad->sysname), "event%d", node); - snprintf(pad->syspath, sizeof(pad->syspath), "/sys/devices/virtual/input/droiddeck%d", node); + snprintf(pad->syspath, sizeof(pad->syspath), EVENT_SYSPATH_FORMAT, node, node, node); memcpy(pad->uevent, uevent, sizeof(uevent)); pad->devnum = makedev(13, EVENT_MINOR_BASE + (unsigned int)node); snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%d", node); + pad->node = node; + pad->live = 1; if (node >= pad_count) pad_count = node + 1; } else { pad->devnode[0] = '\0'; + pad->live = 0; + } + } else if (pad->sysname[0] != '\0') { + char path[PATH_MAX]; + const char *dir = getenv("FAKE_EVDEV_DIR"); + + if (dir == NULL || snprintf(path, sizeof(path), "%s/event%d", dir, node) >= (int)sizeof(path) || + access(path, F_OK) != 0) { + pad->devnode[0] = '\0'; + pad->live = 0; + } else { + snprintf(pad->devnode, sizeof(pad->devnode), "/dev/input/event%d", node); + pad->live = 1; + if (uinput_enabled()) + snprintf(pad->uevent, sizeof(pad->uevent), + any_virtual_pad() ? PAD_PHYSICAL_UEVENT_FORMAT : PAD_UEVENT_FORMAT, node, node); } - } else if (pad->devnode[0] != '\0' && uinput_enabled()) { - snprintf(pad->uevent, sizeof(pad->uevent), - any_virtual_pad() ? PAD_PHYSICAL_UEVENT_FORMAT : PAD_UEVENT_FORMAT, node, node); } - pthread_mutex_unlock(&virtual_lock); + sync_parent(node); } -static struct pad *pad_for_syspath(const char *syspath) { +static int snapshot_pad(int node, int parent, struct pad *out) { + int found; + + if (node < 0 || node >= PAD_MAX) return 0; + ensure_pads(); + pthread_mutex_lock(&virtual_lock); + refresh_locked(node); + found = parent ? parents[node].live : pads[node].devnode[0] != '\0'; + if (found) *out = parent ? parents[node] : pads[node]; + pthread_mutex_unlock(&virtual_lock); + return found; +} + +static int parse_number(const char **cursor) { + int value = 0; + + if (**cursor < '0' || **cursor > '9') return -1; + while (**cursor >= '0' && **cursor <= '9') { + if (value < PAD_MAX) value = value * 10 + (*(*cursor) - '0'); + (*cursor)++; + } + return value; +} + +static int match_numbered(const char **cursor, const char *literal, int node) { + char expected[32]; + int length = snprintf(expected, sizeof(expected), "%s%d", literal, node); + + if (strncmp(*cursor, expected, (size_t)length) != 0) return 0; + *cursor += length; + return 1; +} + +/* Returns the pad node behind one of our syspaths, -1 for anything else. */ +static int node_from_syspath(const char *syspath, int *child) { + static const char virtual_prefix[] = "/sys/devices/virtual/input/droiddeck"; + static const char child_prefix[] = "/sys/devices/droiddeck"; + const char *cursor; + int node; + + if (syspath == NULL) return -1; + if (strncmp(syspath, virtual_prefix, sizeof(virtual_prefix) - 1) == 0) { + cursor = syspath + sizeof(virtual_prefix) - 1; + *child = 0; + } else if (strncmp(syspath, child_prefix, sizeof(child_prefix) - 1) == 0) { + cursor = syspath + sizeof(child_prefix) - 1; + *child = 1; + } else { + return -1; + } + node = parse_number(&cursor); + if (node < 0 || node >= PAD_MAX) return -1; + if (!*child) { + if (*cursor == '\0') return node; + return match_numbered(&cursor, "/event", node) && *cursor == '\0' ? node : -1; + } + if (!match_numbered(&cursor, "/" PARENT_NAME, node)) return -1; + if (*cursor == '\0') return node; + if (!match_numbered(&cursor, "/event", node) || *cursor != '\0') return -1; + *child = 0; + return node; +} + +static int syspath_pad(const char *syspath, struct pad *out) { + int child = 0; + int node = node_from_syspath(syspath, &child); + + return node >= 0 && snapshot_pad(node, child, out); +} + +static int sysname_pad(const char *sysname, struct pad *out) { + static const char parent_name[] = PARENT_NAME; + const char *cursor; + int parent; + int node; + + if (strncmp(sysname, "event", 5) == 0) { + cursor = sysname + 5; + parent = 0; + } else if (strncmp(sysname, parent_name, sizeof(parent_name) - 1) == 0) { + cursor = sysname + sizeof(parent_name) - 1; + parent = 1; + } else { + return 0; + } + node = parse_number(&cursor); + return node >= 0 && *cursor == '\0' && snapshot_pad(node, parent, out); +} + +/* Each construction hands out its own handle bound to the context that built it, so one consumer + * releasing its libudev context can never leave another consumer's device with a dangling one. */ +#define HANDLE_MAX 256 + +static const char *const property_keys[] = {"DEVNAME", "DEVPATH", "ID_INPUT", "ID_INPUT_JOYSTICK"}; + +#define PROPERTY_COUNT (sizeof(property_keys) / sizeof(property_keys[0])) + +struct handle { + struct pad info; + void *udev; + struct handle *parent; + int refs; + char properties[PROPERTY_COUNT]; +}; + +static struct handle handles[HANDLE_MAX]; +static pthread_mutex_t handle_lock = PTHREAD_MUTEX_INITIALIZER; + +static struct handle *live_handle(void *device) { + uintptr_t offset = (uintptr_t)device - (uintptr_t)handles; + struct handle *handle; + + if (offset >= sizeof(handles) || offset % sizeof(handles[0]) != 0) return NULL; + handle = &handles[offset / sizeof(handles[0])]; + return handle->refs > 0 ? handle : NULL; +} + +static struct handle *claim_slot(const struct pad *info, void *udev) { int i; - if (syspath == NULL) return NULL; - ensure_pads(); - for (i = 0; i < pad_count; i++) { - if (pads[i].devnode[0] != '\0' && strcmp(pads[i].syspath, syspath) == 0) return &pads[i]; + for (i = 0; i < HANDLE_MAX; i++) { + if (handles[i].refs == 0) { + handles[i].refs = 1; + handles[i].info = *info; + handles[i].udev = udev; + handles[i].parent = NULL; + return &handles[i]; + } } return NULL; } -static struct pad *pad_for_device(void *device) { - int i; +static void *claim_handle(const struct pad *info, void *udev) { + struct handle *handle; + + pthread_mutex_lock(&handle_lock); + handle = claim_slot(info, udev); + pthread_mutex_unlock(&handle_lock); + return handle; +} + +static int retain_handle(void *device) { + struct handle *handle; + + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + if (handle != NULL) handle->refs++; + pthread_mutex_unlock(&handle_lock); + return handle != NULL; +} + +static int release_handle(void *device) { + struct handle *handle; + int found; + + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + found = handle != NULL; + while (handle != NULL && --handle->refs == 0) { + struct handle *parent = handle->parent; + + handle->parent = NULL; + handle = parent; + } + pthread_mutex_unlock(&handle_lock); + return found; +} + +static struct handle *device_handle(void *device) { + struct handle *handle; if (device == NULL) return NULL; - ensure_pads(); - for (i = 0; i < pad_count; i++) { - if (&pads[i] == device) return pads[i].devnode[0] != '\0' ? &pads[i] : NULL; + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + pthread_mutex_unlock(&handle_lock); + return handle; +} + +static struct pad *device_pad(void *device) { + struct handle *handle = device_handle(device); + + return handle != NULL ? &handle->info : NULL; +} + +/* The parent belongs to the child that handed it out and goes away with it, as in libudev. */ +static void *parent_device(void *device, struct pad *pad) { + struct handle *handle; + struct handle *parent = NULL; + struct pad info; + + if (pad->parent) return NULL; + make_parent(pad->node, pad, &info); + pthread_mutex_lock(&handle_lock); + handle = live_handle(device); + if (handle != NULL) { + if (handle->parent == NULL) handle->parent = claim_slot(&info, handle->udev); + parent = handle->parent; } + pthread_mutex_unlock(&handle_lock); + return parent; +} + +static const char *pad_property(const struct pad *pad, const char *key) { + if (key == NULL) return NULL; + if (strcmp(key, "ID_INPUT") == 0 || strcmp(key, "ID_INPUT_JOYSTICK") == 0) return "1"; + if (strcmp(key, "DEVNAME") == 0) return !pad->parent && pad->devnode[0] != '\0' ? pad->devnode : NULL; + if (strcmp(key, "DEVPATH") == 0) return pad->syspath + 4; return NULL; } -static struct pad *pad_for_syslink(const char *path) { +static struct handle *property_handle(void *entry, size_t *index) { + uintptr_t offset = (uintptr_t)entry - (uintptr_t)handles; + size_t within; + + if (offset >= sizeof(handles)) return NULL; + within = offset % sizeof(handles[0]); + if (within < offsetof(struct handle, properties) || + within >= offsetof(struct handle, properties) + PROPERTY_COUNT) + return NULL; + *index = within - offsetof(struct handle, properties); + return &handles[offset / sizeof(handles[0])]; +} + +static void *next_property(struct handle *handle, size_t from) { + size_t i; + + for (i = from; i < PROPERTY_COUNT; i++) + if (pad_property(&handle->info, property_keys[i]) != NULL) return &handle->properties[i]; + return NULL; +} + +static int syslink_pad(const char *path, struct pad *out) { static const char prefix[] = "/sys/class/input/"; - const char *name; - int i; - if (path == NULL || strncmp(path, prefix, sizeof(prefix) - 1) != 0) return NULL; - name = path + sizeof(prefix) - 1; - ensure_pads(); - if (strncmp(name, "event", 5) == 0 && name[5] >= '0' && name[5] <= '9') refresh_pad(atoi(name + 5)); - for (i = 0; i < pad_count; i++) { - if (pads[i].devnode[0] != '\0' && strcmp(pads[i].sysname, name) == 0) return &pads[i]; - } - return NULL; + if (path == NULL || strncmp(path, prefix, sizeof(prefix) - 1) != 0) return 0; + return sysname_pad(path + sizeof(prefix) - 1, out); } -static void *next_symbol(const char *name) { return dlsym(RTLD_NEXT, name); } +static void *real_dlsym(void); + +/* libudev is often opened with RTLD_LOCAL, which keeps it out of the global scope that RTLD_NEXT + * searches, so the handle the program opened is the only way back to the real implementation. */ +static _Atomic(void *) udev_handle; + +__attribute__((visibility("hidden"))) void bl_inputudev_note_dlopen(const char *path, void *handle) { + if (handle != NULL && path != NULL && strstr(path, "libudev") != NULL) + atomic_store_explicit(&udev_handle, handle, memory_order_release); +} + +static void *next_symbol(const char *name) { + void *(*forward)(void *, const char *) = real_dlsym(); + void *symbol; + + if (forward == NULL) return NULL; + if (strncmp(name, "udev_", 5) == 0) { + symbol = atomic_load_explicit(&udev_handle, memory_order_acquire); + if (symbol != NULL && (symbol = forward(symbol, name)) != NULL) return symbol; + } + return forward(RTLD_NEXT, name); +} char *dd_cached_realpath(const char *path, char *resolved, char *(*real)(const char *, char *)) __attribute__((visibility("hidden"))); @@ -194,12 +462,11 @@ __attribute__((visibility("hidden"))) int dd_winebus_rumble_ioctl(int (*real)(in char *realpath(const char *path, char *resolved) { static char *(*real_realpath)(const char *, char *); - void *caller = __builtin_return_address(0); - struct pad *pad = caller_is_winebus(caller) ? pad_for_syslink(path) : NULL; + struct pad pad; - if (pad != NULL) { - if (resolved == NULL) return strdup(pad->syspath); - memcpy(resolved, pad->syspath, strlen(pad->syspath) + 1); + if (syslink_pad(path, &pad)) { + if (resolved == NULL) return strdup(pad.syspath); + memcpy(resolved, pad.syspath, strlen(pad.syspath) + 1); return resolved; } if (real_realpath == NULL) real_realpath = next_symbol("realpath"); @@ -209,10 +476,9 @@ char *realpath(const char *path, char *resolved) { void *udev_device_new_from_syspath(void *udev, const char *syspath) { static void *(*real_new)(void *, const char *); - void *caller = __builtin_return_address(0); - struct pad *pad = caller_is_winebus(caller) ? pad_for_syspath(syspath) : NULL; + struct pad pad; - if (pad != NULL) return pad; + if (syspath_pad(syspath, &pad)) return claim_handle(&pad, udev); if (real_new == NULL) real_new = next_symbol("udev_device_new_from_syspath"); if (real_new == NULL) return NULL; return real_new(udev, syspath); @@ -221,7 +487,7 @@ void *udev_device_new_from_syspath(void *udev, const char *syspath) { void *udev_device_ref(void *device) { static void *(*real_ref)(void *); - if (pad_for_device(device) != NULL) return device; + if (retain_handle(device)) return device; if (real_ref == NULL) real_ref = next_symbol("udev_device_ref"); if (real_ref == NULL) return NULL; return real_ref(device); @@ -230,7 +496,7 @@ void *udev_device_ref(void *device) { void *udev_device_unref(void *device) { static void *(*real_unref)(void *); - if (pad_for_device(device) != NULL) return NULL; + if (release_handle(device)) return NULL; if (real_unref == NULL) real_unref = next_symbol("udev_device_unref"); if (real_unref == NULL) return NULL; return real_unref(device); @@ -238,9 +504,9 @@ void *udev_device_unref(void *device) { const char *udev_device_get_devnode(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); - if (pad != NULL) return pad->devnode; + if (pad != NULL) return pad->parent || pad->devnode[0] == '\0' ? NULL : pad->devnode; if (real_get == NULL) real_get = next_symbol("udev_device_get_devnode"); if (real_get == NULL) return NULL; return real_get(device); @@ -248,7 +514,7 @@ const char *udev_device_get_devnode(void *device) { const char *udev_device_get_syspath(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->syspath; if (real_get == NULL) real_get = next_symbol("udev_device_get_syspath"); @@ -256,9 +522,19 @@ const char *udev_device_get_syspath(void *device) { return real_get(device); } +const char *udev_device_get_devpath(void *device) { + static const char *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return pad->syspath + 4; + if (real_get == NULL) real_get = next_symbol("udev_device_get_devpath"); + if (real_get == NULL) return NULL; + return real_get(device); +} + const char *udev_device_get_sysname(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->sysname; if (real_get == NULL) real_get = next_symbol("udev_device_get_sysname"); @@ -266,9 +542,19 @@ const char *udev_device_get_sysname(void *device) { return real_get(device); } +const char *udev_device_get_sysnum(void *device) { + static const char *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return pad->sysname + strcspn(pad->sysname, "0123456789"); + if (real_get == NULL) real_get = next_symbol("udev_device_get_sysnum"); + if (real_get == NULL) return NULL; + return real_get(device); +} + const char *udev_device_get_subsystem(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return "input"; if (real_get == NULL) real_get = next_symbol("udev_device_get_subsystem"); @@ -278,7 +564,7 @@ const char *udev_device_get_subsystem(void *device) { const char *udev_device_get_devtype(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_devtype"); @@ -288,7 +574,7 @@ const char *udev_device_get_devtype(void *device) { const char *udev_device_get_action(void *device) { static const char *(*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_action"); @@ -298,7 +584,7 @@ const char *udev_device_get_action(void *device) { dev_t udev_device_get_devnum(void *device) { static dev_t (*real_get)(void *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return pad->devnum; if (real_get == NULL) real_get = next_symbol("udev_device_get_devnum"); @@ -306,13 +592,31 @@ dev_t udev_device_get_devnum(void *device) { return real_get(device); } +void *udev_device_get_udev(void *device) { + static void *(*real_get)(void *); + struct handle *handle = device_handle(device); + + if (handle != NULL) return handle->udev; + if (real_get == NULL) real_get = next_symbol("udev_device_get_udev"); + return real_get != NULL ? real_get(device) : NULL; +} + +int udev_device_get_is_initialized(void *device) { + static int (*real_get)(void *); + + if (device_pad(device) != NULL) return 1; + if (real_get == NULL) real_get = next_symbol("udev_device_get_is_initialized"); + return real_get != NULL ? real_get(device) : 0; +} + void *udev_device_get_parent_with_subsystem_devtype(void *device, const char *subsystem, const char *devtype) { static void *(*real_get)(void *, const char *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) { - if (subsystem != NULL && strcmp(subsystem, "input") == 0 && devtype == NULL) return pad; + if (subsystem != NULL && strcmp(subsystem, "input") == 0 && devtype == NULL) + return parent_device(device, pad); return NULL; } if (real_get == NULL) real_get = next_symbol("udev_device_get_parent_with_subsystem_devtype"); @@ -322,7 +626,7 @@ void *udev_device_get_parent_with_subsystem_devtype(void *device, const char *su const char *udev_device_get_sysattr_value(void *device, const char *attr) { static const char *(*real_get)(void *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); if (pad != NULL) return attr != NULL && strcmp(attr, "uevent") == 0 ? pad->uevent : NULL; if (real_get == NULL) real_get = next_symbol("udev_device_get_sysattr_value"); @@ -332,10 +636,567 @@ const char *udev_device_get_sysattr_value(void *device, const char *attr) { const char *udev_device_get_property_value(void *device, const char *key) { static const char *(*real_get)(void *, const char *); - struct pad *pad = pad_for_device(device); + struct pad *pad = device_pad(device); - if (pad != NULL) return key != NULL && strcmp(key, "ID_INPUT_JOYSTICK") == 0 ? "1" : NULL; + if (pad != NULL) return pad_property(pad, key); if (real_get == NULL) real_get = next_symbol("udev_device_get_property_value"); if (real_get == NULL) return NULL; return real_get(device, key); } + +void *udev_device_get_parent(void *device) { + static void *(*real_get)(void *); + struct pad *pad = device_pad(device); + + if (pad != NULL) return parent_device(device, pad); + if (real_get == NULL) real_get = next_symbol("udev_device_get_parent"); + return real_get != NULL ? real_get(device) : NULL; +} + +int udev_device_has_tag(void *device, const char *tag) { + static int (*real_has)(void *, const char *); + + if (device_pad(device) != NULL) return 0; + if (real_has == NULL) real_has = next_symbol("udev_device_has_tag"); + return real_has != NULL ? real_has(device, tag) : 0; +} + +void *udev_device_get_properties_list_entry(void *device) { + static void *(*real_get)(void *); + struct handle *handle = device_handle(device); + + if (handle != NULL) return next_property(handle, 0); + if (real_get == NULL) real_get = next_symbol("udev_device_get_properties_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_get_tags_list_entry(void *device) { + static void *(*real_get)(void *); + + if (device_pad(device) != NULL) return NULL; + if (real_get == NULL) real_get = next_symbol("udev_device_get_tags_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_get_sysattr_list_entry(void *device) { + static void *(*real_get)(void *); + + if (device_pad(device) != NULL) return NULL; + if (real_get == NULL) real_get = next_symbol("udev_device_get_sysattr_list_entry"); + return real_get != NULL ? real_get(device) : NULL; +} + +void *udev_device_new_from_devnum(void *udev, char type, dev_t devnum) { + static void *(*real_new)(void *, char, dev_t); + struct pad pad; + int node; + + for (node = 0; node < PAD_MAX; node++) + if (snapshot_pad(node, 0, &pad) && pad.devnum == devnum) return claim_handle(&pad, udev); + if (real_new == NULL) real_new = next_symbol("udev_device_new_from_devnum"); + return real_new != NULL ? real_new(udev, type, devnum) : NULL; +} + +void *udev_device_new_from_subsystem_sysname(void *udev, const char *subsystem, const char *sysname) { + static void *(*real_new)(void *, const char *, const char *); + struct pad pad; + + if (subsystem != NULL && sysname != NULL && strcmp(subsystem, "input") == 0 && sysname_pad(sysname, &pad)) + return claim_handle(&pad, udev); + if (real_new == NULL) real_new = next_symbol("udev_device_new_from_subsystem_sysname"); + return real_new != NULL ? real_new(udev, subsystem, sysname) : NULL; +} + +#define ENTRY_MAX (PAD_MAX * 2) + +struct enumerate { + struct enumerate *next; + void *real; + void *real_head; + int matched; + int filtered; + int parent_node; + int real_parent; + int real_listed; + int scanned; + int refs; + char names[ENTRY_MAX][sizeof(pads[0].syspath)]; +}; + +static struct enumerate *enumerates; + +static struct enumerate *entry_state(void *entry, int *slot) { + struct enumerate *state; + + pthread_mutex_lock(&enumerate_lock); + for (state = enumerates; state != NULL; state = state->next) { + uintptr_t offset = (uintptr_t)entry - (uintptr_t)state->names; + + if (offset < sizeof(state->names) && offset % sizeof(state->names[0]) == 0) { + *slot = (int)(offset / sizeof(state->names[0])); + break; + } + } + pthread_mutex_unlock(&enumerate_lock); + return state; +} + +static struct enumerate *enumerate_state(void *enumerate) { + struct enumerate *state; + + pthread_mutex_lock(&enumerate_lock); + for (state = enumerates; state != NULL && state->real != enumerate; state = state->next) { + } + pthread_mutex_unlock(&enumerate_lock); + return state; +} + +void *udev_enumerate_new(void *udev) { + static void *(*real_new)(void *); + void *enumerate; + struct enumerate *state; + + if (real_new == NULL) real_new = next_symbol("udev_enumerate_new"); + if (real_new == NULL) return NULL; + enumerate = real_new(udev); + if (enumerate == NULL) return NULL; + state = calloc(1, sizeof(*state)); + if (state == NULL) return enumerate; + state->real = enumerate; + state->parent_node = -1; + state->refs = 1; + pthread_mutex_lock(&enumerate_lock); + state->next = enumerates; + enumerates = state; + pthread_mutex_unlock(&enumerate_lock); + return enumerate; +} + +void *udev_enumerate_ref(void *enumerate) { + static void *(*real_ref)(void *); + struct enumerate *state = enumerate_state(enumerate); + + if (state != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->refs++; + pthread_mutex_unlock(&enumerate_lock); + } + if (real_ref == NULL) real_ref = next_symbol("udev_enumerate_ref"); + return real_ref != NULL ? real_ref(enumerate) : enumerate; +} + +void *udev_enumerate_unref(void *enumerate) { + static void *(*real_unref)(void *); + struct enumerate *state = enumerate_state(enumerate); + + if (state != NULL) { + pthread_mutex_lock(&enumerate_lock); + if (--state->refs <= 0) { + struct enumerate **link; + + for (link = &enumerates; *link != NULL && *link != state; link = &(*link)->next) { + } + if (*link != NULL) *link = state->next; + } else { + state = NULL; + } + pthread_mutex_unlock(&enumerate_lock); + free(state); + } + if (real_unref == NULL) real_unref = next_symbol("udev_enumerate_unref"); + return real_unref != NULL ? real_unref(enumerate) : NULL; +} + +int udev_enumerate_add_match_subsystem(void *enumerate, const char *subsystem) { + static int (*real_add)(void *, const char *); + struct enumerate *state = enumerate_state(enumerate); + int rc; + + if (real_add == NULL) real_add = next_symbol("udev_enumerate_add_match_subsystem"); + rc = real_add != NULL ? real_add(enumerate, subsystem) : 0; + if (rc == 0 && state != NULL && subsystem != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->filtered = 1; + state->matched = state->matched || strcmp(subsystem, "input") == 0; + pthread_mutex_unlock(&enumerate_lock); + } + return rc; +} + +int udev_enumerate_add_match_parent(void *enumerate, void *parent) { + static int (*real_add)(void *, void *); + struct enumerate *state = enumerate_state(enumerate); + struct pad *pad = device_pad(parent); + int rc; + + if (pad != NULL) { + if (state == NULL) return -EINVAL; + pthread_mutex_lock(&enumerate_lock); + state->parent_node = pad->node; + state->real_parent = 0; + pthread_mutex_unlock(&enumerate_lock); + return 0; + } + if (real_add == NULL) real_add = next_symbol("udev_enumerate_add_match_parent"); + rc = real_add != NULL ? real_add(enumerate, parent) : -ENOSYS; + if (rc == 0 && state != NULL) { + pthread_mutex_lock(&enumerate_lock); + state->parent_node = -1; + state->real_parent = 1; + pthread_mutex_unlock(&enumerate_lock); + } + return rc; +} + +static void *real_get_list_entry(void *enumerate) { + static void *(*real_get)(void *); + + if (real_get == NULL) real_get = next_symbol("udev_enumerate_get_list_entry"); + return real_get != NULL ? real_get(enumerate) : NULL; +} + +int udev_enumerate_scan_devices(void *enumerate) { + static int (*real_scan)(void *); + struct enumerate *state = enumerate_state(enumerate); + char names[ENTRY_MAX][sizeof(pads[0].syspath)]; + int include; + int parent_node; + int added = 0; + int node; + int rc; + + if (real_scan == NULL) real_scan = next_symbol("udev_enumerate_scan_devices"); + rc = real_scan != NULL ? real_scan(enumerate) : -1; + if (state == NULL) return rc; + pthread_mutex_lock(&enumerate_lock); + parent_node = state->parent_node; + include = !state->real_parent && (state->filtered ? state->matched : parent_node >= 0); + pthread_mutex_unlock(&enumerate_lock); + for (node = 0; node < PAD_MAX; node++) { + struct pad pad; + + names[2 * node][0] = '\0'; + names[2 * node + 1][0] = '\0'; + if (!include || (parent_node >= 0 && parent_node != node)) continue; + if (parent_node >= 0 && snapshot_pad(node, 1, &pad)) { + memcpy(names[2 * node], pad.syspath, sizeof(names[0])); + added++; + } + if (snapshot_pad(node, 0, &pad)) { + memcpy(names[2 * node + 1], pad.syspath, sizeof(names[0])); + added++; + } + } + pthread_mutex_lock(&enumerate_lock); + memcpy(state->names, names, sizeof(names)); + state->scanned = 1; + state->real_listed = rc == 0 && parent_node < 0; + state->real_head = NULL; + pthread_mutex_unlock(&enumerate_lock); + /* Both browsers abandon the enumeration when the scan reports an error, and the real scan always + fails here because Android hides /sys/class from readdir. */ + if (added > 0 && rc < 0) rc = 0; + return rc; +} + +static void *next_pad_entry(struct enumerate *state, int from) { + void *entry; + int slot; + + pthread_mutex_lock(&enumerate_lock); + for (slot = from; slot < ENTRY_MAX && state->names[slot][0] == '\0'; slot++) { + } + entry = slot < ENTRY_MAX ? (void *)state->names[slot] : state->real_head; + pthread_mutex_unlock(&enumerate_lock); + return entry; +} + +void *udev_enumerate_get_list_entry(void *enumerate) { + struct enumerate *state = enumerate_state(enumerate); + void *head = NULL; + int own; + int real_listed; + + if (state == NULL) return real_get_list_entry(enumerate); + pthread_mutex_lock(&enumerate_lock); + own = state->scanned && (state->matched || state->parent_node >= 0); + real_listed = state->real_listed; + pthread_mutex_unlock(&enumerate_lock); + if (!own) return real_get_list_entry(enumerate); + if (real_listed) head = real_get_list_entry(enumerate); + pthread_mutex_lock(&enumerate_lock); + state->real_head = head; + pthread_mutex_unlock(&enumerate_lock); + return next_pad_entry(state, 0); +} + +void *udev_list_entry_get_next(void *entry) { + static void *(*real_get)(void *); + struct enumerate *state; + struct handle *handle; + size_t index; + int slot; + + if ((state = entry_state(entry, &slot)) != NULL) return next_pad_entry(state, slot + 1); + if ((handle = property_handle(entry, &index)) != NULL) return next_property(handle, index + 1); + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_next"); + return real_get != NULL ? real_get(entry) : NULL; +} + +void *udev_list_entry_get_by_name(void *entry, const char *name) { + static void *(*real_get)(void *, const char *); + struct enumerate *state; + struct handle *handle; + size_t index; + int slot; + + if ((state = entry_state(entry, &slot)) != NULL) { + if (name == NULL) return NULL; + pthread_mutex_lock(&enumerate_lock); + for (slot = 0; slot < ENTRY_MAX && (state->names[slot][0] == '\0' || strcmp(state->names[slot], name) != 0); + slot++) { + } + entry = slot < ENTRY_MAX ? (void *)state->names[slot] : state->real_head; + pthread_mutex_unlock(&enumerate_lock); + if (entry == NULL || slot < ENTRY_MAX) return entry; + } else if ((handle = property_handle(entry, &index)) != NULL) { + for (index = 0; index < PROPERTY_COUNT; index++) + if (name != NULL && strcmp(property_keys[index], name) == 0 && pad_property(&handle->info, name) != NULL) + return &handle->properties[index]; + return NULL; + } + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_by_name"); + return real_get != NULL ? real_get(entry, name) : NULL; +} + +const char *udev_list_entry_get_name(void *entry) { + static const char *(*real_get)(void *); + size_t index; + int slot; + + if (entry_state(entry, &slot) != NULL) return entry; + if (property_handle(entry, &index) != NULL) return property_keys[index]; + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_name"); + return real_get != NULL ? real_get(entry) : NULL; +} + +const char *udev_list_entry_get_value(void *entry) { + static const char *(*real_get)(void *); + struct handle *handle; + size_t index; + int slot; + + if (entry_state(entry, &slot) != NULL) return ""; + if ((handle = property_handle(entry, &index)) != NULL) return pad_property(&handle->info, property_keys[index]); + if (real_get == NULL) real_get = next_symbol("udev_list_entry_get_value"); + return real_get != NULL ? real_get(entry) : NULL; +} + +struct udev_symbol { + const char *name; + void *address; +}; + +static const struct udev_symbol udev_symbols[] = { + {"udev_device_new_from_syspath", (void *)udev_device_new_from_syspath}, + {"udev_device_new_from_devnum", (void *)udev_device_new_from_devnum}, + {"udev_device_new_from_subsystem_sysname", (void *)udev_device_new_from_subsystem_sysname}, + {"udev_device_ref", (void *)udev_device_ref}, + {"udev_device_unref", (void *)udev_device_unref}, + {"udev_device_get_devnode", (void *)udev_device_get_devnode}, + {"udev_device_get_syspath", (void *)udev_device_get_syspath}, + {"udev_device_get_devpath", (void *)udev_device_get_devpath}, + {"udev_device_get_sysname", (void *)udev_device_get_sysname}, + {"udev_device_get_sysnum", (void *)udev_device_get_sysnum}, + {"udev_device_get_subsystem", (void *)udev_device_get_subsystem}, + {"udev_device_get_devtype", (void *)udev_device_get_devtype}, + {"udev_device_get_action", (void *)udev_device_get_action}, + {"udev_device_get_devnum", (void *)udev_device_get_devnum}, + {"udev_device_get_sysattr_value", (void *)udev_device_get_sysattr_value}, + {"udev_device_get_property_value", (void *)udev_device_get_property_value}, + {"udev_device_get_parent_with_subsystem_devtype", + (void *)udev_device_get_parent_with_subsystem_devtype}, + {"udev_device_get_parent", (void *)udev_device_get_parent}, + {"udev_device_get_udev", (void *)udev_device_get_udev}, + {"udev_device_get_is_initialized", (void *)udev_device_get_is_initialized}, + {"udev_device_has_tag", (void *)udev_device_has_tag}, + {"udev_device_get_properties_list_entry", (void *)udev_device_get_properties_list_entry}, + {"udev_device_get_tags_list_entry", (void *)udev_device_get_tags_list_entry}, + {"udev_device_get_sysattr_list_entry", (void *)udev_device_get_sysattr_list_entry}, + {"udev_enumerate_new", (void *)udev_enumerate_new}, + {"udev_enumerate_ref", (void *)udev_enumerate_ref}, + {"udev_enumerate_unref", (void *)udev_enumerate_unref}, + {"udev_enumerate_add_match_subsystem", (void *)udev_enumerate_add_match_subsystem}, + {"udev_enumerate_add_match_parent", (void *)udev_enumerate_add_match_parent}, + {"udev_enumerate_scan_devices", (void *)udev_enumerate_scan_devices}, + {"udev_enumerate_get_list_entry", (void *)udev_enumerate_get_list_entry}, + {"udev_list_entry_get_next", (void *)udev_list_entry_get_next}, + {"udev_list_entry_get_by_name", (void *)udev_list_entry_get_by_name}, + {"udev_list_entry_get_name", (void *)udev_list_entry_get_name}, + {"udev_list_entry_get_value", (void *)udev_list_entry_get_value}, +}; + +static void *own_udev_symbol(const char *name) { + size_t i; + + for (i = 0; i < sizeof(udev_symbols) / sizeof(udev_symbols[0]); i++) + if (strcmp(udev_symbols[i].name, name) == 0) return udev_symbols[i].address; + return NULL; +} + +static void *dlvsym_any(const char *name) { + static const char *versions[] = {"GLIBC_2.17", "GLIBC_2.2.5", "GLIBC_2.0", "GLIBC_2.34"}; + size_t i; + void *resolved = NULL; + + for (i = 0; i < sizeof(versions) / sizeof(versions[0]) && resolved == NULL; i++) + resolved = dlvsym(RTLD_NEXT, name, versions[i]); + return resolved; +} + +/* A versioned lookup only ever finds libc, so the next dlsym in line is asked for by plain name to + * keep another preload's dlsym in the chain. */ +static void *real_dlsym(void) { + static void *resolved; + + if (resolved == NULL) { + void *(*libc)(void *, const char *) = dlvsym_any("dlsym"); + void *next = libc != NULL ? libc(RTLD_NEXT, "dlsym") : NULL; + + resolved = next != NULL ? next : (void *)libc; + } + return resolved; +} + +static int steam_runtime_path(const char *path) { + static const char *const runtimes[] = {"steamrtarm64", "steamrt64"}; + const char *name = strrchr(path, '/'); + size_t i; + + if (name == NULL || strcmp(name + 1, "steam") != 0) return 0; + for (i = 0; i < sizeof(runtimes) / sizeof(runtimes[0]); i++) { + size_t length = strlen(runtimes[i]); + + if ((size_t)(name - path) > length && name[-(ptrdiff_t)length - 1] == '/' && + memcmp(name - length, runtimes[i], length) == 0) + return 1; + } + return 0; +} + +/* The Steam client reads the pads straight from /dev/input and hands whatever the udev enumeration + * gives it back to the real libudev, which cannot read these synthetic devices. */ +static int steam_client_process(void) { + static _Atomic int cached = -1; + char path[PATH_MAX]; + ssize_t length; + int result = atomic_load_explicit(&cached, memory_order_acquire); + + if (result >= 0) return result; + result = 0; + length = readlink("/proc/self/exe", path, sizeof(path) - 1); + if (length > 0) { + path[length] = '\0'; + result = steam_runtime_path(path); + } + atomic_store_explicit(&cached, result, memory_order_release); + return result; +} + +static void *missing_dlsym(void *handle, const char *name) { + (void)handle; + (void)name; + return NULL; +} + +static void *own_dlsym(void *handle, const char *name) { + (void)handle; + return own_udev_symbol(name); +} + +/* Returns what dlsym jumps to. Anything outside the udev_ names has to reach the real dlsym without + * a single interposable call on the way, because other preloads resolve their own symbols from + * inside one-time initialisers that those calls would re-enter. */ +__attribute__((visibility("hidden"), used)) void *inputudev_dlsym_target(void *handle, const char *name) { + void *forward = real_dlsym(); + + (void)handle; + if (name != NULL && strncmp(name, "udev_", 5) == 0 && own_udev_symbol(name) != NULL && + !steam_client_process()) + return (void *)own_dlsym; + return forward != NULL ? forward : (void *)missing_dlsym; +} + +/* Browsers resolve libudev through dlopen and dlsym, which skips symbol interposition, so the + * devices have to be handed out from here as well. The real dlsym is entered with a jump so that it + * still sees the original caller, which is what RTLD_NEXT and RTLD_DEFAULT lookups are relative to. */ +#if defined(__aarch64__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, %function\n" + "dlsym:\n" + ".cfi_startproc\n" + "hint #34\n" + "stp x29, x30, [sp, #-32]!\n" + ".cfi_adjust_cfa_offset 32\n" + ".cfi_offset x29, -32\n" + ".cfi_offset x30, -24\n" + "mov x29, sp\n" + "stp x0, x1, [sp, #16]\n" + "bl inputudev_dlsym_target\n" + "mov x16, x0\n" + "ldp x0, x1, [sp, #16]\n" + "ldp x29, x30, [sp], #32\n" + ".cfi_adjust_cfa_offset -32\n" + ".cfi_restore x29\n" + ".cfi_restore x30\n" + "br x16\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#elif defined(__x86_64__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, @function\n" + "dlsym:\n" + ".cfi_startproc\n" + "pushq %rdi\n" + ".cfi_adjust_cfa_offset 8\n" + "pushq %rsi\n" + ".cfi_adjust_cfa_offset 8\n" + "subq $8, %rsp\n" + ".cfi_adjust_cfa_offset 8\n" + "call inputudev_dlsym_target\n" + "addq $8, %rsp\n" + ".cfi_adjust_cfa_offset -8\n" + "popq %rsi\n" + ".cfi_adjust_cfa_offset -8\n" + "popq %rdi\n" + ".cfi_adjust_cfa_offset -8\n" + "jmp *%rax\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#elif defined(__i386__) +__asm__(".text\n" + ".globl dlsym\n" + ".type dlsym, @function\n" + "dlsym:\n" + ".cfi_startproc\n" + "subl $12, %esp\n" + ".cfi_adjust_cfa_offset 12\n" + "movl 20(%esp), %eax\n" + "movl %eax, 4(%esp)\n" + "movl 16(%esp), %eax\n" + "movl %eax, (%esp)\n" + "call inputudev_dlsym_target\n" + "addl $12, %esp\n" + ".cfi_adjust_cfa_offset -12\n" + "jmp *%eax\n" + ".cfi_endproc\n" + ".size dlsym, .-dlsym\n"); +#else +void *dlsym(void *handle, const char *name) { + void *(*target)(void *, const char *) = inputudev_dlsym_target(handle, name); + + return target(handle, name); +} +#endif diff --git a/tools/linuxfs/preload/robust.c b/tools/linuxfs/preload/robust.c index 6d3393b506..9d5707e352 100644 --- a/tools/linuxfs/preload/robust.c +++ b/tools/linuxfs/preload/robust.c @@ -100,7 +100,11 @@ static long path_statx(int dirfd, const char *path, int flags, unsigned int mask return next_statx(dirfd, path, flags, mask, out); } +void bl_inputudev_note_dlopen(const char *path, void *handle) __attribute__((weak, visibility("hidden"))); + void *dlopen(const char *filename, int flags) { + void *handle; + if (!real_dlopen) { real_dlopen = (void *(*)(const char *, int))dlsym(RTLD_NEXT, "dlopen"); } @@ -109,7 +113,9 @@ void *dlopen(const char *filename, int flags) { if (basename && strcmp(basename, "vrclient.so") == 0) { flags &= ~RTLD_DEEPBIND; } - return real_dlopen(filename, flags); + handle = real_dlopen != NULL ? real_dlopen(filename, flags) : NULL; + if (handle != NULL && bl_inputudev_note_dlopen != NULL) bl_inputudev_note_dlopen(filename, handle); + return handle; } int dd_fsync_syscall(long number, const long *args, long *ret) __attribute__((visibility("hidden"))); diff --git a/tools/tests/test_inputudev_preload.py b/tools/tests/test_inputudev_preload.py new file mode 100644 index 0000000000..c1d970fd1d --- /dev/null +++ b/tools/tests/test_inputudev_preload.py @@ -0,0 +1,529 @@ +from pathlib import Path +import os +import shutil +import subprocess +import sys +import tempfile +import unittest + +PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload" + +ONCE = r""" +#define _GNU_SOURCE +#include +#include +#include +#include + +static pthread_once_t once = PTHREAD_ONCE_INIT; +static long (*next_syscall)(long, ...); + +static void init(void) { next_syscall = (long (*)(long, ...))dlsym(RTLD_NEXT, "syscall"); } + +ssize_t readlink(const char *path, char *buf, size_t size) { + pthread_once(&once, init); + return next_syscall(SYS_readlinkat, -100, path, buf, size); +} + +__attribute__((constructor)) static void start(void) { + char link[4096]; + readlink("/proc/self/exe", link, sizeof(link)); +} +""" + +FIRST = r""" +#define _GNU_SOURCE +#include +#include + +int marker(void) { return 1; } + +int next_marker(void) { + int (*next)(void) = (int (*)(void))dlsym(RTLD_NEXT, "marker"); + return next != NULL ? next() : 0; +} +""" + +SECOND = "int marker(void) { return 2; }\n" + +CHAIN = r""" +#define _GNU_SOURCE +#include +#include + +static int calls; + +int chained(void) { return calls > 1; } + +void *dlsym(void *handle, const char *name) { + static void *(*real)(void *, const char *); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.2.5"); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.17"); + if (real == NULL) real = (void *(*)(void *, const char *))dlvsym(RTLD_NEXT, "dlsym", "GLIBC_2.34"); + calls++; + return real(handle, name); +} +""" + +MARK = r""" +#include +#include + +char *realpath(const char *path, char *resolved) { + (void)path; + if (resolved == NULL) return strdup("marked"); + strcpy(resolved, "marked"); + return resolved; +} +""" + +UDEV = r""" +#include +#include +#include + +struct list { const char *name; struct list *next; }; +struct enumerate { struct list head; struct list added; char name[16]; int fail; }; + +void *udev_enumerate_new(void *udev) { + static int count; + struct enumerate *enumerate = calloc(1, sizeof(*enumerate)); + (void)udev; + snprintf(enumerate->name, sizeof(enumerate->name), "real%d", count++); + enumerate->head.name = enumerate->name; + enumerate->added.name = "added"; + return enumerate; +} +void *udev_enumerate_unref(void *enumerate) { free(enumerate); return NULL; } +int udev_enumerate_add_match_subsystem(void *enumerate, const char *subsystem) { + if (strcmp(subsystem, "fail") == 0) ((struct enumerate *)enumerate)->fail = 1; + return 0; +} +int udev_enumerate_add_match_parent(void *enumerate, void *parent) { + if (parent == NULL) return -1; + ((struct enumerate *)enumerate)->head.name = "parented"; + return 0; +} +int udev_enumerate_add_syspath(void *enumerate, const char *syspath) { + (void)syspath; + ((struct enumerate *)enumerate)->head.next = &((struct enumerate *)enumerate)->added; + return 0; +} +int udev_enumerate_scan_devices(void *enumerate) { return ((struct enumerate *)enumerate)->fail ? -1 : 0; } +void *udev_enumerate_get_list_entry(void *enumerate) { return &((struct enumerate *)enumerate)->head; } +void *udev_list_entry_get_next(void *entry) { return ((struct list *)entry)->next; } +void *udev_list_entry_get_by_name(void *entry, const char *name) { + return strcmp(((struct list *)entry)->name, name) == 0 ? entry : NULL; +} +const char *udev_list_entry_get_name(void *entry) { return ((struct list *)entry)->name; } +void *udev_device_new_from_syspath(void *udev, const char *syspath) { (void)udev; (void)syspath; return NULL; } +void *udev_device_new_from_subsystem_sysname(void *udev, const char *subsystem, const char *sysname) { + (void)udev; (void)subsystem; (void)sysname; + return NULL; +} +void *udev_device_unref(void *device) { (void)device; return NULL; } +void *udev_device_ref(void *device) { (void)device; return NULL; } +void *udev_device_get_parent(void *device) { (void)device; return NULL; } +void *udev_device_get_udev(void *device) { (void)device; return NULL; } +const char *udev_device_get_syspath(void *device) { (void)device; return "real"; } +const char *udev_device_get_sysnum(void *device) { (void)device; return "real"; } +""" + +PROGRAM = r""" +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +#define PAD "/sys/devices/virtual/input/droiddeck0" +#define PARENT0 "/sys/devices/droiddeck0/droiddeck-input0" +#define EVENT0 PARENT0 "/event0" +#define EVENT1 "/sys/devices/droiddeck1/droiddeck-input1/event1" +#define HANDLES 256 + +int next_marker(void); + +static void *lib; +static void *(*new_device)(void *, const char *); +static void *(*new_sysname)(void *, const char *, const char *); +static void *(*ref)(void *); +static void *(*unref)(void *); +static void *(*get_parent)(void *); +static void *(*get_udev)(void *); +static const char *(*syspath)(void *); +static const char *(*sysname)(void *); +static const char *(*sysnum)(void *); +static const char *(*devnode)(void *); +static const char *(*property)(void *, const char *); +static void *(*properties)(void *); +static void *(*enumerate_new)(void *); +static int (*match)(void *, const char *); +static int (*match_parent)(void *, void *); +static int (*add_syspath)(void *, const char *); +static int (*scan)(void *); +static void *(*list)(void *); +static void *(*next)(void *); +static void *(*by_name)(void *, const char *); +static const char *(*name)(void *); +static const char *(*value)(void *); + +static void *sym(const char *symbol) { return dlsym(lib, symbol); } + +static const char *entry_name(void *entry) { return entry != NULL ? name(entry) : "none"; } + +static void print_list(const char *label, void *entry) { + printf("%s", label); + for (; entry != NULL; entry = next(entry)) printf(" %s", name(entry)); + printf("\n"); +} + +static void print_properties(const char *label, void *device) { + void *entry; + + printf("%s", label); + for (entry = properties(device); entry != NULL; entry = next(entry)) printf(" %s=%s", name(entry), value(entry)); + printf("\n"); +} + +static void *matched(void *udev, const char *subsystem) { + void *enumerate = enumerate_new(udev); + + match(enumerate, subsystem); + return enumerate; +} + +static void pad_file(const char *node, int present) { + char path[4096]; + FILE *file; + + snprintf(path, sizeof(path), "%s/%s", getenv("FAKE_EVDEV_DIR"), node); + if (!present) { + unlink(path); + } else if ((file = fopen(path, "w")) != NULL) { + fclose(file); + } +} + +static void run_udev(void) { + int udev_a, udev_b, i, failures = 0; + void *device, *parent, *other, *entry, *held[HANDLES] = {0}; + char resolved[4096]; + const char *path; + + printf("missing %d\n", sym("udev_no_such_symbol") == NULL); + printf("plain %d\n", dlsym(RTLD_DEFAULT, "printf") != NULL); + device = new_device(&udev_a, PAD); + printf("syspath %s sysnum %s devnode %s\n", syspath(device), sysnum(device), devnode(device)); + parent = get_parent(device); + printf("nested %d\n", strncmp(syspath(device), syspath(parent), strlen(syspath(parent))) == 0 && + syspath(device)[strlen(syspath(parent))] == '/'); + other = new_device(&udev_a, EVENT0); + printf("canonical %s\n", other != NULL ? syspath(other) : "none"); + if (other != NULL) unref(other); + printf("parent %s sysname %s stable %d\n", syspath(parent), sysname(parent), parent == get_parent(device)); + print_properties("device properties", device); + print_properties("parent properties", parent); + entry = properties(device); + printf("joystick %s unknown %d\n", value(by_name(entry, "ID_INPUT_JOYSTICK")), by_name(entry, "NO_SUCH_KEY") == NULL); + ref(device); + unref(device); + printf("held %s\n", syspath(device)); + ref(parent); + unref(device); + printf("retained %s\n", syspath(parent)); + unref(parent); + for (i = 0; i < 1000; i++) { + device = new_device(&udev_a, PAD); + if (device == NULL || get_parent(device) == NULL || get_parent(device) != get_parent(device) || + strcmp(syspath(device), EVENT0) != 0) + failures++; + if (device != NULL) unref(device); + } + printf("reuse failures %d\n", failures); + for (i = 0; i < HANDLES && (held[i] = new_device(&udev_a, PAD)) != NULL; i++) { + } + printf("full %d extra %d parent %d\n", i, new_device(&udev_a, PAD) == NULL, get_parent(held[0]) == NULL); + unref(held[1]); + parent = get_parent(held[0]); + printf("freed parent %s stable %d\n", parent != NULL ? syspath(parent) : "none", parent == get_parent(held[0])); + for (i = 0; i < HANDLES; i++) + if (i != 1 && held[i] != NULL) unref(held[i]); + path = realpath("/sys/class/input/droiddeck-input0", resolved); + printf("parent link %s\n", path != NULL ? path : "none"); + path = realpath("/sys/class/input/input0", resolved); + printf("kernel link shadowed %d\n", path != NULL && strncmp(path, "/sys/devices/droiddeck", 22) == 0); + printf("kernel sysname shadowed %d\n", new_sysname(&udev_a, "input", "input0") != NULL); + other = new_sysname(&udev_a, "input", "droiddeck-input0"); + printf("parent sysname %s\n", other != NULL ? syspath(other) : "none"); + if (other != NULL) unref(other); + device = new_device(&udev_a, PAD); + other = new_device(&udev_b, PAD); + printf("contexts %d %d\n", get_udev(device) == (void *)&udev_a, get_udev(other) == (void *)&udev_b); +} + +static void run_stable(void) { + int udev; + char copy[64]; + void *device = new_device(&udev, PAD); + const char *before = devnode(device); + + snprintf(copy, sizeof(copy), "%s", before); + pad_file("event0", 0); + printf("gone %d\n", new_device(&udev, PAD) == NULL); + printf("devnode %s same %d property %s\n", devnode(device), devnode(device) == before && strcmp(before, copy) == 0, + property(device, "DEVNAME")); +} + +static void run_enumerate(void) { + int udev, i; + void *first, *entry, *found, *missing, *failed, *parented, *real_parent, *device, *parent, *other; + + first = matched(&udev, "input"); + scan(first); + entry = list(first); + print_list("scan", entry); + pad_file("event1", 1); + print_list("same scan", list(first)); + entry = list(first); + found = by_name(entry, EVENT0); + missing = by_name(entry, EVENT1); + printf("by name %s missing %d\n", entry_name(found), missing == NULL); + for (i = 0; i < 20; i++) { + void *other = matched(&udev, "input"); + scan(other); + list(other); + } + printf("kept tail %s\n", entry_name(next(entry))); + scan(first); + print_list("rescan", list(first)); + printf("rescan by name %s\n", entry_name(by_name(list(first), EVENT1))); + add_syspath(first, "/sys/devices/added"); + print_list("added", list(first)); + failed = matched(&udev, "input"); + match(failed, "fail"); + printf("failed scan %d\n", scan(failed)); + print_list("failed", list(failed)); + device = new_device(&udev, PAD); + parent = get_parent(device); + parented = enumerate_new(&udev); + printf("synthetic parent %d\n", match_parent(parented, parent)); + scan(parented); + print_list("parented", list(parented)); + real_parent = enumerate_new(&udev); + printf("real parent %d\n", match_parent(real_parent, &udev)); + scan(real_parent); + print_list("real parent list", list(real_parent)); + other = matched(&udev, "input"); + match_parent(other, &udev); + scan(other); + print_list("real parent suppressed", list(other)); + other = matched(&udev, "input"); + match_parent(other, parent); + match_parent(other, &udev); + scan(other); + print_list("real replaces synthetic", list(other)); + other = matched(&udev, "input"); + match_parent(other, &udev); + match_parent(other, parent); + scan(other); + print_list("synthetic replaces real", list(other)); + other = matched(&udev, "input"); + match_parent(other, parent); + printf("bad parent %d\n", match_parent(other, NULL)); + scan(other); + print_list("bad parent kept", list(other)); + other = enumerate_new(&udev); + match(other, "fail"); + match_parent(other, parent); + printf("nothing added scan %d\n", scan(other)); +} + +static void run_probe(void) { + int udev; + + printf("pad %d\n", new_device(&udev, PAD) != NULL); +} + +int main(int argc, char **argv) { + char link[4096]; + + if (strcmp(argv[1], "once") == 0) { + printf("readlink %d\n", readlink("/proc/self/exe", link, sizeof(link)) > 0); + return 0; + } + if (strcmp(argv[1], "next") == 0) { + int (*chained)(void) = (int (*)(void))dlsym(RTLD_DEFAULT, "chained"); + printf("next %d\n", next_marker()); + if (chained != NULL) printf("chained %d\n", chained()); + return 0; + } + lib = dlopen(argv[2], RTLD_NOW | RTLD_LOCAL); + if (strcmp(argv[1], "realpath") == 0) { + printf("realpath %s\n", realpath("/no/such/inputudev/path", link)); + return 0; + } + new_device = sym("udev_device_new_from_syspath"); + new_sysname = sym("udev_device_new_from_subsystem_sysname"); + ref = sym("udev_device_ref"); + unref = sym("udev_device_unref"); + get_parent = sym("udev_device_get_parent"); + get_udev = sym("udev_device_get_udev"); + syspath = sym("udev_device_get_syspath"); + sysname = sym("udev_device_get_sysname"); + sysnum = sym("udev_device_get_sysnum"); + devnode = sym("udev_device_get_devnode"); + property = sym("udev_device_get_property_value"); + properties = sym("udev_device_get_properties_list_entry"); + enumerate_new = sym("udev_enumerate_new"); + match = sym("udev_enumerate_add_match_subsystem"); + match_parent = sym("udev_enumerate_add_match_parent"); + add_syspath = sym("udev_enumerate_add_syspath"); + scan = sym("udev_enumerate_scan_devices"); + list = sym("udev_enumerate_get_list_entry"); + next = sym("udev_list_entry_get_next"); + by_name = sym("udev_list_entry_get_by_name"); + name = sym("udev_list_entry_get_name"); + value = sym("udev_list_entry_get_value"); + if (strcmp(argv[1], "probe") == 0) run_probe(); + else if (strcmp(argv[1], "stable") == 0) run_stable(); + else if (strcmp(argv[1], "enumerate") == 0) run_enumerate(); + else run_udev(); + fflush(stdout); + return 0; +} +""" + + +def compile_c(*args): + result = subprocess.run(["cc", *args], capture_output=True, text=True) + if result.returncode != 0: + raise AssertionError(f"cc {' '.join(args)} failed:\n{result.stderr}") + return result.stdout + + +@unittest.skipUnless(sys.platform == "linux" and shutil.which("cc"), "needs Linux and cc") +class InputUdevPreloadTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + cls.dir = Path(tempfile.mkdtemp()) + cls.addClassCleanup(shutil.rmtree, cls.dir, ignore_errors=True) + build = cls.dir / "build" + build.mkdir() + if "__GLIBC__" not in compile_c("-dM", "-E", "-x", "c", "-include", "limits.h", "/dev/null"): + raise unittest.SkipTest("needs a glibc toolchain") + sources = (("once.c", ONCE), ("first.c", FIRST), ("second.c", SECOND), ("chain.c", CHAIN), ("mark.c", MARK), + ("udev.c", UDEV), ("program.c", PROGRAM)) + for name, text in sources: + (build / name).write_text(text) + cls.lib = cls.dir / "libddsession.so" + compile_c("-shared", "-fPIC", "-O2", "-Wall", "-pthread", "-o", str(cls.lib), + *map(str, sorted(PRELOAD.glob("*.c"))), "-ldl") + for name in ("once", "first", "second", "chain", "mark"): + compile_c("-shared", "-fPIC", "-O0", "-pthread", "-o", str(cls.dir / f"lib{name}.so"), + str(build / f"{name}.c"), "-ldl") + cls.udev = cls.dir / "libudev.so.1" + compile_c("-shared", "-fPIC", "-O2", "-o", str(cls.udev), str(build / "udev.c")) + cls.program = cls.dir / "program" + compile_c("-O0", "-o", str(cls.program), str(build / "program.c"), str(cls.dir / "libfirst.so"), "-ldl") + cls.pads = cls.pad_dir("pads", "event0") + + @classmethod + def pad_dir(cls, name, *nodes): + pads = cls.dir / name + pads.mkdir() + for node in nodes: + (pads / node).write_text("") + return pads + + def run_program(self, mode, *preloads, pads=None, slots="0=/pad", program=None): + env = dict(os.environ, LD_PRELOAD=":".join(str(self.dir / name) for name in ("libddsession.so", *preloads)), + FAKE_EVDEV_MEMFD_PATHS=slots, FAKE_EVDEV_DIR=str(pads or self.pads)) + env.pop("FAKE_EVDEV_UINPUT", None) + result = subprocess.run([str(program or self.program), mode, str(self.udev)], env=env, capture_output=True, text=True, + timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + return result.stdout.splitlines() + + def test_a_lookup_from_another_preloads_initialiser_does_not_reenter_it(self): + self.assertEqual(self.run_program("once", "libonce.so"), ["readlink 1"]) + + def test_the_real_lookup_still_sees_the_original_caller(self): + self.assertEqual(self.run_program("next", "libfirst.so", "libsecond.so"), ["next 2"]) + + def test_another_preloads_dlsym_stays_in_the_chain(self): + self.assertEqual(self.run_program("next", "libfirst.so", "libchain.so", "libsecond.so"), ["next 2", "chained 1"]) + + def test_non_udev_lookups_skip_the_opened_libudev(self): + self.assertEqual(self.run_program("realpath", "libmark.so"), ["realpath marked"]) + + def test_a_program_resolving_udev_through_dlsym_gets_the_pads(self): + parent = "/sys/devices/droiddeck0/droiddeck-input0" + pad = f"{parent}/event0" + self.assertEqual(self.run_program("udev"), [ + "missing 1", + "plain 1", + f"syspath {pad} sysnum 0 devnode /dev/input/event0", + "nested 1", + f"canonical {pad}", + f"parent {parent} sysname droiddeck-input0 stable 1", + f"device properties DEVNAME=/dev/input/event0 DEVPATH={pad[4:]} ID_INPUT=1 ID_INPUT_JOYSTICK=1", + f"parent properties DEVPATH={parent[4:]} ID_INPUT=1 ID_INPUT_JOYSTICK=1", + "joystick 1 unknown 1", + f"held {pad}", + f"retained {parent}", + "reuse failures 0", + "full 256 extra 1 parent 1", + f"freed parent {parent} stable 1", + f"parent link {parent}", + "kernel link shadowed 0", + "kernel sysname shadowed 0", + f"parent sysname {parent}", + "contexts 1 1", + ]) + + def test_a_handle_keeps_its_strings_after_the_pad_goes_away(self): + self.assertEqual(self.run_program("stable", pads=self.pad_dir("stable", "event0")), [ + "gone 1", + "devnode /dev/input/event0 same 1 property /dev/input/event0", + ]) + + def test_enumerations_keep_their_scan_and_their_state(self): + parent = "/sys/devices/droiddeck0/droiddeck-input0" + pad = f"{parent}/event0" + pad1 = "/sys/devices/droiddeck1/droiddeck-input1/event1" + self.assertEqual(self.run_program("enumerate", pads=self.pad_dir("enumerate", "event0"), slots="0=/pad;1=/pad"), [ + f"scan {pad} real0", + f"same scan {pad} real0", + f"by name {pad} missing 1", + "kept tail real0", + f"rescan {pad} {pad1} real0", + f"rescan by name {pad1}", + f"added {pad} {pad1} real0 added", + "failed scan 0", + f"failed {pad} {pad1}", + "synthetic parent 0", + f"parented {parent} {pad}", + "real parent 0", + "real parent list parented", + "real parent suppressed parented", + "real replaces synthetic parented", + f"synthetic replaces real {parent} {pad}", + "bad parent -1", + f"bad parent kept {parent} {pad}", + "nothing added scan -1", + ]) + + def test_only_the_steam_client_runtime_path_gets_the_real_libudev(self): + for path, pad in (("steamrt64/steam", 0), ("steamrtarm64/steam", 0), ("steamrt64/steam-probe", 1), + ("xsteamrt64/steam", 1), ("steamrt64/xsteam", 1), ("steamrt/steam", 1)): + with self.subTest(path=path): + client = self.dir / "clients" / path + client.parent.mkdir(parents=True, exist_ok=True) + shutil.copy(self.program, client) + self.assertEqual(self.run_program("probe", program=client), [f"pad {pad}"]) + + +if __name__ == "__main__": + unittest.main() From 697f8e73fac635941da6072c7893852fc8981834 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 10:11:22 -0500 Subject: [PATCH 50/60] fix: enable Steam shader pre-caching by default (#2888) --- .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 2 +- .../droiddeck/launcher/session/ShaderPrecachePrefsTest.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 39d92312b5..3e37adb58e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -772,7 +772,7 @@ object SessionPrefs { val prefs = prefs(context) if (!prefs.contains("shaderPrecache")) { if (steamConfig(context).exists()) return null - prefs.edit().putBoolean("shaderPrecache", false).apply() + prefs.edit().putBoolean("shaderPrecache", true).apply() } val on = prefs.getBoolean("shaderPrecache", true) val applied = shaderPrecacheApplied(context) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt index b4d8d81f83..92eef30927 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ShaderPrecachePrefsTest.kt @@ -20,9 +20,9 @@ class ShaderPrecachePrefsTest { SessionPrefs.steamRoot(context, SessionPrefs.steamClientArch(context)).deleteRecursively() } - @Test fun clientWithoutConfigStartsWithPrecachingOff() { - assertEquals(false, SessionPrefs.pendingShaderPrecache(context)) - assertEquals(false, SessionPrefs.shaderPrecache(context)) + @Test fun clientWithoutConfigStartsWithPrecachingOn() { + assertEquals(true, SessionPrefs.pendingShaderPrecache(context)) + assertEquals(true, SessionPrefs.shaderPrecache(context)) } @Test fun existingConfigKeepsTheClientsChoice() { From 2ea857a07cc5884e27bb3a8c152969193f1053c7 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 10:57:00 -0500 Subject: [PATCH 51/60] fix(agent): keep the closed pet chat off the app below (#2868) --- .../main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt index cea5fcaf3b..72e5d0b635 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPetWindows.kt @@ -397,11 +397,14 @@ internal class PetWindows(private val context: Context) { /** * The chat window is always drawn; closed, it waits off the screen and takes neither touches nor - * keys, so opening it is a move and not a first layout. + * keys, so opening it is a move and not a first layout. Only FLAG_LAYOUT_NO_LIMITS keeps it off the + * screen: without it the system moves the window back over the app below, where every touch reaches + * that app marked obscured, and apps that filter obscured touches, such as GitHub, ignore them all. */ private fun showChat(on: Boolean) { chat.params.x = if (on) 0 else OFFSCREEN - val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE + val quiet = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or + WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS chat.params.flags = if (on) chat.params.flags and quiet.inv() else chat.params.flags or quiet if (added) runCatching { windows.updateViewLayout(chat.view, chat.params) } } From d852b1a4e53db276e938c2c6da00242ae02e73b5 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 11:00:59 -0500 Subject: [PATCH 52/60] fix(storage): let launcher prefixes and Linux system caches be removed (#2867) --- .../droiddeck/launcher/storage/StorageScan.kt | 8 +- .../launcher/storage/StorageState.kt | 51 +++++- .../launcher/storage/StorageSummary.kt | 54 ++++++ .../launcher/storage/SystemCaches.kt | 58 ++++++ .../launcher/stores/download/DownloadQueue.kt | 2 + .../droiddeck/launcher/ui/AgentSetupView.kt | 8 +- .../com/droiddeck/launcher/ui/StoragePage.kt | 165 ++++++++++++++---- app/src/main/res/values-ar/strings.xml | 11 +- app/src/main/res/values-b+es+419/strings.xml | 11 +- app/src/main/res/values-bg/strings.xml | 11 +- app/src/main/res/values-cs/strings.xml | 11 +- app/src/main/res/values-da/strings.xml | 11 +- app/src/main/res/values-de/strings.xml | 11 +- app/src/main/res/values-el/strings.xml | 11 +- app/src/main/res/values-es/strings.xml | 11 +- app/src/main/res/values-fi/strings.xml | 11 +- app/src/main/res/values-fr/strings.xml | 11 +- app/src/main/res/values-hi/strings.xml | 11 +- app/src/main/res/values-hu/strings.xml | 11 +- app/src/main/res/values-in/strings.xml | 11 +- app/src/main/res/values-it/strings.xml | 11 +- app/src/main/res/values-ja/strings.xml | 11 +- app/src/main/res/values-ko/strings.xml | 11 +- app/src/main/res/values-ms/strings.xml | 11 +- app/src/main/res/values-nb/strings.xml | 11 +- app/src/main/res/values-nl/strings.xml | 11 +- app/src/main/res/values-pl/strings.xml | 11 +- app/src/main/res/values-pt-rPT/strings.xml | 11 +- app/src/main/res/values-pt/strings.xml | 11 +- app/src/main/res/values-ro/strings.xml | 11 +- app/src/main/res/values-ru/strings.xml | 11 +- app/src/main/res/values-sv/strings.xml | 11 +- app/src/main/res/values-th/strings.xml | 11 +- app/src/main/res/values-tr/strings.xml | 11 +- app/src/main/res/values-uk/strings.xml | 11 +- app/src/main/res/values-vi/strings.xml | 11 +- app/src/main/res/values-zh-rCN/strings.xml | 11 +- app/src/main/res/values-zh-rHK/strings.xml | 11 +- app/src/main/res/values-zh-rTW/strings.xml | 11 +- app/src/main/res/values/strings.xml | 11 +- .../launcher/storage/KeptPrefixRemovalTest.kt | 42 +++++ .../launcher/storage/StorageSummaryTest.kt | 27 +++ .../launcher/storage/SystemCachesTest.kt | 53 ++++++ 43 files changed, 757 insertions(+), 74 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index dc07daabaf..aec3e5f661 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -71,7 +71,10 @@ class StorageReport( val kept: List, val leftoversChecked: Boolean, val storeGames: List = emptyList(), + val systemCaches: List = emptyList(), + val checkouts: List = emptyList(), ) { + val systemCacheBytes: Long get() = systemCaches.sumOf { it.bytes } val otherPrefixes: Long get() = kept.sumOf { it.bytes } val droiddeck: Long get() = buckets.values.sum() val installedShaders: Long get() = games.sumOf { it.shaders } @@ -358,6 +361,9 @@ object StorageScan { val stores = m(File(rootfs, "root/Games")) val flatpak = m(File(rootfs, "root/.local/share/flatpak")) val rootfsBytes = m(rootfs) + val systemCaches = SystemCaches.find(rootfs, clientRoots, System.currentTimeMillis()) + .map { (kind, found) -> SystemCacheUsage(kind, found, found.sumOf { walker.measure(it) }) }.filter { it.bytes > 0 } + val checkouts = SystemCaches.checkouts(rootfs).map { CheckoutUsage(it, walker.measure(it)) }.sortedByDescending { it.bytes } val privateBytes = privateRoots.sumOf { m(it) } val system = rootfsBytes - installs - inApps("compatdata") - inApps("shadercache") - workshop - compatTools - stores - flatpak @@ -381,7 +387,7 @@ object StorageScan { ), prefixes, shaders, workshop, flatpak, games.sortedByDescending { it.total }, tools.values.toList(), leftovers, logs, logBytes, - components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, + components, flatpakApps, flatpakRuntimes, kept, everyLibraryRead, storeGames, systemCaches, checkouts, ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index 40a48a3669..2aa3f53e15 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -15,7 +15,7 @@ import com.droiddeck.launcher.session.ComponentsManager import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.stores.StoreGameSidecar -enum class CleanItem { OLD_TOOLS, LEFTOVERS, LEFTOVERS_UNSURE, LOGS, UNUSED_CUSTOM, UNUSED_COMPONENTS, SHADERS } +enum class CleanItem { OLD_TOOLS, LEFTOVERS, LEFTOVERS_UNSURE, LOGS, SYSTEM_CACHES, UNUSED_CUSTOM, UNUSED_COMPONENTS, SHADERS } object StorageState { private const val TAG = "StorageState" @@ -61,8 +61,17 @@ object StorageState { }, "storage-store-sizes").start() } + /** The last scan's overview from disk, shown until this run's first scan lands. */ + var saved by mutableStateOf(null) + private set + private fun publish(app: Context, result: StorageReport) { report = result + val summary = StorageSummary.of(result) + saved = summary + Thread({ + runCatching { StorageSummary.file(app.filesDir).writeText(summary.toJson()) }.onFailure { Log.w(TAG, "could not keep the storage summary", it) } + }, "storage-summary").start() val live = result.storeGames.mapTo(HashSet()) { sizeKey(it) } storeSizes.keys.retainAll(live) measureStoreGames(app) @@ -88,6 +97,9 @@ object StorageState { fun refresh(context: Context, force: Boolean = false) { val current = report + if (current == null && saved == null) { + saved = runCatching { StorageSummary.fromJson(StorageSummary.file(context.applicationContext.filesDir).readText()) }.getOrNull() + } if (scanning || cleaning) { if (force) refreshAgain = true return @@ -122,9 +134,10 @@ object StorageState { CleanItem.UNUSED_CUSTOM -> report.unusedTools.filter { it.reason == ToolReason.CUSTOM }.sumOf { it.bytes } CleanItem.UNUSED_COMPONENTS -> report.unusedComponents.sumOf { it.bytes } CleanItem.SHADERS -> report.installedShaders + CleanItem.SYSTEM_CACHES -> report.systemCacheBytes } - val SAFE = setOf(CleanItem.OLD_TOOLS, CleanItem.LEFTOVERS, CleanItem.LOGS) + val SAFE = setOf(CleanItem.OLD_TOOLS, CleanItem.LEFTOVERS, CleanItem.LOGS, CleanItem.SYSTEM_CACHES) fun safeBytes(report: StorageReport): Long = SAFE.sumOf { bytes(report, it) } @@ -200,10 +213,19 @@ object StorageState { true }) + /** + * Whether a kept prefix may be removed. A store app's prefix can go, as Wine makes a new one and the app can be set up + * again, but not while a store game is installed inside it, as Battle.net does on drive C, or while a download may write to it. + */ + internal fun keptRemovable(report: StorageReport, prefix: KeptPrefix): Boolean = + prefix.owner != PrefixOwner.LAUNCHER || (report.storeGames.none { it.game.folder.path.startsWith(prefix.dir.path + "/") } && + !com.droiddeck.launcher.stores.download.DownloadQueue.anyActive()) + fun resetKept(context: Context, prefix: KeptPrefix) = act(context, "kept-${prefix.dir.name}", { _, fresh -> - val dir = fresh.kept.firstOrNull { it.dir.path == prefix.dir.path && it.owner == prefix.owner } - ?.takeIf { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }?.dir ?: return@act false - check(FileOps.delete(dir)) { "cannot delete $dir" } + val kept = fresh.kept.firstOrNull { it.dir.path == prefix.dir.path && it.owner == prefix.owner } + ?.takeIf { keptRemovable(fresh, it) } ?: return@act false + val reset = kept.owner == PrefixOwner.SHARED || kept.owner == PrefixOwner.GAME + (listOf(kept.dir) + listOfNotNull(kept.shaders?.takeUnless { reset })).forEach { check(FileOps.delete(it)) { "cannot delete $it" } } true }) @@ -225,9 +247,25 @@ object StorageState { com.droiddeck.launcher.stores.StoresState.uninstall(app, next.game) { uninstallNext(app, rest.drop(1)) } } + /** Clears one cache, as found by a fresh scan, so a file that became busy since stays. */ + fun clearSystemCache(context: Context, kind: SystemCache) = act(context, "cache-$kind", { _, fresh -> + val files = fresh.systemCaches.firstOrNull { it.kind == kind }?.files.orEmpty() + files.forEach { FileOps.delete(it) } + files.isNotEmpty() + }) + + /** Deletes a checkout the fresh scan still lists, and the main repository's record of it if it was a worktree. */ + fun removeCheckout(context: Context, dir: java.io.File) = act(context, "checkout-${dir.name}", { app, fresh -> + val checkout = fresh.checkouts.firstOrNull { it.dir.path == dir.path } ?: return@act false + val record = SystemCaches.worktreeRecord(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), checkout.dir) + check(FileOps.delete(checkout.dir)) { "cannot delete ${checkout.dir}" } + record?.let { FileOps.delete(it) } + true + }) + fun removeDirs(context: Context, dirs: List) = act(context, "remove-${dirs.size}", { _, fresh -> val allowed = (fresh.games.flatMap { it.shaderDirs + listOfNotNull(it.prefixDir) } + fresh.leftovers.flatMap { listOfNotNull(it.prefix, it.shaders) } + - fresh.kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME }.flatMap { listOfNotNull(it.dir, it.shaders) }).mapTo(HashSet()) { it.path } + fresh.kept.filter { keptRemovable(fresh, it) }.flatMap { listOfNotNull(it.dir, it.shaders) }).mapTo(HashSet()) { it.path } val wanted = dirs.distinctBy { it.path } val targets = wanted.filter { it.path in allowed } if (targets.size < wanted.size) Log.w(TAG, "kept ${wanted.size - targets.size} folders that are no longer safe to remove") @@ -283,6 +321,7 @@ object StorageState { CleanItem.LEFTOVERS_UNSURE -> report.leftovers.filter { !it.safe }.forEach(::deleteLeftover) CleanItem.LOGS -> report.logs.forEach { FileOps.delete(it) } CleanItem.SHADERS -> report.games.flatMap { it.shaderDirs }.forEach { FileOps.delete(it) } + CleanItem.SYSTEM_CACHES -> report.systemCaches.flatMap { it.files }.forEach { FileOps.delete(it) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt new file mode 100644 index 0000000000..e8b4ca5296 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageSummary.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.storage + +import org.json.JSONObject +import java.io.File + +/** + * What the Storage overview shows, kept on disk so the page opens at once after DroidDeck restarts, as it does on + * every update, while a fresh scan of the whole userland runs behind it. + */ +class StorageSummary( + val at: Long, val total: Long, val free: Long, val buckets: Map, val safe: Long, + val games: Int, val gamesOnSd: Int, val prefixes: Long, val workshop: Long, val shaders: Long, + val tools: Int, val unusedTools: Long, val components: Int, val unusedComponents: Long, + val storeGames: Int, val flatpakApps: Int, val flatpakShared: Long, val logBytes: Long, val systemClearable: Long, +) { + val droiddeck: Long get() = buckets.values.sum() + + fun toJson(): String = JSONObject().apply { + put("v", VERSION) + put("at", at); put("total", total); put("free", free); put("safe", safe) + put("buckets", JSONObject().apply { buckets.forEach { (b, v) -> put(b.name, v) } }) + put("games", games); put("gamesOnSd", gamesOnSd); put("prefixes", prefixes); put("workshop", workshop); put("shaders", shaders) + put("tools", tools); put("unusedTools", unusedTools); put("components", components); put("unusedComponents", unusedComponents) + put("storeGames", storeGames); put("flatpakApps", flatpakApps); put("flatpakShared", flatpakShared) + put("logBytes", logBytes); put("systemClearable", systemClearable) + }.toString() + + companion object { + private const val VERSION = 1 + + fun of(r: StorageReport) = StorageSummary( + r.at, r.total, r.free, r.buckets, StorageState.safeBytes(r), + r.games.size, r.gamesOnSd, r.prefixes, r.workshop, r.shaders, + r.tools.size, r.unusedTools.sumOf { it.bytes }, r.components.size, r.unusedComponents.sumOf { it.bytes }, + r.storeGames.size, r.flatpakApps.size, r.flatpakRuntimes + r.flatpakCache, r.logBytes, + r.systemCacheBytes + r.checkouts.sumOf { it.bytes }, + ) + + /** A summary another version wrote, or a damaged file, reads as none, so the page measures as before. */ + fun fromJson(text: String): StorageSummary? = runCatching { + val o = JSONObject(text) + if (o.optInt("v") != VERSION) return null + val b = o.getJSONObject("buckets") + StorageSummary( + o.getLong("at"), o.getLong("total"), o.getLong("free"), Bucket.entries.associateWith { b.optLong(it.name) }, o.getLong("safe"), + o.getInt("games"), o.getInt("gamesOnSd"), o.getLong("prefixes"), o.getLong("workshop"), o.getLong("shaders"), + o.getInt("tools"), o.getLong("unusedTools"), o.getInt("components"), o.getLong("unusedComponents"), + o.getInt("storeGames"), o.getInt("flatpakApps"), o.getLong("flatpakShared"), o.getLong("logBytes"), o.getLong("systemClearable"), + ) + }.getOrNull() + + fun file(filesDir: File) = File(filesDir, "storage-summary.json") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt b/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt new file mode 100644 index 0000000000..95277a312f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/storage/SystemCaches.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.storage + +import java.io.File +import java.nio.file.Files +import java.nio.file.LinkOption +import java.nio.file.attribute.BasicFileAttributes + +/** Parts of the Linux userland that the system and Steam make again when needed, so clearing them loses nothing. */ +enum class SystemCache { TEMP, PACKAGES, STEAM_WEB, STEAM_CORRUPT } + +class SystemCacheUsage(val kind: SystemCache, val files: List, val bytes: Long) + +/** A git checkout in the home folder, such as one the agent made with `git worktree add`. */ +class CheckoutUsage(val dir: File, val bytes: Long) + +object SystemCaches { + /** Temporary files nothing has touched for a day belong to no program still running. */ + const val TEMP_IDLE_MS = 24L * 60 * 60 * 1000 + + /** + * What each cache would delete. In /tmp, hidden entries (X11, ICE and other sockets' folders) stay, as does + * anything changed within [TEMP_IDLE_MS] or holding a socket or pipe. apt keeps only its downloaded packages + * here, and Steam's web cache and the download chunks it set aside as corrupt come back or are not needed. + */ + fun find(rootfs: File, steamRoots: List, now: Long): Map> = linkedMapOf( + SystemCache.TEMP to File(rootfs, "tmp").listFiles().orEmpty().filter { !it.name.startsWith(".") && idle(it, now) }, + SystemCache.PACKAGES to File(rootfs, "var/cache/apt/archives").let { dir -> + dir.listFiles().orEmpty().filter { it.isFile && it.name.endsWith(".deb") } + File(dir, "partial").listFiles().orEmpty() + }, + SystemCache.STEAM_WEB to steamRoots.map { File(it, "config/htmlcache") }.filter { it.isDirectory }, + SystemCache.STEAM_CORRUPT to steamRoots.map { File(it, "steamapps/corrupt") }.filter { it.isDirectory }, + ) + + /** The home folder's git checkouts but the DroidDeck source, which the Agent tab's own entry covers. */ + fun checkouts(rootfs: File): List = File(rootfs, "root").listFiles().orEmpty() + .filter { it.isDirectory && it.name != "DroidDeck" && File(it, ".git").exists() } + + /** + * The main repository's record of a worktree, which `git worktree prune` would drop once the folder is gone. + * Only a path inside some `.git/worktrees/` under [rootfs] counts. + */ + fun worktreeRecord(rootfs: File, checkout: File): File? { + val link = File(checkout, ".git").takeIf { it.isFile } ?: return null + val path = runCatching { link.readText() }.getOrNull()?.lineSequence()?.firstOrNull { it.startsWith("gitdir:") } + ?.removePrefix("gitdir:")?.trim()?.takeIf { it.startsWith("/") && "/.git/worktrees/" in it && "/../" !in it } ?: return null + return File(rootfs, path.removePrefix("/")).takeIf { it.isDirectory } + } + + /** Nothing inside changed for [TEMP_IDLE_MS] and nothing is a socket or pipe; links are not followed. */ + internal fun idle(file: File, now: Long): Boolean = runCatching { + Files.walk(file.toPath()).use { paths -> + paths.allMatch { p -> + val a = Files.readAttributes(p, BasicFileAttributes::class.java, LinkOption.NOFOLLOW_LINKS) + !a.isOther && now - a.lastModifiedTime().toMillis() >= TEMP_IDLE_MS + } + } + }.getOrDefault(false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index 19dc8ea178..917b2c0ba1 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -178,6 +178,8 @@ object DownloadQueue { fun isActive(key: String): Boolean = entry(key)?.isActive == true + fun anyActive(): Boolean = synchronized(lock) { items.values.any { it.entry.isActive } } + fun enqueue(context: Context, entry: DownloadEntry, factory: () -> DownloadJob) { val app = context.applicationContext synchronized(lock) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt index 3f7293b748..25b01904d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentSetupView.kt @@ -220,9 +220,9 @@ private fun StorageCard() { modifier = Modifier.fillMaxWidth().heightIn(min = 60.dp).padding(horizontal = 14.dp, vertical = 10.dp), ) { Column(Modifier.weight(1f)) { - Text(stringResource(storageTitle(item)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) + Text(stringResource(agentStorageTitle(item)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) Text( - if (armed) stringResource(storageWarning(item)) else Formatter.formatShortFileSize(context, AgentStorage.sizes[item] ?: 0L), + if (armed) stringResource(agentStorageWarning(item)) else Formatter.formatShortFileSize(context, AgentStorage.sizes[item] ?: 0L), fontSize = 13.sp, color = if (armed) AttentionAmber else pal.onSurfaceVariant, ) } @@ -241,7 +241,7 @@ private fun StorageCard() { } } -private fun storageTitle(item: AgentStorage.Item) = when (item) { +internal fun agentStorageTitle(item: AgentStorage.Item) = when (item) { AgentStorage.Item.CLAUDE_CODE -> R.string.agent_storage_claude AgentStorage.Item.CODEX -> R.string.agent_storage_codex AgentStorage.Item.OPENCODE -> R.string.agent_storage_opencode @@ -250,7 +250,7 @@ private fun storageTitle(item: AgentStorage.Item) = when (item) { AgentStorage.Item.CACHES -> R.string.agent_storage_caches } -private fun storageWarning(item: AgentStorage.Item) = when (item) { +internal fun agentStorageWarning(item: AgentStorage.Item) = when (item) { AgentStorage.Item.SOURCE -> R.string.agent_storage_source_warning AgentStorage.Item.CACHES -> R.string.agent_storage_caches_warning else -> R.string.agent_storage_reinstall_warning diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 7856fdcfea..f34161f6aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -91,8 +91,12 @@ import com.droiddeck.launcher.storage.GameUsage import com.droiddeck.launcher.storage.KeptPrefix import com.droiddeck.launcher.storage.PrefixOwner import com.droiddeck.launcher.storage.StoreGameUsage +import com.droiddeck.launcher.storage.SystemCache +import com.droiddeck.launcher.agent.AgentHost +import com.droiddeck.launcher.agent.AgentStorage import com.droiddeck.launcher.storage.StorageReport import com.droiddeck.launcher.storage.StorageState +import com.droiddeck.launcher.storage.StorageSummary import com.droiddeck.launcher.storage.ToolReason import com.droiddeck.launcher.storage.ToolState import com.droiddeck.launcher.storage.ToolUsage @@ -124,9 +128,10 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { var view by remember { mutableStateOf("overview") } var cleanup by remember { mutableStateOf(false) } val report = StorageState.report - LaunchedEffect(Unit) { StorageState.refresh(ctx) } + val summary = report?.let { remember(it) { StorageSummary.of(it) } } ?: StorageState.saved + LaunchedEffect(Unit) { StorageState.refresh(ctx); AgentStorage.measure(ctx) } LaunchedEffect(s.sessionRunning) { if (!s.sessionRunning) StorageState.refresh(ctx, force = report != null) } - if (report == null) { + if (summary == null) { Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(MaterialTheme.colorScheme.surface) @@ -140,7 +145,7 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { } return } - if (cleanup) CleanUpDialog(report, s.sessionRunning) { cleanup = false } + if (cleanup && report != null) CleanUpDialog(report, s.sessionRunning) { cleanup = false } val top = remember { androidx.compose.foundation.relocation.BringIntoViewRequester() } LaunchedEffect(view) { StorageState.lastFreed = null @@ -148,14 +153,17 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { runCatching { top.bringIntoView() } } Box(Modifier.fillMaxWidth().height(1.dp).bringIntoViewRequester(top)) - when (view) { + // Until this run's scan lands, the saved overview shows; a section opened meanwhile appears once it does. + if (report == null) Overview(summary, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) + else when (view) { "games" -> GamesView(report, s.sessionRunning, a) { view = "overview" } "data" -> GameDataView(report, s.sessionRunning) { view = "overview" } "components" -> ComponentsView(report, s.sessionRunning) { view = "overview" } "desktop" -> DesktopView(report, s.sessionRunning) { view = "overview" } "stores" -> StoreGamesView(report, s.sessionRunning) { view = "overview" } "tools" -> ToolsView(report, s.sessionRunning) { view = "overview" } - else -> Overview(report, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) + "system" -> SystemView(report, s.sessionRunning) { view = "overview" } + else -> Overview(summary, s.sessionRunning, onCleanUp = { cleanup = true }, onOpen = { view = it }) } } @@ -267,7 +275,7 @@ private fun DefaultStorageGroup() { } @Composable -private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { +private fun Overview(report: StorageSummary, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val narrowPane = LocalNarrowPane.current BoxWithConstraints(Modifier.fillMaxWidth()) { val wide = !narrowPane && maxWidth >= WIDE_OVERVIEW @@ -280,11 +288,11 @@ private val NARROW_ROW = 640.dp @OptIn(ExperimentalLayoutApi::class) @Composable -private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { +private fun OverviewContent(report: StorageSummary, sessionRunning: Boolean, wide: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val used = report.total - report.free - val safe = StorageState.safeBytes(report) + val safe = report.safe val low = report.free < StorageState.LOW_SPACE_BYTES ActionStatus() val summary = Modifier.fillMaxWidth().padding(top = 8.dp).clip(Shape14).background(colors.surface).border(1.dp, pal.line, Shape14) @@ -311,7 +319,7 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide Text(stringResource(R.string.storage_safe_now), fontSize = 13.sp, color = colors.onSurfaceVariant) Text(gb(safe), fontSize = 26.sp, fontWeight = FontWeight.Bold, color = if (safe > 0) pal.good else colors.onBackground) Text(stringResource(R.string.storage_safe_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 10.dp)) - PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.busy, compact = true, onClick = onCleanUp) + PrimaryButton(stringResource(R.string.storage_clean_up), enabled = !sessionRunning && !StorageState.busy && StorageState.report != null, compact = true, onClick = onCleanUp) } } if (wide) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(18.dp), modifier = summary) { usage(Modifier.weight(1f)) @@ -328,11 +336,11 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide } DefaultStorageGroup() SectionTitle(stringResource(R.string.storage_where), null) - val unused = report.unusedTools.sumOf { it.bytes } + val unused = report.unusedTools val tiles = listOf<@Composable (Modifier) -> Unit>( { m -> BucketCard(Bucket.GAMES, Icons.Outlined.VideogameAsset, stringResource(R.string.storage_games), - pluralStringResource(R.plurals.storage_games_installed, report.games.size, report.games.size) + + pluralStringResource(R.plurals.storage_games_installed, report.games, report.games) + if (report.gamesOnSd > 0) " · " + pluralStringResource(R.plurals.storage_games_on_sd, report.gamesOnSd, report.gamesOnSd) else "", report.buckets.getValue(Bucket.GAMES), m) { onOpen("games") } }, @@ -343,30 +351,32 @@ private fun OverviewContent(report: StorageReport, sessionRunning: Boolean, wide }, { m -> BucketCard(Bucket.TOOLS, Icons.Outlined.Layers, stringResource(R.string.storage_tools), - if (unused > 0) stringResource(R.string.storage_tools_unused, gb(unused)) else pluralStringResource(R.plurals.storage_tools_count, report.tools.size, report.tools.size), + if (unused > 0) stringResource(R.string.storage_tools_unused, gb(unused)) else pluralStringResource(R.plurals.storage_tools_count, report.tools, report.tools), report.buckets.getValue(Bucket.TOOLS), m, attention = unused > 0) { onOpen("tools") } }, { m -> - val unusedComponents = report.unusedComponents.sumOf { it.bytes } + val unusedComponents = report.unusedComponents BucketCard(Bucket.COMPONENTS, Icons.Outlined.Extension, stringResource(R.string.storage_components), if (unusedComponents > 0) stringResource(R.string.storage_tools_unused, gb(unusedComponents)) - else pluralStringResource(R.plurals.storage_components_count, report.components.size, report.components.size), + else pluralStringResource(R.plurals.storage_components_count, report.components, report.components), report.buckets.getValue(Bucket.COMPONENTS), m, attention = unusedComponents > 0) { onOpen("components") } }, { m -> BucketCard(Bucket.STORES, Icons.Outlined.ShoppingBag, stringResource(R.string.storage_stores), - pluralStringResource(R.plurals.storage_games_installed, report.storeGames.size, report.storeGames.size), + pluralStringResource(R.plurals.storage_games_installed, report.storeGames, report.storeGames), report.buckets.getValue(Bucket.STORES), m) { onOpen("stores") } }, { m -> BucketCard(Bucket.DESKTOP, Icons.Outlined.Monitor, stringResource(R.string.storage_desktop), - pluralStringResource(R.plurals.storage_desktop_apps, report.flatpakApps.size, report.flatpakApps.size) + - " · " + stringResource(R.string.storage_desktop_shared, gb(report.flatpakRuntimes + report.flatpakCache)), + pluralStringResource(R.plurals.storage_desktop_apps, report.flatpakApps, report.flatpakApps) + + " · " + stringResource(R.string.storage_desktop_shared, gb(report.flatpakShared)), report.buckets.getValue(Bucket.DESKTOP), m) { onOpen("desktop") } }, { m -> + val clearable = report.systemClearable + agentBytes().sumOf { it.second } BucketCard(Bucket.SYSTEM, Icons.Outlined.Storage, stringResource(R.string.storage_system), - stringResource(R.string.storage_system_hint), report.buckets.getValue(Bucket.SYSTEM), m, locked = true) + if (clearable >= ONE_MB) stringResource(R.string.storage_system_clearable, gb(clearable)) else stringResource(R.string.storage_system_hint), + report.buckets.getValue(Bucket.SYSTEM), m) { onOpen("system") } }, { m -> BucketCard(Bucket.DROIDDECK, Icons.Outlined.Folder, stringResource(R.string.storage_app_data), @@ -397,7 +407,7 @@ private fun bucketLabel(bucket: Bucket) = stringResource(when (bucket) { }) @Composable -private fun UsageBar(report: StorageReport, modifier: Modifier) { +private fun UsageBar(report: StorageSummary, modifier: Modifier) { val total = report.total.coerceAtLeast(1).toFloat() val other = (report.total - report.free - report.droiddeck).coerceAtLeast(0) Row(modifier.fillMaxWidth().height(14.dp).clip(RoundedCornerShape(7.dp)).background(Color(0xFF0A0C0F))) { @@ -532,6 +542,7 @@ private fun CleanRow(item: CleanItem, report: StorageReport, on: Boolean, modifi CleanItem.UNUSED_CUSTOM -> Triple(custom.joinToString(", ") { it.name }, stringResource(R.string.storage_item_custom_detail), 1) CleanItem.UNUSED_COMPONENTS -> Triple(stringResource(R.string.storage_item_components), unusedLabels.joinToString(", "), 1) CleanItem.SHADERS -> Triple(stringResource(R.string.storage_item_shaders), stringResource(R.string.storage_item_shaders_detail), 2) + CleanItem.SYSTEM_CACHES -> Triple(stringResource(R.string.storage_item_system_caches), stringResource(R.string.storage_item_system_caches_detail), 0) } ToggleRow( title, detail, StorageState.bytes(report, item), on, modifier, @@ -962,7 +973,7 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: } if (safe.isNotEmpty()) add(DataTarget("safe", safeLabel, safe.mapNotNull { l -> l.prefix?.let { it to l.prefixBytes } }, safe.mapNotNull { l -> l.shaders?.let { it to l.bytes - l.prefixBytes } })) unsure.forEach { l -> add(DataTarget("left:${leftoverKey(l)}", unsureNames[leftoverKey(l)].orEmpty(), listOfNotNull(l.prefix?.let { it to l.prefixBytes }), listOfNotNull(l.shaders?.let { it to l.bytes - l.prefixBytes }))) } - kept.filter { it.owner == PrefixOwner.SHARED || it.owner == PrefixOwner.GAME } + kept.filter { StorageState.keptRemovable(report, it) } .forEach { k -> add(DataTarget("kept:${k.dir.path}", keptNames[k.dir.path].orEmpty(), listOf(k.dir to k.bytes), listOfNotNull(k.shaders?.let { it to k.shaderBytes }))) } }.associateBy { it.key } val chosen = picked.mapNotNull { targets[it] } @@ -1019,7 +1030,8 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: SectionTitle(stringResource(R.string.storage_data_other), gb(kept.sumOf { it.bytes + it.shaderBytes })) ListCard { kept.forEachIndexed { i, k -> - val resettable = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME + val removable = StorageState.keptRemovable(report, k) + val reset = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME val key = "kept:${k.dir.path}" ItemRow( keptName(k), @@ -1028,13 +1040,14 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: PrefixOwner.LAUNCHER -> if (k.users.isEmpty()) stringResource(R.string.storage_launcher_prefix) else stringResource(R.string.storage_launcher_used_by, k.users.distinct().joinToString(", ")) PrefixOwner.GAME -> stringResource(R.string.storage_prefix_shaders, gb(k.bytes), gb(k.shaderBytes)) - PrefixOwner.UNKNOWN -> stringResource(R.string.storage_unknown_prefix_detail) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_leftover_unsure_detail) }, k.shaderBytes.takeIf { it >= ONE_MB && k.owner != PrefixOwner.GAME }?.let { stringResource(R.string.storage_bulk_shaders) + " " + gb(it).replace(' ', ' ') }).joinToString(" · "), k.bytes + k.shaderBytes, i == kept.lastIndex, - pill = if (k.owner == PrefixOwner.LAUNCHER) { { Pill(stringResource(R.string.storage_tag_required), MaterialTheme.colorScheme.onSurfaceVariant) } } else null, - selected = if (resettable) key in picked else null, slot = true, selectable = !busy, onSelect = { toggle(key) }, - action = if (resettable) { - { SecondaryButton(stringResource(R.string.storage_reset_prefix), compact = true, enabled = !busy) { confirmKept = k } } + pill = if (!removable) { { Pill(stringResource(R.string.storage_tag_required), MaterialTheme.colorScheme.onSurfaceVariant) } } + else if (k.owner == PrefixOwner.UNKNOWN) { { Pill(stringResource(R.string.storage_tag_saves), AttentionAmber) } } else null, + selected = if (removable) key in picked else null, slot = true, selectable = !busy, onSelect = { toggle(key) }, + action = if (removable) { + { SecondaryButton(stringResource(if (reset) R.string.storage_reset_prefix else R.string.storage_remove), compact = true, enabled = !busy) { confirmKept = k } } } else null, ) } @@ -1051,11 +1064,16 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: onDismiss = { confirmBulk = false }, ) confirmKept?.let { k -> + val reset = k.owner == PrefixOwner.SHARED || k.owner == PrefixOwner.GAME ConfirmDialog( - stringResource(R.string.storage_reset_prefix_title, keptName(k)), - if (k.owner == PrefixOwner.SHARED) stringResource(R.string.storage_reset_shared_confirm, gb(k.bytes)) - else stringResource(R.string.storage_reset_prefix_confirm, gb(k.bytes), k.library), - stringResource(R.string.storage_reset_prefix), + stringResource(if (reset) R.string.storage_reset_prefix_title else R.string.storage_remove_title, keptName(k)), + when (k.owner) { + PrefixOwner.SHARED -> stringResource(R.string.storage_reset_shared_confirm, gb(k.bytes)) + PrefixOwner.GAME -> stringResource(R.string.storage_reset_prefix_confirm, gb(k.bytes), k.library) + PrefixOwner.LAUNCHER -> stringResource(R.string.storage_remove_launcher_confirm, gb(k.bytes + k.shaderBytes)) + PrefixOwner.UNKNOWN -> stringResource(R.string.storage_leftover_confirm, gb(k.bytes + k.shaderBytes)) + }, + stringResource(if (reset) R.string.storage_reset_prefix else R.string.storage_remove), onConfirm = { StorageState.resetKept(ctx, k) }, onDismiss = { confirmKept = null }, ) } @@ -1181,6 +1199,93 @@ private fun StoreGamesView(report: StorageReport, sessionRunning: Boolean, onBac } } +/** What the Agent tab added to the Linux userland, with sizes once measured. */ +private fun agentBytes(): List> = + AgentStorage.Item.entries.mapNotNull { item -> AgentStorage.sizes[item]?.takeIf { it >= ONE_MB }?.let { item to it } } + +private fun cacheName(kind: SystemCache) = when (kind) { + SystemCache.TEMP -> R.string.storage_cache_temp + SystemCache.PACKAGES -> R.string.storage_cache_packages + SystemCache.STEAM_WEB -> R.string.storage_cache_steam_web + SystemCache.STEAM_CORRUPT -> R.string.storage_cache_steam_corrupt +} + +/** + * The Linux system bucket opened up: caches that come back on their own, what the Agent tab installed, and the rest, + * which runs everything and stays. + */ +@Composable +private fun SystemView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { + val ctx = LocalContext.current + val busy = sessionRunning || StorageState.busy + var confirmAgent by remember { mutableStateOf(null) } + var confirmCheckout by remember { mutableStateOf(null) } + val removing = AgentStorage.removing.size + var wasRemoving by remember { mutableStateOf(false) } + LaunchedEffect(removing) { + if (wasRemoving && removing == 0) StorageState.refresh(ctx, force = true) + wasRemoving = removing > 0 + } + val caches = report.systemCaches.sortedByDescending { it.bytes } + val agent = agentBytes().sortedByDescending { it.second } + val checkouts = report.checkouts.filter { it.bytes >= ONE_MB } + val agentTotal = agent.sumOf { it.second } + checkouts.sumOf { it.bytes } + val rest = (report.buckets.getValue(Bucket.SYSTEM) - report.systemCacheBytes - agentTotal).coerceAtLeast(0) + SubHeader(stringResource(R.string.storage_system), stringResource(R.string.storage_system_clearable, gb(report.systemCacheBytes + agentTotal)), onBack) { + if (caches.isNotEmpty()) PrimaryButton(stringResource(R.string.storage_free_button, gb(report.systemCacheBytes)), compact = true, enabled = !busy) { + StorageState.clean(ctx, setOf(CleanItem.SYSTEM_CACHES)) { } + } + } + ActionStatus() + if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } + if (caches.isNotEmpty()) { + SectionTitle(stringResource(R.string.storage_item_system_caches), gb(report.systemCacheBytes)) + ListCard { + caches.forEachIndexed { i, c -> + ItemRow(stringResource(cacheName(c.kind)), stringResource(R.string.storage_cache_detail), c.bytes, i == caches.lastIndex, + pill = { Pill(stringResource(R.string.storage_tag_safe), LocalPalette.current.good) }, + action = { SecondaryButton(stringResource(R.string.storage_clear), compact = true, enabled = !busy) { StorageState.clearSystemCache(ctx, c.kind) } }) + } + } + } + if (agent.isNotEmpty() || checkouts.isNotEmpty()) { + SectionTitle(stringResource(R.string.rail_agent), gb(agentTotal)) + ListCard { + agent.forEachIndexed { i, (item, bytes) -> + ItemRow(stringResource(agentStorageTitle(item)), stringResource(agentStorageWarning(item)), bytes, i == agent.lastIndex && checkouts.isEmpty(), + action = { + SecondaryButton(stringResource(R.string.storage_remove), compact = true, + enabled = AgentStorage.removing[item] != true && AgentHost.state != AgentHost.State.WORKING) { confirmAgent = item } + }) + } + checkouts.forEachIndexed { i, c -> + ItemRow(c.dir.name, stringResource(R.string.agent_storage_source_warning), c.bytes, i == checkouts.lastIndex, + action = { + SecondaryButton(stringResource(R.string.storage_remove), compact = true, + enabled = !busy && AgentHost.state != AgentHost.State.WORKING) { confirmCheckout = c } + }) + } + } + } + SectionTitle(stringResource(R.string.storage_in_use), gb(rest)) + ListCard { + ItemRow(stringResource(R.string.storage_system), stringResource(R.string.storage_system_hint), rest, true, + action = { Icon(Icons.Outlined.Lock, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.size(16.dp)) }) + } + confirmAgent?.let { item -> + ConfirmDialog( + stringResource(R.string.storage_remove_title, stringResource(agentStorageTitle(item))), stringResource(agentStorageWarning(item)), + stringResource(R.string.storage_remove), onConfirm = { AgentStorage.remove(ctx, item) }, onDismiss = { confirmAgent = null }, + ) + } + confirmCheckout?.let { c -> + ConfirmDialog( + stringResource(R.string.storage_remove_title, c.dir.name), stringResource(R.string.agent_storage_source_warning), + stringResource(R.string.storage_remove), onConfirm = { StorageState.removeCheckout(ctx, c.dir) }, onDismiss = { confirmCheckout = null }, + ) + } +} + @Composable internal fun ComponentsView(report: StorageReport, sessionRunning: Boolean, onBack: () -> Unit) { val ctx = LocalContext.current diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e8a743233a..9522e44de5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3493,10 +3493,19 @@ بادئة Steam المشتركة يشغّل Steam مساعدات Windows الخاصة به هنا يحذفها (%1$s). ينشئ Steam بادئة جديدة في المرة التالية التي يحتاجها فيها. + يحذف بادئة Wine وذاكرة التظليل المؤقتة لتطبيق المتجر هذا (%1$s)، مع تسجيل الدخول وأي حفظ موجود فيها فقط. تحصل الألعاب التي تعمل فيها على بادئة جديدة، وقد تحتاج إلى إعداد التطبيق مرة أخرى. تبقى عمليات الحفظ السحابية في حسابك. + يمكن مسح %1$s + ذاكرات Linux وSteam المؤقتة + الملفات المؤقتة القديمة والحزم المنزّلة وذاكرة الويب المؤقتة لـ Steam + الملفات المؤقتة القديمة + الحزم المنزّلة + ذاكرة الويب المؤقتة لـ Steam + تنزيلات Steam التالفة + تُنشأ مجددًا عند الحاجة + مسح تطبيق متجر والألعاب التي تعمل به مستخدَمة بواسطة %1$s لعبة خارج Steam %1$s - غير مطابقة لأي لعبة، لذا يُحتفظ بها حذف المحدد · %1$s إلغاء تثبيت المحدد · %1$s بادئات Wine diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 5547024fe0..1582f3c19e 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3348,10 +3348,19 @@ Prefijo compartido de Steam Steam ejecuta aquí sus propias herramientas de Windows Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Borra el prefijo de Wine y la caché de shaders de esta app de tienda (%1$s), junto con su inicio de sesión y cualquier partida guardada solo ahí. Los juegos que se ejecutan en él reciben un prefijo nuevo y quizá debas configurar la app otra vez. Las partidas en la nube se quedan en tu cuenta. + Se pueden liberar %1$s + Cachés de Linux y Steam + Archivos temporales viejos, paquetes descargados y la caché web de Steam + Archivos temporales viejos + Paquetes descargados + Caché web de Steam + Descargas dañadas de Steam + Se vuelven a crear cuando hacen falta + Borrar Una app de tienda y los juegos que se ejecutan con ella Usado por %1$s Juego que no es de Steam %1$s - No coincide con ningún juego, así que se conserva Quitar selección · %1$s Desinstalar selección · %1$s Prefijos de Wine diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bc7259808d..9b6629c979 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3345,10 +3345,19 @@ Споделен Steam префикс Steam изпълнява тук свои помощни програми за Windows Изтрива го (%1$s). Steam създава нов следващия път, когато му потрябва. + Изтрива Wine префикса и кеша на шейдърите на това приложение на магазин (%1$s), заедно с влизането и записите, пазени само там. Игрите, които работят в него, получават нов префикс и може да се наложи да настроите приложението отново. Записите в облака остават в профила ви. + Може да се изчистят %1$s + Кешове на Linux и Steam + Стари временни файлове, изтеглени пакети и уеб кешът на Steam + Стари временни файлове + Изтеглени пакети + Уеб кеш на Steam + Повредени изтегляния на Steam + Създават се отново при нужда + Изчисти Приложение магазин и игрите, които работят с него Използва се от %1$s Игра извън Steam %1$s - Не е свързан с игра, затова се запазва Премахни избраните · %1$s Деинсталирай избраните · %1$s Префикси на Wine diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8b846d2a9b..7c2f59aee2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3419,10 +3419,19 @@ Sdílený prefix Steamu Steam zde spouští své pomocné programy pro Windows Smaže ho (%1$s). Steam si vytvoří nový, až ho bude příště potřebovat. + Smaže Wine prefix a mezipaměť shaderů této aplikace obchodu (%1$s) včetně přihlášení a uložených pozic, které jsou jen tam. Hry, které v něm běží, dostanou nový prefix a aplikaci možná bude třeba znovu nastavit. Cloudové uložené pozice zůstanou ve vašem účtu. + Lze uvolnit %1$s + Mezipaměti Linuxu a Steamu + Staré dočasné soubory, stažené balíčky a webová mezipaměť Steamu + Staré dočasné soubory + Stažené balíčky + Webová mezipaměť Steamu + Poškozená stahování Steamu + V případě potřeby se vytvoří znovu + Vymazat Aplikace obchodu a hry, které s ní běží Používá: %1$s Hra mimo Steam %1$s - Nepatří k žádné hře, proto zůstává Odebrat vybrané · %1$s Odinstalovat vybrané · %1$s Prefixy Wine diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index ab9d45679e..f86af3f9b8 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3345,10 +3345,19 @@ Steams delte præfiks Steam kører sine egne Windows-hjælpere her Sletter det (%1$s). Steam opretter et nyt, næste gang det skal bruges. + Sletter denne butiksapps Wine-præfiks og shader-cache (%1$s) sammen med login og gemte spil, der kun ligger der. Spil, der kører i det, får et nyt præfiks, og du skal måske sætte appen op igen. Gemte spil i skyen bliver på din konto. + %1$s kan ryddes + Linux- og Steam-cache + Gamle midlertidige filer, hentede pakker og Steams webcache + Gamle midlertidige filer + Hentede pakker + Steams webcache + Beskadigede Steam-downloads + Oprettes igen efter behov + Ryd En butiksapp og de spil, der kører med den Bruges af %1$s Ikke-Steam-spil %1$s - Ikke knyttet til et spil, så det bevares Fjern valgte · %1$s Afinstaller valgte · %1$s Wine-prefixer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1337f8aa11..2deaec9777 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3345,10 +3345,19 @@ Gemeinsames Präfix von Steam Steam führt hier eigene Windows-Hilfsprogramme aus Löscht es (%1$s). Steam erstellt ein neues, sobald es wieder eines braucht. + Löscht Wine-Präfix und Shader-Cache dieser Store-App (%1$s), samt Anmeldung und Speicherständen, die nur dort liegen. Spiele, die darin laufen, bekommen ein neues Präfix, und die App muss eventuell neu eingerichtet werden. Cloud-Speicherstände bleiben im Konto. + %1$s können geleert werden + Linux- und Steam-Caches + Alte temporäre Dateien, heruntergeladene Pakete und Steams Web-Cache + Alte temporäre Dateien + Heruntergeladene Pakete + Steam-Web-Cache + Beschädigte Steam-Downloads + Wird bei Bedarf neu erstellt + Leeren Eine Store-App und die Spiele, die damit laufen Verwendet von %1$s Nicht-Steam-Spiel %1$s - Keinem Spiel zugeordnet, daher bleibt es erhalten Auswahl entfernen · %1$s Auswahl deinstallieren · %1$s Wine-Präfixe diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3b548067f4..43d687e021 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3345,10 +3345,19 @@ Κοινό prefix του Steam Το Steam εκτελεί εδώ τα δικά του βοηθητικά προγράμματα Windows Το διαγράφει (%1$s). Το Steam δημιουργεί νέο την επόμενη φορά που θα το χρειαστεί. + Διαγράφει το πρόθεμα Wine και την cache των shader αυτής της εφαρμογής καταστήματος (%1$s), μαζί με τη σύνδεση και όσες αποθηκεύσεις υπάρχουν μόνο εκεί. Τα παιχνίδια που τρέχουν σε αυτό παίρνουν νέο πρόθεμα και ίσως χρειαστεί να ρυθμίσετε ξανά την εφαρμογή. Οι αποθηκεύσεις στο cloud μένουν στον λογαριασμό σας. + Μπορούν να εκκαθαριστούν %1$s + Cache του Linux και του Steam + Παλιά προσωρινά αρχεία, πακέτα που κατέβηκαν και η cache ιστού του Steam + Παλιά προσωρινά αρχεία + Πακέτα που κατέβηκαν + Cache ιστού του Steam + Κατεστραμμένες λήψεις Steam + Δημιουργούνται ξανά όταν χρειάζεται + Εκκαθάριση Μια εφαρμογή καταστήματος και τα παιχνίδια που τρέχουν με αυτήν Χρησιμοποιείται από %1$s Παιχνίδι εκτός Steam %1$s - Δεν αντιστοιχεί σε παιχνίδι, οπότε διατηρείται Αφαίρεση επιλεγμένων · %1$s Κατάργηση επιλεγμένων · %1$s Prefix Wine diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 126aa3b53c..4a41370327 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3382,10 +3382,19 @@ Prefijo compartido de Steam Steam ejecuta aquí sus propias herramientas de Windows Lo borra (%1$s). Steam crea uno nuevo la próxima vez que lo necesite. + Borra el prefijo de Wine y la caché de shaders de esta app de tienda (%1$s), junto con su inicio de sesión y las partidas guardadas solo ahí. Los juegos que se ejecutan en él reciben un prefijo nuevo y puede que tengas que configurar la app de nuevo. Las partidas en la nube se quedan en tu cuenta. + Se pueden liberar %1$s + Cachés de Linux y Steam + Archivos temporales antiguos, paquetes descargados y la caché web de Steam + Archivos temporales antiguos + Paquetes descargados + Caché web de Steam + Descargas dañadas de Steam + Se vuelven a crear cuando hacen falta + Borrar Una app de tienda y los juegos que se ejecutan con ella Usado por %1$s Juego que no es de Steam %1$s - No coincide con ningún juego, así que se conserva Quitar selección · %1$s Desinstalar selección · %1$s Prefijos de Wine diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1fd9682566..0e9ef5f069 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3345,10 +3345,19 @@ Steamin jaettu etuliite Steam suorittaa täällä omia Windows-apuohjelmiaan Poistaa sen (%1$s). Steam luo uuden, kun tarvitsee sitä seuraavan kerran. + Poistaa tämän kauppasovelluksen Wine-etuliitteen ja varjostinvälimuistin (%1$s) sekä kirjautumisen ja vain siellä olevat tallennukset. Siinä toimivat pelit saavat uuden etuliitteen, ja sovellus pitää ehkä ottaa uudelleen käyttöön. Pilvitallennukset säilyvät tililläsi. + %1$s voidaan tyhjentää + Linuxin ja Steamin välimuistit + Vanhat väliaikaistiedostot, ladatut paketit ja Steamin verkkovälimuisti + Vanhat väliaikaistiedostot + Ladatut paketit + Steamin verkkovälimuisti + Vioittuneet Steam-lataukset + Luodaan tarvittaessa uudelleen + Tyhjennä Kauppasovellus ja pelit, jotka toimivat sen kanssa Käyttää: %1$s Muu kuin Steam-peli %1$s - Ei vastaa mitään peliä, joten se säilytetään Poista valitut · %1$s Poista valittujen asennus · %1$s Wine-prefixit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 575309564d..a40f61aed9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3381,10 +3381,19 @@ Préfixe partagé de Steam Steam y exécute ses propres utilitaires Windows Le supprime (%1$s). Steam en crée un nouveau la prochaine fois qu\'il en a besoin. + Supprime le préfixe Wine et le cache de shaders de cette app de boutique (%1$s), avec sa connexion et les sauvegardes présentes uniquement là. Les jeux qui s\'y exécutent reçoivent un nouveau préfixe, et il faudra peut-être reconfigurer l\'app. Les sauvegardes cloud restent dans votre compte. + %1$s peuvent être libérés + Caches de Linux et de Steam + Anciens fichiers temporaires, paquets téléchargés et cache web de Steam + Anciens fichiers temporaires + Paquets téléchargés + Cache web de Steam + Téléchargements Steam endommagés + Recréés au besoin + Vider Une app de boutique et les jeux qui tournent avec elle Utilisé par %1$s Jeu hors Steam %1$s - Associé à aucun jeu, il est donc conservé Supprimer la sélection · %1$s Désinstaller la sélection · %1$s Préfixes Wine diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 17d5e5cd6a..9ffe130bc8 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3345,10 +3345,19 @@ Steam का साझा प्रीफ़िक्स Steam यहाँ अपने Windows हेल्पर चलाता है इसे डिलीट करता है (%1$s)। अगली बार ज़रूरत पड़ने पर Steam नया बना लेता है। + इस स्टोर ऐप का Wine प्रीफ़िक्स और शेडर कैश (%1$s) हटाता है, साथ में इसका साइन-इन और सिर्फ़ वहीं रखे सेव भी। इसमें चलने वाले गेम को नया प्रीफ़िक्स मिलता है, और ऐप को फिर से सेट अप करना पड़ सकता है। क्लाउड सेव आपके खाते में रहते हैं। + %1$s साफ़ किया जा सकता है + Linux और Steam कैश + पुरानी अस्थायी फ़ाइलें, डाउनलोड किए गए पैकेज और Steam का वेब कैश + पुरानी अस्थायी फ़ाइलें + डाउनलोड किए गए पैकेज + Steam वेब कैश + खराब Steam डाउनलोड + ज़रूरत पड़ने पर फिर से बनते हैं + साफ़ करें एक स्टोर ऐप और उसके साथ चलने वाले गेम %1$s द्वारा इस्तेमाल गैर-Steam गेम %1$s - किसी गेम से मेल नहीं खाता, इसलिए रखा जाता है चुने गए हटाएँ · %1$s चुने गए अनइंस्टॉल करें · %1$s Wine प्रीफ़िक्स diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 86f9cb5ce2..dbacff4fc5 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3345,10 +3345,19 @@ A Steam megosztott prefixe A Steam itt futtatja saját Windows-segédprogramjait Törli (%1$s). A Steam újat hoz létre, amikor legközelebb szüksége lesz rá. + Törli ennek az áruházalkalmazásnak a Wine-prefixét és shadergyorsítótárát (%1$s), a bejelentkezéssel és a csak ott tárolt mentésekkel együtt. A benne futó játékok új prefixet kapnak, és lehet, hogy az alkalmazást újra be kell állítani. A felhőmentések a fiókodban maradnak. + %1$s üríthető + Linux- és Steam-gyorsítótárak + Régi ideiglenes fájlok, letöltött csomagok és a Steam webes gyorsítótára + Régi ideiglenes fájlok + Letöltött csomagok + Steam webes gyorsítótár + Sérült Steam-letöltések + Szükség esetén újra létrejön + Ürítés Egy áruházalkalmazás és a vele futó játékok Használja: %1$s Nem Steam-es játék: %1$s - Nem tartozik játékhoz, ezért megmarad Kijelöltek eltávolítása · %1$s Kijelöltek eltávolítása · %1$s Wine-prefixek diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 5b149f981d..d57f4fce8a 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3316,10 +3316,19 @@ Prefix Steam bersama Steam menjalankan helper Windows-nya sendiri di sini Menghapusnya (%1$s). Steam membuat yang baru saat membutuhkannya lagi. + Menghapus prefiks Wine dan cache shader aplikasi toko ini (%1$s), beserta info masuk dan simpanan yang hanya ada di sana. Game yang berjalan di dalamnya mendapat prefiks baru, dan Anda mungkin perlu menyiapkan aplikasinya lagi. Simpanan cloud tetap ada di akun Anda. + %1$s dapat dibersihkan + Cache Linux dan Steam + File sementara lama, paket yang diunduh, dan cache web Steam + File sementara lama + Paket yang diunduh + Cache web Steam + Unduhan Steam yang rusak + Dibuat lagi saat diperlukan + Bersihkan Aplikasi toko dan gim yang berjalan dengannya Dipakai oleh %1$s Gim non-Steam %1$s - Tidak cocok dengan gim mana pun, jadi tetap disimpan Hapus yang dipilih · %1$s Hapus instalasi yang dipilih · %1$s Prefix Wine diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d45d12ebc5..9762487af7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3381,10 +3381,19 @@ Prefisso condiviso di Steam Steam esegue qui i propri strumenti Windows Lo elimina (%1$s). Steam ne crea uno nuovo la prossima volta che serve. + Elimina il prefisso Wine e la cache degli shader di questa app dello store (%1$s), con il suo accesso e i salvataggi presenti solo lì. I giochi che vi girano ricevono un nuovo prefisso e potrebbe essere necessario configurare di nuovo l\'app. I salvataggi cloud restano nel tuo account. + Si possono liberare %1$s + Cache di Linux e Steam + Vecchi file temporanei, pacchetti scaricati e cache web di Steam + Vecchi file temporanei + Pacchetti scaricati + Cache web di Steam + Download di Steam danneggiati + Ricreati quando servono + Svuota Un\'app di uno store e i giochi che girano con essa Usato da %1$s Gioco non Steam %1$s - Non associato a nessun gioco, quindi viene conservato Rimuovi selezionati · %1$s Disinstalla selezionati · %1$s Prefissi Wine diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f8f00afd16..4368eb3b77 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3316,10 +3316,19 @@ Steam の共有プレフィックス Steam が独自の Windows ヘルパーをここで実行します 削除します(%1$s)。次に必要になったとき Steam が新しく作成します。 + このストアアプリの Wine プレフィックスとシェーダーキャッシュ(%1$s)を、サインイン情報やそこにしかないセーブデータごと削除します。中で動くゲームは新しいプレフィックスで始まり、アプリの再セットアップが必要になる場合があります。クラウドのセーブデータはアカウントに残ります。 + %1$s を消去できます + Linux と Steam のキャッシュ + 古い一時ファイル、ダウンロード済みパッケージ、Steam のウェブキャッシュ + 古い一時ファイル + ダウンロード済みパッケージ + Steam のウェブキャッシュ + 破損した Steam ダウンロード + 必要なときに再作成されます + 消去 ストアアプリとそれで動くゲーム %1$s が使用 Steam 以外のゲーム %1$s - どのゲームにも一致しないため保持されます 選択項目を削除 · %1$s 選択項目をアンインストール · %1$s Wineプレフィックス diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 803c259ed5..65be1ca189 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3316,10 +3316,19 @@ Steam의 공유 프리픽스 Steam이 자체 Windows 도우미를 여기서 실행합니다 삭제합니다(%1$s). 다음에 필요할 때 Steam이 새로 만듭니다. + 이 스토어 앱의 Wine 접두사와 셰이더 캐시(%1$s)를 로그인 정보 및 그곳에만 있는 저장 데이터와 함께 삭제합니다. 그 안에서 실행되는 게임은 새 접두사를 받으며, 앱을 다시 설정해야 할 수 있습니다. 클라우드 저장 데이터는 계정에 남습니다. + %1$s 정리 가능 + Linux 및 Steam 캐시 + 오래된 임시 파일, 다운로드한 패키지, Steam 웹 캐시 + 오래된 임시 파일 + 다운로드한 패키지 + Steam 웹 캐시 + 손상된 Steam 다운로드 + 필요할 때 다시 만들어집니다 + 지우기 스토어 앱과 이 앱으로 실행되는 게임 사용 중: %1$s Steam이 아닌 게임 %1$s - 일치하는 게임이 없어 유지됩니다 선택 항목 제거 · %1$s 선택 항목 제거 · %1$s Wine 프리픽스 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9e19ba1932..35583d3e7b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3316,10 +3316,19 @@ Awalan Steam dikongsi Steam menjalankan pembantu Windowsnya sendiri di sini Memadamnya (%1$s). Steam mencipta yang baharu apabila memerlukannya lagi. + Memadam prefiks Wine dan cache shader apl kedai ini (%1$s), bersama log masuk dan simpanan yang hanya ada di situ. Permainan yang berjalan di dalamnya mendapat prefiks baharu, dan anda mungkin perlu menyediakan apl itu semula. Simpanan awan kekal dalam akaun anda. + %1$s boleh dikosongkan + Cache Linux dan Steam + Fail sementara lama, pakej yang dimuat turun dan cache web Steam + Fail sementara lama + Pakej yang dimuat turun + Cache web Steam + Muat turun Steam yang rosak + Dibuat semula apabila perlu + Kosongkan Aplikasi kedai dan permainan yang berjalan dengannya Digunakan oleh %1$s Permainan bukan Steam %1$s - Tidak sepadan dengan mana-mana permainan, jadi ia disimpan Alih keluar yang dipilih · %1$s Nyahpasang yang dipilih · %1$s Prefix Wine diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 35fdb65500..f503b384b0 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3345,10 +3345,19 @@ Steams delte prefiks Steam kjører sine egne Windows-hjelpere her Sletter det (%1$s). Steam oppretter et nytt neste gang det trengs. + Sletter denne butikkappens Wine-prefiks og shader-buffer (%1$s), sammen med innlogging og lagringer som bare finnes der. Spill som kjører i det, får et nytt prefiks, og du må kanskje sette opp appen igjen. Skylagringer blir værende på kontoen din. + %1$s kan tømmes + Linux- og Steam-buffere + Gamle midlertidige filer, nedlastede pakker og Steams nettbuffer + Gamle midlertidige filer + Nedlastede pakker + Steams nettbuffer + Skadede Steam-nedlastinger + Lages på nytt ved behov + Tøm En butikkapp og spillene som kjører med den Brukes av %1$s Ikke-Steam-spill %1$s - Ikke knyttet til et spill, så det beholdes Fjern valgte · %1$s Avinstaller valgte · %1$s Wine-prefikser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0bc195044d..f505680b3d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3345,10 +3345,19 @@ Gedeeld Steam-prefix Steam voert hier eigen Windows-hulpmiddelen uit Verwijdert het (%1$s). Steam maakt een nieuw aan zodra het er weer een nodig heeft. + Verwijdert de Wine-prefix en shadercache van deze winkel-app (%1$s), met de aanmelding en saves die alleen daar staan. Games die erin draaien krijgen een nieuwe prefix, en je moet de app misschien opnieuw instellen. Cloudsaves blijven in je account. + %1$s kan worden gewist + Linux- en Steam-caches + Oude tijdelijke bestanden, gedownloade pakketten en de webcache van Steam + Oude tijdelijke bestanden + Gedownloade pakketten + Steam-webcache + Beschadigde Steam-downloads + Wordt opnieuw gemaakt wanneer nodig + Wissen Een winkel-app en de games die ermee draaien Gebruikt door %1$s Niet-Steam-game %1$s - Niet aan een game gekoppeld, dus het blijft bewaard Selectie verwijderen · %1$s Selectie verwijderen · %1$s Wine-prefixen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cb1a3b6b72..db86d683b7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3419,10 +3419,19 @@ Współdzielony prefiks Steam Steam uruchamia tu własne narzędzia pomocnicze Windows Usuwa go (%1$s). Steam utworzy nowy, gdy znów będzie potrzebny. + Usuwa prefiks Wine i pamięć podręczną shaderów tej aplikacji sklepu (%1$s) wraz z logowaniem i zapisami przechowywanymi tylko tam. Gry, które w nim działają, dostaną nowy prefiks, a aplikację może trzeba będzie skonfigurować ponownie. Zapisy w chmurze zostają na koncie. + Można wyczyścić %1$s + Pamięć podręczna Linuksa i Steam + Stare pliki tymczasowe, pobrane pakiety i pamięć podręczna stron Steam + Stare pliki tymczasowe + Pobrane pakiety + Pamięć podręczna stron Steam + Uszkodzone pobrania Steam + Tworzone ponownie w razie potrzeby + Wyczyść Aplikacja sklepu i gry, które z nią działają Używany przez: %1$s Gra spoza Steam %1$s - Nie pasuje do żadnej gry, więc zostaje zachowany Usuń wybrane · %1$s Odinstaluj wybrane · %1$s Prefiksy Wine diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a6001ca08b..855d84d3cd 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3381,10 +3381,19 @@ Prefixo partilhado do Steam O Steam executa aqui os seus próprios auxiliares do Windows Elimina-o (%1$s). O Steam cria um novo da próxima vez que precisar. + Apaga o prefixo Wine e a cache de shaders desta app de loja (%1$s), com a sessão iniciada e os jogos guardados apenas aí. Os jogos que correm nele recebem um prefixo novo, e poderá ter de configurar a app outra vez. Os jogos guardados na nuvem ficam na sua conta. + É possível libertar %1$s + Caches do Linux e do Steam + Ficheiros temporários antigos, pacotes transferidos e a cache web do Steam + Ficheiros temporários antigos + Pacotes transferidos + Cache web do Steam + Transferências danificadas do Steam + Recriados quando necessário + Limpar Uma app de loja e os jogos que correm com ela Usado por %1$s Jogo não Steam %1$s - Não corresponde a nenhum jogo, por isso é mantido Remover seleção · %1$s Desinstalar seleção · %1$s Prefixos do Wine diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index af3fece9af..46df26d466 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3389,10 +3389,19 @@ Prefixo compartilhado da Steam A Steam executa aqui seus próprios auxiliares do Windows Apaga o prefixo (%1$s). A Steam cria um novo na próxima vez que precisar. + Apaga o prefixo do Wine e o cache de shaders deste app de loja (%1$s), com o login e os saves guardados só ali. Os jogos que rodam nele recebem um prefixo novo, e talvez seja preciso configurar o app de novo. Os saves na nuvem continuam na sua conta. + Dá para liberar %1$s + Caches do Linux e da Steam + Arquivos temporários antigos, pacotes baixados e o cache web da Steam + Arquivos temporários antigos + Pacotes baixados + Cache web da Steam + Downloads danificados da Steam + Recriados quando necessário + Limpar Um app de loja e os jogos que rodam com ele Usado por %1$s Jogo não Steam %1$s - Não corresponde a nenhum jogo, então é mantido Remover seleção · %1$s Desinstalar seleção · %1$s Prefixos do Wine diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 753853adc0..bea73bdabc 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3382,10 +3382,19 @@ Prefixul Steam partajat Steam rulează aici propriile utilitare Windows Îl șterge (%1$s). Steam creează unul nou data viitoare când are nevoie. + Șterge prefixul Wine și memoria cache de shadere ale acestei aplicații de magazin (%1$s), cu autentificarea și salvările păstrate doar acolo. Jocurile care rulează în el primesc un prefix nou și poate fi nevoie să configurezi din nou aplicația. Salvările din cloud rămân în cont. + Se pot elibera %1$s + Cache-uri Linux și Steam + Fișiere temporare vechi, pachete descărcate și cache-ul web Steam + Fișiere temporare vechi + Pachete descărcate + Cache web Steam + Descărcări Steam deteriorate + Se recreează când e nevoie + Golește O aplicație de magazin și jocurile care rulează cu ea Folosit de %1$s Joc non-Steam %1$s - Nu corespunde niciunui joc, deci este păstrat Elimină selecția · %1$s Dezinstalează selecția · %1$s Prefixuri Wine diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c47125f62f..f03f4b301b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3419,10 +3419,19 @@ Общий префикс Steam Steam запускает здесь свои вспомогательные программы Windows Удаляет его (%1$s). Steam создаст новый, когда он снова понадобится. + Удаляет префикс Wine и кеш шейдеров этого приложения магазина (%1$s) вместе со входом в аккаунт и сохранениями, которые есть только там. Игры, работающие в нём, получат новый префикс, а приложение, возможно, придётся настроить заново. Облачные сохранения остаются в аккаунте. + Можно очистить %1$s + Кеши Linux и Steam + Старые временные файлы, скачанные пакеты и веб-кеш Steam + Старые временные файлы + Скачанные пакеты + Веб-кеш Steam + Повреждённые загрузки Steam + Создаются заново при необходимости + Очистить Приложение магазина и игры, которые с ним работают Используется: %1$s Игра не из Steam %1$s - Не сопоставлен с игрой, поэтому сохраняется Удалить выбранные · %1$s Удалить выбранные · %1$s Префиксы Wine diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 10f07aa95b..0db21cecce 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3345,10 +3345,19 @@ Steams delade prefix Steam kör sina egna Windows-hjälpprogram här Raderar det (%1$s). Steam skapar ett nytt nästa gång det behövs. + Tar bort den här butiksappens Wine-prefix och shadercache (%1$s), med inloggning och sparfiler som bara finns där. Spel som körs i det får ett nytt prefix, och du kan behöva konfigurera appen igen. Molnsparningar finns kvar på ditt konto. + %1$s kan rensas + Linux- och Steam-cacheminnen + Gamla tillfälliga filer, hämtade paket och Steams webbcache + Gamla tillfälliga filer + Hämtade paket + Steams webbcache + Skadade Steam-nedladdningar + Skapas igen vid behov + Rensa En butiksapp och spelen som körs med den Används av %1$s Icke-Steam-spel %1$s - Inte kopplat till något spel, så det behålls Ta bort valda · %1$s Avinstallera valda · %1$s Wine-prefix diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0962358734..902fbb36b7 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3316,10 +3316,19 @@ Prefix Steam ที่ใช้ร่วมกัน Steam รันตัวช่วย Windows ของตัวเองที่นี่ ลบ prefix นี้ (%1$s) Steam จะสร้างใหม่เมื่อต้องใช้ครั้งถัดไป + ลบ Wine prefix และแคชเชเดอร์ของแอปร้านค้านี้ (%1$s) พร้อมการลงชื่อเข้าใช้และเซฟที่อยู่ในนั้นเท่านั้น เกมที่รันในนั้นจะได้ prefix ใหม่ และคุณอาจต้องตั้งค่าแอปอีกครั้ง เซฟบนคลาวด์ยังอยู่ในบัญชีของคุณ + ล้างได้ %1$s + แคชของ Linux และ Steam + ไฟล์ชั่วคราวเก่า แพ็กเกจที่ดาวน์โหลด และแคชเว็บของ Steam + ไฟล์ชั่วคราวเก่า + แพ็กเกจที่ดาวน์โหลด + แคชเว็บของ Steam + ไฟล์ดาวน์โหลด Steam ที่เสียหาย + สร้างใหม่เมื่อจำเป็น + ล้าง แอปสโตร์และเกมที่ทำงานกับแอปนั้น ใช้โดย %1$s เกมนอก Steam %1$s - ไม่ตรงกับเกมใด จึงเก็บไว้ นำรายการที่เลือกออก · %1$s ถอนการติดตั้งรายการที่เลือก · %1$s Wine prefix diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 93544e4b67..9569a8ccdc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3345,10 +3345,19 @@ Steam\'in ortak öneki Steam kendi Windows yardımcılarını burada çalıştırır Siler (%1$s). Steam bir dahaki ihtiyacında yenisini oluşturur. + Bu mağaza uygulamasının Wine önekini ve gölgelendirici önbelleğini (%1$s), oturum açma bilgisi ve yalnızca orada duran kayıtlarla birlikte siler. İçinde çalışan oyunlar yeni bir önek alır ve uygulamayı yeniden kurmanız gerekebilir. Bulut kayıtları hesabınızda kalır. + %1$s temizlenebilir + Linux ve Steam önbellekleri + Eski geçici dosyalar, indirilen paketler ve Steam’in web önbelleği + Eski geçici dosyalar + İndirilen paketler + Steam web önbelleği + Hasarlı Steam indirmeleri + Gerektiğinde yeniden oluşturulur + Temizle Bir mağaza uygulaması ve onunla çalışan oyunlar Kullanan: %1$s Steam dışı oyun %1$s - Bir oyunla eşleşmedi, bu yüzden korunuyor Seçilenleri kaldır · %1$s Seçilenlerin yüklemesini kaldır · %1$s Wine önekleri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f33b299e17..a0cd852b61 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3419,10 +3419,19 @@ Спільний префікс Steam Steam запускає тут власні допоміжні програми Windows Видаляє його (%1$s). Steam створить новий, коли він знову знадобиться. + Видаляє префікс Wine і кеш шейдерів цього застосунку крамниці (%1$s) разом із входом в обліковий запис і збереженнями, що є лише там. Ігри, які в ньому працюють, отримають новий префікс, а застосунок, можливо, доведеться налаштувати знову. Хмарні збереження лишаються в обліковому записі. + Можна очистити %1$s + Кеші Linux і Steam + Старі тимчасові файли, завантажені пакети й вебкеш Steam + Старі тимчасові файли + Завантажені пакети + Вебкеш Steam + Пошкоджені завантаження Steam + Створюються знову за потреби + Очистити Застосунок магазину та ігри, які з ним працюють Використовується: %1$s Не-Steam гра %1$s - Не зіставлено з грою, тому зберігається Видалити вибрані · %1$s Видалити вибрані · %1$s Префікси Wine diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2b0435fef8..a5cf10eab6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3316,10 +3316,19 @@ Prefix Steam dùng chung Steam chạy các trình hỗ trợ Windows riêng tại đây Xóa prefix này (%1$s). Steam sẽ tạo prefix mới vào lần tới khi cần. + Xóa prefix Wine và bộ nhớ đệm shader của ứng dụng cửa hàng này (%1$s), cùng thông tin đăng nhập và các bản lưu chỉ có ở đó. Trò chơi chạy trong đó sẽ nhận prefix mới, và bạn có thể phải thiết lập lại ứng dụng. Bản lưu trên đám mây vẫn còn trong tài khoản của bạn. + Có thể dọn %1$s + Bộ nhớ đệm của Linux và Steam + Tệp tạm cũ, gói đã tải xuống và bộ nhớ đệm web của Steam + Tệp tạm cũ + Gói đã tải xuống + Bộ nhớ đệm web của Steam + Tệp tải xuống Steam bị hỏng + Được tạo lại khi cần + Dọn Một ứng dụng cửa hàng và các game chạy cùng nó Được dùng bởi %1$s Game ngoài Steam %1$s - Không khớp với game nào nên được giữ lại Gỡ mục đã chọn · %1$s Gỡ cài đặt mục đã chọn · %1$s Prefix Wine diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 31d9a2ffed..0ba97dd1ff 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3316,10 +3316,19 @@ Steam 的共享前缀 Steam 在此运行其自带的 Windows 辅助程序 删除该前缀(%1$s)。Steam 下次需要时会新建一个。 + 删除此商店应用的 Wine 前缀和着色器缓存(%1$s),包括其登录信息和仅存于其中的存档。在其中运行的游戏会获得新的前缀,你可能需要重新设置该应用。云存档仍保留在你的账户中。 + 可清理 %1$s + Linux 和 Steam 缓存 + 旧临时文件、已下载的软件包和 Steam 网页缓存 + 旧临时文件 + 已下载的软件包 + Steam 网页缓存 + 损坏的 Steam 下载 + 需要时会重新生成 + 清理 商店应用及通过它运行的游戏 由 %1$s 使用 非 Steam 游戏 %1$s - 未匹配到游戏,因此保留 移除所选 · %1$s 卸载所选 · %1$s Wine 前缀 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b19a92cd34..083c591954 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3313,10 +3313,19 @@ Steam 的共用前綴 Steam 在此執行其自帶的 Windows 輔助程式 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 刪除此商店應用程式的 Wine 前綴和著色器快取(%1$s),包括其登入資料和只存於其中的存檔。在其中執行的遊戲會獲得新的前綴,你可能需要重新設定該應用程式。雲端存檔仍會保留在你的帳戶中。 + 可清理 %1$s + Linux 和 Steam 快取 + 舊暫存檔、已下載的套件和 Steam 網頁快取 + 舊暫存檔 + 已下載的套件 + Steam 網頁快取 + 損壞的 Steam 下載 + 需要時會重新建立 + 清理 商店應用程式及透過它執行的遊戲 由 %1$s 使用 非 Steam 遊戲 %1$s - 未配對到任何遊戲,因此保留 移除所選 · %1$s 解除安裝所選 · %1$s Wine 前綴 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5d6a885a63..12fa80e1ef 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3313,10 +3313,19 @@ Steam 的共用前綴 Steam 在此執行其自帶的 Windows 輔助程式 刪除該前綴(%1$s)。Steam 下次需要時會新建一個。 + 刪除此商店應用程式的 Wine 前置詞和著色器快取(%1$s),包括其登入資訊和僅存於其中的存檔。在其中執行的遊戲會取得新的前置詞,你可能需要重新設定該應用程式。雲端存檔仍會保留在你的帳戶中。 + 可清除 %1$s + Linux 和 Steam 快取 + 舊暫存檔、已下載的套件和 Steam 網頁快取 + 舊暫存檔 + 已下載的套件 + Steam 網頁快取 + 損毀的 Steam 下載 + 需要時會重新建立 + 清除 商店應用程式及透過它執行的遊戲 由 %1$s 使用 非 Steam 遊戲 %1$s - 未配對到任何遊戲,因此保留 移除所選 · %1$s 解除安裝所選 · %1$s Wine 前綴 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36924a96c7..29e4d9428b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3622,10 +3622,19 @@ Steam’s shared prefix Steam runs its own Windows helpers here Deletes it (%1$s). Steam makes a new one the next time it needs it. + Deletes this store app’s Wine prefix and shader cache (%1$s), with its sign-in and any saves kept only there. Games that run in it get a fresh prefix, and you may need to set the app up again. Cloud saves stay in your account. + %1$s can be cleared + Linux and Steam caches + Old temporary files, downloaded packages and Steam’s web cache + Old temporary files + Downloaded packages + Steam web cache + Damaged Steam downloads + Made again when needed + Clear A store app and the games that run with it Used by %1$s Non-Steam game %1$s - Not matched to a game, so it is kept Remove selected · %1$s Uninstall selected · %1$s Wine prefixes diff --git a/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt new file mode 100644 index 0000000000..f4412a41cf --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/KeptPrefixRemovalTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.storage + +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = android.app.Application::class) +class KeptPrefixRemovalTest { + private val compat = File("/rootfs/root/.local/share/Steam/steamapps/compatdata") + + private fun kept(id: String, owner: PrefixOwner) = KeptPrefix(File(compat, id), owner, null, 1L shl 30, "Internal", false) + + private fun report(kept: List, storeFolders: List = emptyList()) = StorageReport( + 0, 0, 0, emptyMap(), 0, 0, 0, 0, emptyList(), emptyList(), emptyList(), emptyList(), 0, emptyList(), emptyList(), 0, + kept, true, storeFolders.map { StoreGameUsage(InstalledStoreGame(StoreGameSidecar(Store.BATTLENET, "pro", "Game", "Game.exe"), it), -1, false) }, + ) + + @Test fun launcherAndUnknownPrefixesCanBeRemoved() { + val launcher = kept("2929927072", PrefixOwner.LAUNCHER) + val unknown = kept("1234", PrefixOwner.UNKNOWN) + val r = report(listOf(launcher, unknown)) + assertTrue(StorageState.keptRemovable(r, launcher)) + assertTrue(StorageState.keptRemovable(r, unknown)) + assertTrue(StorageState.keptRemovable(r, kept("0", PrefixOwner.SHARED))) + } + + @Test fun aLauncherPrefixHoldingAnInstalledGameStays() { + val bnet = kept("2611429436", PrefixOwner.LAUNCHER) + val inside = File(bnet.dir, "pfx/drive_c/Program Files (x86)/Overwatch") + assertFalse(StorageState.keptRemovable(report(listOf(bnet), listOf(inside)), bnet)) + val elsewhere = File(compat, "2611429436-other/Overwatch") + assertTrue(StorageState.keptRemovable(report(listOf(bnet), listOf(elsewhere)), bnet)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt new file mode 100644 index 0000000000..0139a3b879 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/StorageSummaryTest.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.storage + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], application = android.app.Application::class) +class StorageSummaryTest { + @Test fun theSavedOverviewReadsBackAsWritten() { + val buckets = Bucket.entries.mapIndexed { i, b -> b to (i + 1) * 1_000_000_000L }.toMap() + val s = StorageSummary(42, 103L shl 30, 49L shl 30, buckets, 234L shl 20, 3, 1, 7L shl 30, 9L shl 20, 350L shl 20, + 12, 226L shl 20, 8, 73L shl 20, 0, 0, 105L shl 20, 9L shl 20, 8L shl 30) + val back = StorageSummary.fromJson(s.toJson())!! + assertEquals(s.toJson(), back.toJson()) + assertEquals(buckets, back.buckets) + assertEquals(s.droiddeck, back.droiddeck) + } + + @Test fun anOtherVersionOrDamagedFileReadsAsNone() { + assertNull(StorageSummary.fromJson("{\"v\":0}")) + assertNull(StorageSummary.fromJson("not json")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt b/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt new file mode 100644 index 0000000000..4c0ed681c5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/storage/SystemCachesTest.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.storage + +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SystemCachesTest { + @get:Rule val tmp = TemporaryFolder() + + private val now = 10L * 24 * 60 * 60 * 1000 + private val old = now - SystemCaches.TEMP_IDLE_MS - 1000 + + private fun file(path: String, modified: Long) = File(tmp.root, path).apply { parentFile!!.mkdirs(); writeText("x"); setLastModified(modified) } + + @Test fun onlyIdleVisibleTemporaryFilesAreCleared() { + file("rootfs/tmp/old.deb", old) + file("rootfs/tmp/oldDir/a", old).parentFile!!.setLastModified(old) + file("rootfs/tmp/busyDir/a", old) + file("rootfs/tmp/busyDir/b", now - 1000).parentFile!!.setLastModified(old) + file("rootfs/tmp/.X11-unix/X0", old).parentFile!!.setLastModified(old) + file("rootfs/tmp/fresh.log", now) + val found = SystemCaches.find(File(tmp.root, "rootfs"), emptyList(), now) + assertEquals(listOf("old.deb", "oldDir"), found.getValue(SystemCache.TEMP).map { it.name }.sorted()) + } + + @Test fun packagesAndSteamCachesAreFound() { + file("rootfs/var/cache/apt/archives/git_1_arm64.deb", now) + file("rootfs/var/cache/apt/archives/lock", now) + file("rootfs/var/cache/apt/archives/partial/perl.deb", now) + val steam = File(tmp.root, "rootfs/root/.local/share/Steam") + file("rootfs/root/.local/share/Steam/config/htmlcache/Cache/data_0", now) + file("rootfs/root/.local/share/Steam/steamapps/corrupt/1_2_ab_corrupt.chunk", now) + val found = SystemCaches.find(File(tmp.root, "rootfs"), listOf(steam, File(tmp.root, "missing")), now) + assertEquals(listOf("git_1_arm64.deb", "perl.deb"), found.getValue(SystemCache.PACKAGES).map { it.name }.sorted()) + assertEquals(listOf(File(steam, "config/htmlcache")), found.getValue(SystemCache.STEAM_WEB)) + assertEquals(listOf(File(steam, "steamapps/corrupt")), found.getValue(SystemCache.STEAM_CORRUPT)) + } + + @Test fun checkoutsAndTheirWorktreeRecordsAreFound() { + val rootfs = File(tmp.root, "rootfs") + File(rootfs, "root/DroidDeck/.git/worktrees/dd-pet").mkdirs() + file("rootfs/root/dd-pet/.git", now).writeText("gitdir: /root/DroidDeck/.git/worktrees/dd-pet\n") + file("rootfs/root/own/.git/HEAD", now) + file("rootfs/root/notes/readme", now) + file("rootfs/root/bad/.git", now).writeText("gitdir: /root/DroidDeck/.git/worktrees/../../../etc\n") + assertEquals(listOf("bad", "dd-pet", "own"), SystemCaches.checkouts(rootfs).map { it.name }.sorted()) + assertEquals(File(rootfs, "root/DroidDeck/.git/worktrees/dd-pet"), SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/dd-pet"))) + assertEquals(null, SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/own"))) + assertEquals(null, SystemCaches.worktreeRecord(rootfs, File(rootfs, "root/bad"))) + } +} From 674e0d6fa48c99527421dab719b7c38a8f2fdc82 Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 16:03:08 +0000 Subject: [PATCH 53/60] feat(agent): keep the unsent message across leaving the Agent tab (#2863) --- .../droiddeck/launcher/agent/AgentDraft.kt | 27 +++++++++++++++++++ .../com/droiddeck/launcher/ui/AgentPage.kt | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt new file mode 100644 index 0000000000..3a36be973a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentDraft.kt @@ -0,0 +1,27 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf + +/** The text typed in the Agent tab and not yet sent, kept across leaving the tab and restarts. */ +object AgentDraft { + private const val KEY = "draft" + private var state: MutableState? = null + + fun state(context: Context): MutableState = state ?: run { + val prefs = AgentHost.prefs(context.applicationContext) + val backing = mutableStateOf(prefs.getString(KEY, "") ?: "") + object : MutableState { + override var value: String + get() = backing.value + set(text) { + if (text == backing.value) return + backing.value = text + prefs.edit().apply { if (text.isEmpty()) remove(KEY) else putString(KEY, text) }.apply() + } + override fun component1() = value + override fun component2(): (String) -> Unit = { value = it } + }.also { state = it } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 01a486b574..225b81444a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -122,6 +122,7 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.DialogWindowProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.agent.AgentAttachments +import com.droiddeck.launcher.agent.AgentDraft import com.droiddeck.launcher.agent.AgentHost import com.droiddeck.launcher.agent.AgentHost.Entry import com.droiddeck.launcher.agent.AgentSetup @@ -207,7 +208,7 @@ private fun AgentPageContent( } remember { AgentSetup.check(context) } var setup by rememberSaveable { mutableStateOf(false) } - val draft = rememberSaveable { mutableStateOf("") } + val draft = remember { AgentDraft.state(context) } if (setup || AgentHost.state == AgentHost.State.MISSING || !(AgentSetup.ready || AgentSetup.completed(context))) { AgentSetupView(modifier, firstControl = inputModifier, onDone = { setup = false }) return From 786166ba1a28551d60469e7778a63f4ea18a087d Mon Sep 17 00:00:00 2001 From: FryMcNugget Date: Thu, 19 Nov 2026 16:03:56 +0000 Subject: [PATCH 54/60] fix(lab): Fast Lab builds no longer run out of memory compiling the app (#2862) --- tools/agent/dd-lab-build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/agent/dd-lab-build b/tools/agent/dd-lab-build index 33fa47d99f..459b12e640 100755 --- a/tools/agent/dd-lab-build +++ b/tools/agent/dd-lab-build @@ -116,10 +116,11 @@ if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null fi -# A full Kotlin compile of the app runs out of memory with 2.4 GB of heap, and Gradle needs about 1 GB, -# so devices with less memory to spare swap rather than fail. Both daemons end with this script's -# process when the build is done. -heap=${DD_LAB_HEAP_MB:-4096} +# A full Kotlin compile of the app runs out of memory with 2.7 GB of heap, and Gradle needs about 1 GB, +# so devices with less memory to spare swap rather than fail. This script does not stop either daemon: +# when the app runs it, proot's --kill-on-exit ends both with it; run by hand, they outlive it, and the +# Kotlin daemon stays warm for the next incremental compile. +heap=${DD_LAB_HEAP_MB:-6144} kotlin_heap=$(( heap * 2 / 3 )); gradle_heap=$(( heap - kotlin_heap )) # Only the Kotlin daemon compiles incrementally; in-process compiles always redo the whole app, and the From 1456c0529da101c5b49865591c2b7c78d4c46c7c Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 11:04:34 -0500 Subject: [PATCH 55/60] feat(agent): launch and quit store games, list the library, and run Xbox and cloud save commands from droiddeckctl (#2860) --- .../launcher/agent/AgentBridgeProvider.kt | 3 + .../droiddeck/launcher/agent/AgentStores.kt | 91 +++++++++++++++++++ .../session/EnhancedSessionLogShare.kt | 5 +- docs/agent-control.md | 25 ++++- tools/droiddeckctl | 85 ++++++++++++++++- tools/tests/test_droiddeckctl.py | 54 +++++++++++ 6 files changed, 255 insertions(+), 8 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt index 93922c8050..1b57562273 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentBridgeProvider.kt @@ -76,6 +76,9 @@ class AgentBridgeProvider : ContentProvider() { "stop" -> stop(context) "resume" -> resume(context) "launch" -> launch(context, request) + "library" -> AgentStores.library(context, request) + "xodus" -> AgentStores.xodus(context, request) + "cloud" -> AgentStores.cloud(context, request) "focus" -> guest(context, JSONObject().put("kind", "focus"), 15_000) "quit" -> guest(context, JSONObject().put("kind", "quit").put("appId", request.opt("appId")) .put("timeout", request.optDouble("timeout", 15.0)), timeoutMs(request, 15.0, 30_000)) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt new file mode 100644 index 0000000000..82ce426c88 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentStores.kt @@ -0,0 +1,91 @@ +package com.droiddeck.launcher.agent + +import android.content.Context +import com.droiddeck.launcher.frontend.LibraryCache +import com.droiddeck.launcher.stores.CloudSaves +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.xbox.Xodus +import java.io.ByteArrayOutputStream +import java.io.InputStream +import java.util.concurrent.TimeUnit +import org.json.JSONArray +import org.json.JSONObject + +internal object AgentStores { + private const val OUTPUT_CAP = 160 * 1024 + + fun library(context: Context, request: JSONObject): JSONObject { + val query = request.optString("query").trim() + val source = request.optString("source").trim() + val games = JSONArray() + LibraryCache.load(context) + .filter { (query.isEmpty() || it.name.contains(query, ignoreCase = true)) && (source.isEmpty() || it.source.equals(source, ignoreCase = true)) } + .forEach { + games.put(JSONObject().put("id", it.gameIdString).put("name", it.name).put("source", it.source) + .put("storeId", it.storeId ?: JSONObject.NULL).put("folder", it.gameFiles?.path ?: JSONObject.NULL)) + } + return JSONObject().put("ok", true).put("command", "library").put("games", games) + } + + fun xodus(context: Context, request: JSONObject): JSONObject { + AgentAccess.requireCommands(context) + val list = request.optJSONArray("args") + val args = if (list == null) emptyList() else List(list.length()) { list.optString(it) } + if (args.isEmpty() || args.any { it.isEmpty() }) throw AgentException("INVALID_REQUEST", "xodus needs its arguments") + val timeoutMs = (request.optDouble("timeout", 120.0) * 1000).toLong().coerceIn(1_000L, 900_000L) + return Xodus.start(context.applicationContext, args).use { child -> + val out = Tail(child.process.inputStream) + val err = Tail(child.process.errorStream) + val finished = child.process.waitFor(timeoutMs, TimeUnit.MILLISECONDS) + if (!finished) child.close() + JSONObject().put("ok", true).put("command", "xodus").put("timedOut", !finished) + .put("exit", if (finished) child.process.exitValue() else JSONObject.NULL) + .put("stdout", out.text()).put("stderr", err.text()) + } + } + + fun cloud(context: Context, request: JSONObject): JSONObject { + AgentAccess.requireCommands(context) + val store = Store.byId(request.optString("store"))?.takeIf(CloudSaves::supports) + ?: throw AgentException("INVALID_REQUEST", "store must be one with cloud saves") + val id = request.optString("id").ifEmpty { throw AgentException("INVALID_REQUEST", "cloud needs a game id") } + val force = request.optBoolean("force") + val result = when (val direction = request.optString("direction")) { + "down" -> CloudSaves.download(context.applicationContext, store, id, force) + "up" -> CloudSaves.upload(context.applicationContext, store, id, force) + else -> throw AgentException("INVALID_REQUEST", "direction '$direction' is not down or up") + } + return JSONObject().put("ok", true).put("command", "cloud").put("result", result.result).put("files", result.files) + .put("bytes", result.bytes).put("reason", result.reason).put("conflicts", result.conflicts).put("detail", result.detail) + } + + private class Tail(stream: InputStream) { + private val kept = ByteArrayOutputStream() + private var dropped = false + private val reader = Thread({ + val buffer = ByteArray(8192) + stream.use { input -> + while (true) { + val n = runCatching { input.read(buffer) }.getOrDefault(-1) + if (n < 0) break + synchronized(kept) { + kept.write(buffer, 0, n) + if (kept.size() > OUTPUT_CAP * 2) { + val bytes = kept.toByteArray() + kept.reset() + kept.write(bytes, bytes.size - OUTPUT_CAP, OUTPUT_CAP) + dropped = true + } + } + } + } + }, "agent-xodus-output").apply { isDaemon = true; start() } + + fun text(): String { + reader.join(2_000) + val bytes = synchronized(kept) { kept.toByteArray() } + val tail = if (bytes.size > OUTPUT_CAP) bytes.copyOfRange(bytes.size - OUTPUT_CAP, bytes.size) else bytes + return (if (dropped || bytes.size > OUTPUT_CAP) "...\n" else "") + String(tail, Charsets.UTF_8) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt index 6f9f364539..b437f3ae4e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/EnhancedSessionLogShare.kt @@ -708,10 +708,10 @@ internal object EnhancedSessionLogShare { } val logs = LinuxRuntime.logDir(context) for ((name, root) in listOf(SessionLogShare.STORES_DIR to File(logs, SessionLogShare.STORES_DIR), SessionPaths.TOOLS_DIR to File(logs, SessionPaths.TOOLS_DIR))) { - val scan = directFiles(root, remaining(maxFiles, out.size)) + val scan = directFiles(root, STORE_LOG_SCAN) truncated = truncated || scan.truncated partial = partial || scan.partial - scan.files.asSequence().filter { recent(it) } + scan.files.filter { recent(it) }.sortedByDescending { it.lastModified() }.take(remaining(maxFiles, out.size)) .forEach { add(it, root, "$name/${it.name}", name) } } if (legacy) { @@ -965,6 +965,7 @@ internal object EnhancedSessionLogShare { "events.jsonl", "memory.csv", "capture.json", "crash.log", ) private const val RECENT_MILLIS = 7L * 24 * 60 * 60 * 1000 + private const val STORE_LOG_SCAN = 512 private const val COPY_BUFFER_BYTES = 64 * 1024 private const val TRACE_SCAN_BYTES = 16L * 1024 * 1024 private const val LEGACY_LOG_MAX_BYTES = 8L * 1024 * 1024 diff --git a/docs/agent-control.md b/docs/agent-control.md index ed9fbcf1e3..13bf1c232d 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -122,9 +122,12 @@ tools/droiddeckctl stop tools/droiddeckctl resume tools/droiddeckctl launch 489830 --wait +tools/droiddeckctl library --source xbox +tools/droiddeckctl launch --game "dead space" --wait tools/droiddeckctl wait focused 489830 tools/droiddeckctl wait game tools/droiddeckctl quit 489830 +tools/droiddeckctl quit tools/droiddeckctl focus tools/droiddeckctl input key ENTER @@ -145,6 +148,10 @@ tools/droiddeckctl ui click --match "Play" tools/droiddeckctl ui set-text some-field --text abc tools/droiddeckctl guest -- xprop -root GAMESCOPE_FOCUSED_APP +tools/droiddeckctl native -- ls /usr/local/lib/droiddeck-xbox +tools/droiddeckctl xodus --timeout 60 -- resolve-package 9N51S9QZMSB6 --json --market US +tools/droiddeckctl cloud down ubisoft 92c79ab6-a69a-411d-ba2b-625ab104235d +tools/droiddeckctl cloud up ea DR:105641400 --force tools/droiddeckctl cdp targets tools/droiddeckctl cdp eval 'SteamClient.Apps.GetMyRunningApps?.()' tools/droiddeckctl env set DXVK_HUD=fps @@ -209,9 +216,24 @@ every 10 s until the battery is under that temperature, so runs being compared s `input` needs a session that has drawn its first frame. Pad input goes through the session screen's virtual pad, the same one the on-screen controls drive, so games that ignore touch still respond. -`launch`, `quit` and `cdp` need a Steam session; `focus` and `wait focused` need gamescope (every +`launch` with an app id and `cdp` need a Steam session; `focus` and `wait focused` need gamescope (every mode except the desktop). +Store and added games (Xbox, EA, Ubisoft, GOG, Epic, Battle.net, Rockstar, a folder added by hand) are +launched by their library id, the same `droiddeck://game/` link a home screen shortcut opens, so +they go through the front end's own launch path and start a session when none is running. `library` +lists the ids with each game's name, source, store id and folder (`--query` and `--source` narrow it), +and `launch --game` takes an id or a unique part of a name; an ambiguous name exits with +`GAME_AMBIGUOUS` and lists the matches. With `--wait` it returns once a game other than the Steam +client has focus. `quit` without an id quits the focused game, so store games close the same way. + +`xodus` runs the Xbox backend with the app's own credentials and runtime, as the Xbox store does, +and returns its exit code with the last 160 KiB of stdout and stderr (`--timeout` stops it). +`cloud down|up ` syncs one game's cloud saves now, without launching it, with the +`result`, `files`, `bytes`, `reason`, `conflicts` and `detail` the game page shows; `--force` takes +that side over conflicts. The store id is the one in the game's install record (`library` shows +it). Both need Setup > Developer > Debugging tools. + `input pen` does not go through the app. It registers a virtual pen with `adb shell uinput -`, so Android's own input reader makes the stylus events, as for a built-in pen, and it works on whatever is on screen, without a session or Setup > Developer > Debugging tools. Positions are fractions of @@ -402,6 +424,7 @@ Automator show them: | Tag | Where | |---|---| | `rail-steam`, `rail-games` (the Library), `rail-desktop`, `rail-store`, `rail-components`, `rail-android-apps`, `rail-setup`, `rail-updates` | the front end's rail | +| `dual-rail-` (`dual-rail-games`, `dual-rail-downloads`, ...) | the rail on the second screen of a dual-screen device | | `play-steam` | Play on the Steam page, and on the Library when it has no games | | `library-source-` | the Library's source filter chips (`all`, `steam`, `gog`, ...) | | `game-tab-` | the open tab of a game page | diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 15675a1797..50ff42423d 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -153,6 +153,31 @@ def checked(response: dict, default_code: str) -> dict: return response +def find_game(adb: str, serial: str, wanted: str) -> dict: + games = checked(provider_call(adb, serial, "library", request={}), "LIBRARY_FAILED").get("games") or [] + exact = [g for g in games if g.get("id") == wanted] + if exact: + return exact[0] + named = [g for g in games if wanted.casefold() in str(g.get("name", "")).casefold()] + if len(named) == 1: + return named[0] + if not named: + raise ControlError(f"No library game matches {wanted!r}; list them with library", "GAME_NOT_FOUND") + names = ", ".join(f"{g.get('name')} ({g.get('id')})" for g in named[:10]) + raise ControlError(f"{wanted!r} matches {len(named)} games: {names}", "GAME_AMBIGUOUS") + + +def open_game_link(adb: str, serial: str, game_id: str) -> None: + if not game_id.isdigit(): + raise ControlError(f"Library id {game_id!r} is not a number", "INVALID_GAME_ID") + result = run_adb(adb, serial, "shell", "am", "start", "-W", "-a", "android.intent.action.VIEW", + "-d", f"droiddeck://game/{game_id}", "-n", f"{PACKAGE}/com.droiddeck.launcher.FrontEndActivity", + timeout=60) + output = (result.stdout + result.stderr).decode(errors="replace") + if result.returncode != 0 or "error" in output.lower(): + raise ControlError(output.strip() or "The game link did not open", "ACTIVITY_START_FAILED") + + def start_agent_activity(adb: str, serial: str, request: dict) -> None: encoded = encode_request(request) result = run_adb( @@ -949,6 +974,17 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: return add_serial(checked(provider_call(adb, serial, "resume"), "RESUME_FAILED"), serial) if command == "launch": + if (args.app_id is None) == (args.game is None): + raise ControlError("launch takes a Steam app id or --game, not both", "INVALID_ARGUMENTS") + if args.game is not None: + game = find_game(adb, serial, args.game) + open_game_link(adb, serial, game["id"]) + response = {"ok": True, "command": "launch", "game": game} + if args.wait: + state = wait_until(adb, serial, f"{game['name']} to have focus", + lambda s: focused(s, None), args.timeout, 0.5) + response["focus"] = state["session"].get("focus") + return add_serial(response, serial) response = checked(provider_call(adb, serial, "launch", request={"appId": str(args.app_id)}), "LAUNCH_FAILED") if args.wait: state = wait_until(adb, serial, f"app {args.app_id} to have focus", @@ -957,10 +993,33 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: return add_serial(response, serial) if command == "quit": - response = provider_call(adb, serial, "quit", request={"appId": args.app_id, "timeout": args.timeout}, + app_id = args.app_id + if app_id is None: + current = (get_state(adb, serial)["session"].get("focus") or {}).get("focusedApp") + if current in (None, 0, STEAM_CLIENT_APP): + raise ControlError("No game has focus; name the app id to quit", "NO_FOCUSED_GAME") + app_id = current + response = provider_call(adb, serial, "quit", request={"appId": app_id, "timeout": args.timeout}, timeout=args.timeout + 40) return add_serial(checked(response, "QUIT_FAILED"), serial) + if command == "library": + request = {"query": args.query or "", "source": args.source or ""} + return add_serial(checked(provider_call(adb, serial, "library", request=request), "LIBRARY_FAILED"), serial) + + if command == "xodus": + argv = args.argv[1:] if args.argv[:1] == ["--"] else args.argv + if not argv: + raise ControlError("xodus needs its arguments after --", "INVALID_ARGUMENTS") + response = provider_call(adb, serial, "xodus", request={"args": argv, "timeout": args.timeout}, + timeout=args.timeout + 30) + return add_serial(checked(response, "XODUS_FAILED"), serial) + + if command == "cloud": + request = {"direction": args.direction, "store": args.store, "id": args.game_id, "force": args.force} + response = provider_call(adb, serial, "cloud", request=request, timeout=args.timeout) + return add_serial(checked(response, "CLOUD_FAILED"), serial) + if command == "focus": return add_serial(checked(provider_call(adb, serial, "focus", timeout=40), "FOCUS_FAILED"), serial) @@ -1224,15 +1283,31 @@ def build_parser() -> argparse.ArgumentParser: stop.add_argument("--artifact-timeout", type=float, default=300) commands.add_parser("resume", help="resume a suspended session") - launch = commands.add_parser("launch", help="launch a Steam game in the running Steam session") - launch.add_argument("app_id", type=int) + launch = commands.add_parser("launch", help="launch a Steam game in the running Steam session, or any library game with --game") + launch.add_argument("app_id", type=int, nargs="?") + launch.add_argument("--game", help="a library game id or a unique part of its name (store and added games too)") launch.add_argument("--wait", action="store_true", help="wait until the game has focus") launch.add_argument("--timeout", type=float, default=180) - quit_ = commands.add_parser("quit", help="quit a running game (through the client, then signals)") - quit_.add_argument("app_id", type=int) + quit_ = commands.add_parser("quit", help="quit a running game (through the client, then signals); the focused one by default") + quit_.add_argument("app_id", type=int, nargs="?") quit_.add_argument("--timeout", type=float, default=15) + library = commands.add_parser("library", help="the library games the front end lists, with the ids launch --game takes") + library.add_argument("--query", help="only games whose name contains this") + library.add_argument("--source", help="only games from this source, e.g. steam, xbox, ea, ubisoft, gog, epic") + + xodus = commands.add_parser("xodus", help="run the Xbox backend with the app's credentials (debugging tools)") + xodus.add_argument("--timeout", type=float, default=120) + xodus.add_argument("argv", nargs=argparse.REMAINDER) + + cloud = commands.add_parser("cloud", help="sync a store game's cloud saves now (debugging tools)") + cloud.add_argument("direction", choices=["down", "up"]) + cloud.add_argument("store", help="gog, epic, ea or ubisoft") + cloud.add_argument("game_id", help="the store's id for the game, as its install record names it") + cloud.add_argument("--force", action="store_true", help="take this side even over conflicts") + cloud.add_argument("--timeout", type=float, default=300) + commands.add_parser("focus", help="gamescope's focus and every Xwayland server's windows, fresh") guest = commands.add_parser("guest", help="run a command inside the session (debugging tools)") diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index 9dd7dff676..59f187a7f5 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -274,6 +274,60 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual(0, code) self.assertEqual(489830, out["focus"]["focusedApp"]) + LIBRARY = {"ok": True, "command": "library", "games": [ + {"id": "9227380185612091392", "name": "TimeSplitters Future Perfect", "source": "xbox", "storeId": "9N51S9QZMSB6", "folder": "/g/ts"}, + {"id": "12302733539203571712", "name": "Dead Space (2008)", "source": "ea", "storeId": "DR:105641400", "folder": "/g/ds"}, + {"id": "12302733539203571999", "name": "Dead Space 2", "source": "ea", "storeId": "DR:1", "folder": "/g/ds2"}, + ]} + + def test_launch_by_name_opens_the_game_link_and_waits_for_a_game(self): + self.configure({"library": self.LIBRARY, "state": [state(focused=769, focusable=[769]), state(focused=7, focusable=[7, 769])]}) + code, out = self.run_ctl("launch", "--game", "timesplitters", "--wait", "--timeout", "5") + self.assertEqual(0, code) + self.assertEqual("TimeSplitters Future Perfect", out["game"]["name"]) + self.assertEqual(7, out["focus"]["focusedApp"]) + started = [e["args"] for e in self.calls() if e["args"][:3] == ["shell", "am", "start"]] + self.assertIn("droiddeck://game/9227380185612091392", started[0]) + self.assertIn("com.droiddeck.launcher/com.droiddeck.launcher.FrontEndActivity", started[0]) + self.assertFalse(self.calls("launch")) + + def test_launch_by_name_refuses_an_ambiguous_or_missing_game(self): + self.configure({"library": self.LIBRARY}) + code, out = self.run_ctl("launch", "--game", "dead space") + self.assertNotEqual(0, code) + self.assertEqual("GAME_AMBIGUOUS", out["error"]["code"]) + self.assertIn("Dead Space 2 (12302733539203571999)", out["error"]["message"]) + code, out = self.run_ctl("launch", "--game", "12302733539203571712") + self.assertEqual(0, code) + self.assertEqual("ea", out["game"]["source"]) + code, out = self.run_ctl("launch", "--game", "halo") + self.assertEqual("GAME_NOT_FOUND", out["error"]["code"]) + code, out = self.run_ctl("launch") + self.assertEqual("INVALID_ARGUMENTS", out["error"]["code"]) + self.assertFalse([e for e in self.calls() if e["args"][:3] == ["shell", "am", "start"] and "droiddeck://game/12302733539203571999" in e["args"]]) + + def test_quit_without_an_app_quits_the_focused_game(self): + self.configure({"state": state(focused=4040, focusable=[4040, 769]), "quit": {"ok": True, "command": "quit"}}) + code, _ = self.run_ctl("quit") + self.assertEqual(0, code) + self.assertEqual(4040, self.calls("quit")[0]["request"]["appId"]) + self.configure({"state": state(focused=769, focusable=[769])}) + code, out = self.run_ctl("quit") + self.assertEqual("NO_FOCUSED_GAME", out["error"]["code"]) + self.assertEqual(1, len(self.calls("quit"))) + + def test_library_xodus_and_cloud_pass_their_requests(self): + self.configure({"library": self.LIBRARY, "xodus": {"ok": True, "command": "xodus", "exit": 0, "stdout": "{}", "stderr": ""}, + "cloud": {"ok": True, "command": "cloud", "result": "ok", "files": 2, "reason": "downloaded"}}) + self.assertEqual(0, self.run_ctl("library", "--source", "ea", "--query", "dead")[0]) + self.assertEqual({"query": "dead", "source": "ea"}, self.calls("library")[0]["request"]) + self.assertEqual(0, self.run_ctl("xodus", "--timeout", "30", "--", "license", "abc", "--market", "US")[0]) + self.assertEqual({"args": ["license", "abc", "--market", "US"], "timeout": 30.0}, self.calls("xodus")[0]["request"]) + code, out = self.run_ctl("cloud", "down", "ubisoft", "92c79ab6", "--force") + self.assertEqual(0, code) + self.assertEqual("downloaded", out["reason"]) + self.assertEqual({"direction": "down", "store": "ubisoft", "id": "92c79ab6", "force": True}, self.calls("cloud")[0]["request"]) + def test_start_reuse_keeps_a_running_session(self): running = state(focused=769) running["session"]["mode"] = "steam" From 8f34554516e58029aa4eed6fffff0464139c7c9d Mon Sep 17 00:00:00 2001 From: Tushar Gandhe <19225304+2-Shar@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:36:19 +0530 Subject: [PATCH 56/60] feat(game): shape the tab bar's LB and RB keys to the bar's rounded ends (#2856) --- .../com/droiddeck/launcher/ui/GameDetail.kt | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index edd95faab4..9697fc289d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -79,6 +79,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight @@ -359,7 +360,7 @@ private fun GameTabBar( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Row(modifier.fillMaxWidth().glass(CircleShape).padding(4.dp), verticalAlignment = Alignment.CenterVertically) { - if (bumpers) BumperKey("LB", stringResource(R.string.widgets_prev_tab)) { onSelect((selected + tabs.size - 1) % tabs.size) } + if (bumpers) TabBarBumper("LB", stringResource(R.string.widgets_prev_tab), leading = true) { onSelect((selected + tabs.size - 1) % tabs.size) } tabs.forEachIndexed { i, label -> val on = i == selected val src = remember { MutableInteractionSource() } @@ -383,7 +384,30 @@ private fun GameTabBar( ) } } - if (bumpers) BumperKey("RB", stringResource(R.string.widgets_next_tab)) { onSelect((selected + 1) % tabs.size) } + if (bumpers) TabBarBumper("RB", stringResource(R.string.widgets_next_tab), leading = false) { onSelect((selected + 1) % tabs.size) } + } +} + +@Composable +private fun TabBarBumper(label: String, description: String, leading: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val round = 22.dp + val flat = 7.dp + val cap = if (leading) RoundedCornerShape(round, flat, flat, round) else RoundedCornerShape(flat, round, round, flat) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(start = if (leading) 0.dp else 3.dp, end = if (leading) 3.dp else 0.dp) + .size(width = 46.dp, height = 44.dp) + .clip(cap).background(colors.surfaceVariant).border(1.dp, pal.line2, cap) + .focusProperties { canFocus = false } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, role = Role.Button, onClick = onClick) + .semantics { contentDescription = description }, + ) { + Text( + label, fontSize = 12.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant, + modifier = Modifier.padding(start = if (leading) 4.dp else 0.dp, end = if (leading) 0.dp else 4.dp), + ) } } From 71989b4cdb745e93e6dad499336511f1b8bdc6f7 Mon Sep 17 00:00:00 2001 From: LunaDL <91587464+EnzoDLofi@users.noreply.github.com> Date: Thu, 19 Nov 2026 12:07:55 -0400 Subject: [PATCH 57/60] Feat: Adds customizable theme and fix inner gamer theme (#2850) --- .../launcher/session/SessionPrefs.kt | 39 +++++++++++ .../droiddeck/launcher/ui/FrontEndSetup.kt | 40 +++++++++++ .../java/com/droiddeck/launcher/ui/Theme.kt | 67 ++++++++++++++++++- app/src/main/res/values-ar/strings.xml | 14 ++++ app/src/main/res/values-b+es+419/strings.xml | 14 ++++ app/src/main/res/values-bg/strings.xml | 14 ++++ app/src/main/res/values-cs/strings.xml | 14 ++++ app/src/main/res/values-da/strings.xml | 14 ++++ app/src/main/res/values-de/strings.xml | 14 ++++ app/src/main/res/values-el/strings.xml | 14 ++++ app/src/main/res/values-es/strings.xml | 14 ++++ app/src/main/res/values-fi/strings.xml | 14 ++++ app/src/main/res/values-fr/strings.xml | 14 ++++ app/src/main/res/values-hi/strings.xml | 14 ++++ app/src/main/res/values-hu/strings.xml | 14 ++++ app/src/main/res/values-in/strings.xml | 14 ++++ app/src/main/res/values-it/strings.xml | 14 ++++ app/src/main/res/values-ja/strings.xml | 14 ++++ app/src/main/res/values-ko/strings.xml | 14 ++++ app/src/main/res/values-ms/strings.xml | 14 ++++ app/src/main/res/values-nb/strings.xml | 14 ++++ app/src/main/res/values-nl/strings.xml | 14 ++++ app/src/main/res/values-pl/strings.xml | 14 ++++ app/src/main/res/values-pt-rPT/strings.xml | 14 ++++ app/src/main/res/values-pt/strings.xml | 14 ++++ app/src/main/res/values-ro/strings.xml | 14 ++++ app/src/main/res/values-ru/strings.xml | 14 ++++ app/src/main/res/values-sv/strings.xml | 14 ++++ app/src/main/res/values-th/strings.xml | 14 ++++ app/src/main/res/values-tr/strings.xml | 14 ++++ app/src/main/res/values-uk/strings.xml | 14 ++++ app/src/main/res/values-vi/strings.xml | 14 ++++ app/src/main/res/values-zh-rCN/strings.xml | 14 ++++ app/src/main/res/values-zh-rHK/strings.xml | 14 ++++ app/src/main/res/values-zh-rTW/strings.xml | 14 ++++ app/src/main/res/values/strings.xml | 14 ++++ .../droiddeck/launcher/ui/ThemeColorsTest.kt | 41 ++++++++++++ docs/development/themes.md | 27 +++++--- 38 files changed, 663 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 3e37adb58e..5c9d0eb178 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1534,6 +1534,45 @@ object SessionPrefs { prefs(context).edit().putInt("gradientPrimary", primary).putInt("gradientSecondary", secondary).apply() } + fun customThemeColors(context: Context): com.droiddeck.launcher.ui.CustomThemeColors = + prefs(context).let { p -> + val defaults = com.droiddeck.launcher.ui.CustomThemeColors() + com.droiddeck.launcher.ui.CustomThemeColors( + background = p.getInt("customThemeBackground", defaults.background), + surface = p.getInt("customThemeSurface", defaults.surface), + surfaceVariant = p.getInt("customThemeSurfaceVariant", defaults.surfaceVariant), + line = p.getInt("customThemeLine", defaults.line), + line2 = p.getInt("customThemeLine2", defaults.line2), + onBackground = p.getInt("customThemeOnBackground", defaults.onBackground), + onSurfaceVariant = p.getInt("customThemeOnSurfaceVariant", defaults.onSurfaceVariant), + primary = p.getInt("customThemePrimary", defaults.primary), + onPrimary = p.getInt("customThemeOnPrimary", defaults.onPrimary), + signal = p.getInt("customThemeSignal", defaults.signal), + good = p.getInt("customThemeGood", defaults.good), + error = p.getInt("customThemeError", defaults.error), + ) + } + + fun setCustomThemeColors( + context: Context, + colors: com.droiddeck.launcher.ui.CustomThemeColors, + ) { + prefs(context).edit() + .putInt("customThemeBackground", colors.background) + .putInt("customThemeSurface", colors.surface) + .putInt("customThemeSurfaceVariant", colors.surfaceVariant) + .putInt("customThemeLine", colors.line) + .putInt("customThemeLine2", colors.line2) + .putInt("customThemeOnBackground", colors.onBackground) + .putInt("customThemeOnSurfaceVariant", colors.onSurfaceVariant) + .putInt("customThemePrimary", colors.primary) + .putInt("customThemeOnPrimary", colors.onPrimary) + .putInt("customThemeSignal", colors.signal) + .putInt("customThemeGood", colors.good) + .putInt("customThemeError", colors.error) + .apply() + } + fun trueBlackHighlight(context: Context): Int = prefs(context).getInt("trueBlackHighlight", com.droiddeck.launcher.ui.Themes.DEFAULT_HIGHLIGHT) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index 9f457566bb..8815ea43ac 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -437,6 +437,7 @@ internal fun SetupPanel( } if (s.theme == Themes.INNER_GAMER) RgbSpeedRow() if (s.theme == Themes.GRADIENT) GradientColorRows() + if (s.theme == Themes.CUSTOM) CustomColorRows() if (s.theme == Themes.TRUE_BLACK) HighlightColorRow() ChoiceRow( host, "app-scale", stringResource(R.string.setup_app_scale), stringResource(R.string.setup_app_scale_hint), @@ -1212,3 +1213,42 @@ private fun GradientColorRows() { if (picking == 1) Themes.setGradient(ctx, argb, secondary) else Themes.setGradient(ctx, primary, argb) } } + +@Composable +private fun CustomColorRows() { + val ctx = androidx.compose.ui.platform.LocalContext.current.applicationContext + val colors = Themes.customColors + var picking by remember { mutableStateOf(null) } + + val rows = listOf( + Triple("background", stringResource(R.string.theme_custom_background), colors.background), + Triple("surface", stringResource(R.string.theme_custom_surface), colors.surface), + Triple("surfaceVariant", stringResource(R.string.theme_custom_surface_variant), colors.surfaceVariant), + Triple("line", stringResource(R.string.theme_custom_line), colors.line), + Triple("line2", stringResource(R.string.theme_custom_line2), colors.line2), + Triple("onBackground", stringResource(R.string.theme_custom_on_background), colors.onBackground), + Triple("onSurfaceVariant", stringResource(R.string.theme_custom_on_surface_variant), colors.onSurfaceVariant), + Triple("primary", stringResource(R.string.theme_custom_primary), colors.primary), + Triple("onPrimary", stringResource(R.string.theme_custom_on_primary), colors.onPrimary), + Triple("signal", stringResource(R.string.theme_custom_signal), colors.signal), + Triple("good", stringResource(R.string.theme_custom_good), colors.good), + Triple("error", stringResource(R.string.theme_custom_error), colors.error), + ) + + rows.forEach { (key, label, argb) -> + SettingsRow(label, null) { + ColorCube(Color(argb), label) { picking = key } + } + } + + val selected = rows.firstOrNull { it.first == picking } + if (selected != null) { + ColorPickerDialog( + selected.second, + selected.third, + onDismiss = { picking = null }, + ) { argb -> + Themes.setCustomColor(ctx, selected.first, argb) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 6b4dd7d99a..8cf7013d0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -41,6 +41,21 @@ class Palette( val good: Color, val error: Color = Color(0xFFFF8A80), ) +data class CustomThemeColors( + val background: Int = 0xFF0A0B0D.toInt(), + val surface: Int = 0xFF121417.toInt(), + val surfaceVariant: Int = 0xFF1A1D22.toInt(), + val line: Int = 0xFF262A31.toInt(), + val line2: Int = 0xFF343A43.toInt(), + val onBackground: Int = 0xFFF2F4F7.toInt(), + val onSurfaceVariant: Int = 0xFF9AA3AF.toInt(), + val primary: Int = 0xFF1A9FFF.toInt(), + val onPrimary: Int = 0xFF03111F.toInt(), + val signal: Int = 0xFF1A9FFF.toInt(), + val good: Int = 0xFF4CD37F.toInt(), + val error: Int = 0xFFFF8A80.toInt(), +) + object Themes { const val GRAPHITE = "graphite" const val PAPER = "paper" @@ -48,6 +63,7 @@ object Themes { const val ELECTRIC = "electric" const val INNER_GAMER = "inner_gamer" const val GRADIENT = "gradient" + const val CUSTOM = "custom" const val DEFAULT_PRIMARY = 0xFF8B5CF6.toInt() const val DEFAULT_SECONDARY = 0xFF22D3EE.toInt() @@ -55,6 +71,9 @@ object Themes { var gradientColors by mutableStateOf(DEFAULT_PRIMARY to DEFAULT_SECONDARY) private set + var customColors by mutableStateOf(CustomThemeColors()) + private set + const val RGB_SPEEDS = 10 const val DEFAULT_RGB_SPEED = 3 const val RGB_HUE_STEP = 3f @@ -87,6 +106,7 @@ object Themes { gradientColors = SessionPrefs.gradientColors(context) rgbSpeed = SessionPrefs.rgbSpeed(context) trueBlackHighlight = SessionPrefs.trueBlackHighlight(context) + customColors = SessionPrefs.customThemeColors(context) } fun setTrueBlackHighlight(context: Context, highlight: Int) { @@ -104,9 +124,51 @@ object Themes { gradientColors = primary to secondary } + fun setCustomColors(context: Context, colors: CustomThemeColors) { + SessionPrefs.setCustomThemeColors(context, colors) + customColors = colors + } + + fun setCustomColor(context: Context, key: String, color: Int) { + val current = customColors + val updated = when (key) { + "background" -> current.copy(background = color) + "surface" -> current.copy(surface = color) + "surfaceVariant" -> current.copy(surfaceVariant = color) + "line" -> current.copy(line = color) + "line2" -> current.copy(line2 = color) + "onBackground" -> current.copy(onBackground = color) + "onSurfaceVariant" -> current.copy(onSurfaceVariant = color) + "primary" -> current.copy(primary = color) + "onPrimary" -> current.copy(onPrimary = color) + "signal" -> current.copy(signal = color) + "good" -> current.copy(good = color) + "error" -> current.copy(error = color) + else -> return + } + setCustomColors(context, updated) + } + + private fun customPalette(colors: CustomThemeColors): Palette = Palette( + CUSTOM, R.string.theme_custom, R.string.theme_custom_detail, + background = Color(colors.background), + surface = Color(colors.surface), + surfaceVariant = Color(colors.surfaceVariant), + line = Color(colors.line), + line2 = Color(colors.line2), + onBackground = Color(colors.onBackground), + onSurfaceVariant = Color(colors.onSurfaceVariant), + primary = Color(colors.primary), + primary2 = Color(colors.primary), + onPrimary = Color(colors.onPrimary), + signal = Color(colors.signal), + good = Color(colors.good), + error = Color(colors.error), + ) + fun current(context: Context): Palette { val id = SessionPrefs.theme(context) - if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK) loadGradient(context) + if (id == GRADIENT || id == INNER_GAMER || id == TRUE_BLACK || id == CUSTOM) loadGradient(context) return byId(id) } @@ -149,11 +211,13 @@ object Themes { ), innerGamer(0f), ThemeColors.palette(DEFAULT_PRIMARY, DEFAULT_SECONDARY, R.string.theme_gradient, R.string.theme_gradient_detail), + customPalette(customColors), ) fun byId(id: String): Palette { if (id == INNER_GAMER) return innerGamer(rgbHue) if (id == TRUE_BLACK) return ThemeColors.trueBlack(trueBlackHighlight) + if (id == CUSTOM) return customPalette(customColors) if (id == GRADIENT) return ThemeColors.palette(gradientColors.first, gradientColors.second, R.string.theme_gradient, R.string.theme_gradient_detail) return all.firstOrNull { it.id == id } ?: all[0] } @@ -203,7 +267,6 @@ private val ContentDirected = Typography().run { @Composable private fun InnerGamerHue(speed: Int) { - if (Motion.scale == 0f) return key(speed) { InnerGamerCycle(speed) } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9522e44de5..dc432165d9 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4262,4 +4262,18 @@ عدد صحيح ملاءمة تنعيم الحواف + مخصص + اختر كل لون في الواجهة بشكل مستقل. + الخلفية + اللوحات + اللوحات المرتفعة + الفواصل + الحدود + النص الرئيسي + النص الثانوي + الأزرار واللون الأساسي + نص الأزرار + الإبرازات + نجاح + خطأ \ No newline at end of file diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 1582f3c19e..e6b952e051 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4142,4 +4142,18 @@ Entero Ajustar Antialiasing + Personalizado + Elige cada color de la interfaz por separado. + Fondo + Paneles + Paneles elevados + Separadores + Bordes + Texto principal + Texto secundario + Botones y color principal + Texto de los botones + Destacados + Éxito + Error \ No newline at end of file diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9b6629c979..68e8f04c51 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4102,4 +4102,18 @@ Цяло число Побиране Заглаждане на ръбовете + Персонализирана + Изберете поотделно всеки цвят на интерфейса. + Фон + Панели + Повдигнати панели + Разделители + Рамки + Основен текст + Вторичен текст + Бутони и основен акцент + Текст на бутоните + Акценти + Успех + Грешка \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7c2f59aee2..9adcee02c7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4182,4 +4182,18 @@ Celé číslo Přizpůsobit Vyhlazování hran + Vlastní + Vyberte samostatně každou barvu rozhraní. + Pozadí + Panely + Vyvýšené panely + Oddělovače + Ohraničení + Hlavní text + Vedlejší text + Tlačítka a hlavní zvýraznění + Text tlačítek + Zvýraznění + Úspěch + Chyba \ No newline at end of file diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f86af3f9b8..e46157c608 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4102,4 +4102,18 @@ Heltal Tilpas Kantudjævning + Tilpasset + Vælg hver grænsefladefarve individuelt. + Baggrund + Paneler + Hævede paneler + Skillestreger + Kanter + Primær tekst + Sekundær tekst + Knapper og hovedaccent + Knaptekst + Fremhævninger + Succes + Fejl \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2deaec9777..c3d3db896f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4102,4 +4102,18 @@ Ganzzahlig Anpassen Kantenglättung + Benutzerdefiniert + Wähle jede Farbe der Oberfläche einzeln aus. + Hintergrund + Flächen + Erhöhte Flächen + Trennlinien + Rahmen + Haupttext + Sekundärtext + Schaltflächen und Hauptakzent + Schaltflächentext + Hervorhebungen + Erfolg + Fehler \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 43d687e021..1c4e366e1c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -4102,4 +4102,18 @@ Ακέραιος Προσαρμογή Εξομάλυνση ακμών + Προσαρμοσμένο + Επιλέξτε ξεχωριστά κάθε χρώμα της διεπαφής. + Φόντο + Πλαίσια + Ανυψωμένα πλαίσια + Διαχωριστικά + Περιγράμματα + Κύριο κείμενο + Δευτερεύον κείμενο + Κουμπιά και κύριο χρώμα έμφασης + Κείμενο κουμπιών + Επισημάνσεις + Επιτυχία + Σφάλμα \ No newline at end of file diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4a41370327..bd4fddf71d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4142,4 +4142,18 @@ Entero Ajustar Suavizado de bordes + Personalizado + Elige cada color de la interfaz por separado. + Fondo + Paneles + Paneles elevados + Separadores + Bordes + Texto principal + Texto secundario + Botones y color principal + Texto de los botones + Destacados + Éxito + Error \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0e9ef5f069..5bb3bd1af5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4102,4 +4102,18 @@ Kokonaisluku Sovita Reunanpehmennys + Mukautettu + Valitse käyttöliittymän jokainen väri erikseen. + Tausta + Paneelit + Korotetut paneelit + Erottimet + Reunat + Pääteksti + Toissijainen teksti + Painikkeet ja pääkorostus + Painikkeiden teksti + Korostukset + Onnistuminen + Virhe \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a40f61aed9..1177bfc170 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4141,4 +4141,18 @@ Entier Ajuster Anticrénelage + Personnalisé + Choisissez séparément chaque couleur de l’interface. + Arrière-plan + Panneaux + Panneaux surélevés + Séparateurs + Bordures + Texte principal + Texte secondaire + Boutons et accent principal + Texte des boutons + Mises en évidence + Succès + Erreur \ No newline at end of file diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 9ffe130bc8..c92d69ca9f 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4102,4 +4102,18 @@ पूर्णांक फ़िट एंटी-अलियासिंग + कस्टम + इंटरफ़ेस का हर रंग अलग-अलग चुनें। + पृष्ठभूमि + पैनल + उभरे हुए पैनल + विभाजक + किनारे + मुख्य टेक्स्ट + द्वितीयक टेक्स्ट + बटन और मुख्य हाइलाइट + बटन का टेक्स्ट + हाइलाइट + सफलता + त्रुटि \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index dbacff4fc5..301db987d2 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4102,4 +4102,18 @@ Egész szám Igazítás Élsimítás + Egyéni + Válaszd ki külön a felület minden színét. + Háttér + Panelek + Kiemelt panelek + Elválasztók + Szegélyek + Fő szöveg + Másodlagos szöveg + Gombok és fő kiemelés + Gombok szövege + Kiemelések + Siker + Hiba \ No newline at end of file diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index d57f4fce8a..29598f3980 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4072,4 +4072,18 @@ Bilangan bulat Sesuaikan Anti-aliasing + Kustom + Pilih setiap warna antarmuka secara terpisah. + Latar belakang + Panel + Panel terangkat + Pemisah + Batas + Teks utama + Teks sekunder + Tombol dan aksen utama + Teks tombol + Sorotan + Berhasil + Kesalahan \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9762487af7..7b4d3f2870 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4141,4 +4141,18 @@ Intero Adatta Antialiasing + Personalizzato + Scegli separatamente ogni colore dell’interfaccia. + Sfondo + Pannelli + Pannelli rialzati + Separatori + Bordi + Testo principale + Testo secondario + Pulsanti e colore principale + Testo dei pulsanti + Evidenziazioni + Successo + Errore \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4368eb3b77..e5cdba2950 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4072,4 +4072,18 @@ 整数 画面に合わせる アンチエイリアス + カスタム + インターフェースの各色を個別に選択します。 + 背景 + パネル + 浮き上がったパネル + 区切り線 + 境界線 + メインテキスト + サブテキスト + ボタンとメインアクセント + ボタンのテキスト + 強調表示 + 成功 + エラー \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 65be1ca189..536d332105 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4072,4 +4072,18 @@ 정수 화면에 맞춤 안티앨리어싱 + 사용자 지정 + 인터페이스의 각 색상을 개별적으로 선택하세요. + 배경 + 패널 + 돌출 패널 + 구분선 + 테두리 + 기본 텍스트 + 보조 텍스트 + 버튼 및 기본 강조색 + 버튼 텍스트 + 강조 표시 + 성공 + 오류 \ No newline at end of file diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 35583d3e7b..bcc31c2f02 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -4072,4 +4072,18 @@ Integer Muat Anti-aliasing + Tersuai + Pilih setiap warna antara muka secara berasingan. + Latar belakang + Panel + Panel timbul + Pemisah + Sempadan + Teks utama + Teks sekunder + Butang dan aksen utama + Teks butang + Sorotan + Berjaya + Ralat \ No newline at end of file diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f503b384b0..2c1878427c 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -4102,4 +4102,18 @@ Heltall Tilpass Kantutjevning + Egendefinert + Velg hver grensesnittfarge individuelt. + Bakgrunn + Paneler + Hevede paneler + Skillelinjer + Kanter + Hovedtekst + Sekundærtekst + Knapper og hovedfarge + Knappetekst + Uthevinger + Suksess + Feil \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f505680b3d..8134e019ed 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4102,4 +4102,18 @@ Geheel getal Passend Anti-aliasing + Aangepast + Kies elke interfacekleur afzonderlijk. + Achtergrond + Panelen + Verhoogde panelen + Scheidingslijnen + Randen + Hoofdtekst + Secundaire tekst + Knoppen en hoofdkleur + Knoptekst + Accenten + Geslaagd + Fout \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index db86d683b7..6bae94dd48 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4182,4 +4182,18 @@ Liczba całkowita Dopasuj Wygładzanie krawędzi + Niestandardowy + Wybierz osobno każdy kolor interfejsu. + Tło + Panele + Wyniesione panele + Separatory + Obramowania + Tekst główny + Tekst dodatkowy + Przyciski i główny akcent + Tekst przycisków + Wyróżnienia + Sukces + Błąd \ No newline at end of file diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 855d84d3cd..bda1ae5614 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1842,6 +1842,20 @@ Saturação Brilho Cor hexadecimal + Personalizado + Escolha individualmente cada cor da interface. + Fundo + Painéis + Painéis elevados + Divisórias + Contornos + Texto principal + Texto secundário + Botões e destaque principal + Texto dos botões + Destaques e indicadores + Sucesso + Erro Esc Ins Del diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 46df26d466..e49853cb6a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1850,6 +1850,20 @@ Saturação Brilho Cor hexadecimal + Personalizado + Escolha individualmente cada cor da interface. + Fundo + Painéis + Painéis elevados + Divisórias + Bordas + Texto principal + Texto secundário + Botões e destaque principal + Texto dos botões + Destaques e indicadores + Sucesso + Erro Esc Ins Del diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bea73bdabc..940364de71 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4142,4 +4142,18 @@ Număr întreg Potrivire Antialiasing + Personalizat + Alege separat fiecare culoare a interfeței. + Fundal + Panouri + Panouri ridicate + Separatoare + Margini + Text principal + Text secundar + Butoane și accent principal + Textul butoanelor + Evidențieri + Succes + Eroare \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f03f4b301b..2673ee7ccd 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4182,4 +4182,18 @@ Целое число По размеру Сглаживание + Пользовательская + Выберите каждый цвет интерфейса отдельно. + Фон + Панели + Приподнятые панели + Разделители + Границы + Основной текст + Вторичный текст + Кнопки и основной акцент + Текст кнопок + Выделения + Успех + Ошибка \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0db21cecce..8e169e62a2 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4102,4 +4102,18 @@ Heltal Anpassa Kantutjämning + Anpassat + Välj varje gränssnittsfärg separat. + Bakgrund + Paneler + Upphöjda paneler + Avdelare + Kanter + Huvudtext + Sekundär text + Knappar och huvudaccent + Knapptext + Markeringar + Lyckades + Fel \ No newline at end of file diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 902fbb36b7..243108da7f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4072,4 +4072,18 @@ จำนวนเต็ม พอดีหน้าจอ การลบรอยหยัก + กำหนดเอง + เลือกสีแต่ละสีของอินเทอร์เฟซแยกกัน + พื้นหลัง + แผง + แผงยกสูง + ตัวแบ่ง + เส้นขอบ + ข้อความหลัก + ข้อความรอง + ปุ่มและสีเน้นหลัก + ข้อความบนปุ่ม + จุดเน้น + สำเร็จ + ข้อผิดพลาด \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9569a8ccdc..25944dc95e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4102,4 +4102,18 @@ Tam sayı Sığdır Kenar yumuşatma + Özel + Arayüzdeki her rengi ayrı ayrı seçin. + Arka plan + Paneller + Yükseltilmiş paneller + Ayırıcılar + Kenarlıklar + Ana metin + İkincil metin + Düğmeler ve ana vurgu + Düğme metni + Vurgular + Başarılı + Hata \ No newline at end of file diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a0cd852b61..55bd3196c9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4182,4 +4182,18 @@ Ціле число За розміром Згладжування + Власна тема + Виберіть окремо кожен колір інтерфейсу. + Тло + Панелі + Підняті панелі + Роздільники + Межі + Основний текст + Вторинний текст + Кнопки й основний акцент + Текст кнопок + Виділення + Успіх + Помилка \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a5cf10eab6..347822317f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -4072,4 +4072,18 @@ Số nguyên Vừa màn hình Khử răng cưa + Tùy chỉnh + Chọn riêng từng màu của giao diện. + Nền + Bảng + Bảng nổi + Đường phân cách + Đường viền + Văn bản chính + Văn bản phụ + Nút và màu nhấn chính + Văn bản trên nút + Điểm nhấn + Thành công + Lỗi \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0ba97dd1ff..2ece3be681 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4072,4 +4072,18 @@ 整数 适应 抗锯齿 + 自定义 + 分别选择界面的每种颜色。 + 背景 + 面板 + 凸起面板 + 分隔线 + 边框 + 主要文本 + 次要文本 + 按钮和主要强调色 + 按钮文字 + 高亮 + 成功 + 错误 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 083c591954..8ba6d09f98 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -4072,4 +4072,18 @@ 整數 配合畫面 抗鋸齒 + 自訂 + 分別選擇介面的每種顏色。 + 背景 + 面板 + 凸起面板 + 分隔線 + 邊框 + 主要文字 + 次要文字 + 按鈕和主要強調色 + 按鈕文字 + 重點標示 + 成功 + 錯誤 \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 12fa80e1ef..dfb1bc732d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4072,4 +4072,18 @@ 整數 符合畫面 抗鋸齒 + 自訂 + 分別選擇介面的每種顏色。 + 背景 + 面板 + 浮起面板 + 分隔線 + 邊框 + 主要文字 + 次要文字 + 按鈕與主要強調色 + 按鈕文字 + 醒目標示 + 成功 + 錯誤 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29e4d9428b..05a387b644 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2039,6 +2039,20 @@ Saturation Brightness Hex color + Custom + Choose each interface color independently. + Background + Panels + Raised panels + Dividers + Borders + Main text + Secondary text + Buttons and main accent + Button text + Highlights + Success + Error Esc Ins Del diff --git a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt index 2f2cc3cd3b..b98d0f1eea 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/ThemeColorsTest.kt @@ -188,4 +188,45 @@ class ThemeColorsTest { SessionPrefs.setTheme(app, Themes.TRUE_BLACK) assertEquals(Color(0xFFFF8800), Themes.current(app).primary) } + + @Test fun customThemeRestoresIndependentColorsAndUsesASolidAccent() { + val chosen = CustomThemeColors( + background = 0xFF101112.toInt(), + surface = 0xFF202122.toInt(), + surfaceVariant = 0xFF303132.toInt(), + line = 0xFF404142.toInt(), + line2 = 0xFF505152.toInt(), + onBackground = 0xFFF1F2F3.toInt(), + onSurfaceVariant = 0xFFD1D2D3.toInt(), + primary = 0xFF336699.toInt(), + onPrimary = 0xFFFFFFFF.toInt(), + signal = 0xFFFFAA00.toInt(), + good = 0xFF00CC66.toInt(), + error = 0xFFFF4433.toInt(), + ) + + Themes.setCustomColors(app, CustomThemeColors()) + SessionPrefs.setCustomThemeColors(app, chosen) + SessionPrefs.setTheme(app, Themes.CUSTOM) + + assertEquals(chosen, SessionPrefs.customThemeColors(app)) + + val palette = Themes.current(app) + assertEquals(Themes.CUSTOM, palette.id) + assertEquals(Color(chosen.background), palette.background) + assertEquals(Color(chosen.surface), palette.surface) + assertEquals(Color(chosen.surfaceVariant), palette.surfaceVariant) + assertEquals(Color(chosen.line), palette.line) + assertEquals(Color(chosen.line2), palette.line2) + assertEquals(Color(chosen.onBackground), palette.onBackground) + assertEquals(Color(chosen.onSurfaceVariant), palette.onSurfaceVariant) + assertEquals(Color(chosen.primary), palette.primary) + assertEquals(Color(chosen.primary), palette.primary2) + assertEquals(Color(chosen.onPrimary), palette.onPrimary) + assertEquals(Color(chosen.signal), palette.signal) + assertEquals(Color(chosen.good), palette.good) + assertEquals(Color(chosen.error), palette.error) + assertTrue(Themes.all.any { it.id == Themes.CUSTOM }) + } + } diff --git a/docs/development/themes.md b/docs/development/themes.md index 4bb122c6f3..8fbae55688 100644 --- a/docs/development/themes.md +++ b/docs/development/themes.md @@ -8,10 +8,7 @@ A theme is a `Palette` (`ui/Theme.kt`): a dark background scale (`background`, ` ## Gradient theme -`Themes.GRADIENT` is the one theme whose colours the person picks: a primary and a secondary, -kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change -restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition -uses `Themes.current(context)`. +`Themes.GRADIENT` is the one of the theme whose colours the person picks: a primary and a secondary, kept in `SessionPrefs.gradientColors` and in `Themes.gradientColors`, a Compose state, so a change restyles the whole app at once. `App.onCreate` loads the saved colours; code outside a composition uses `Themes.current(context)`. `ThemeColors.palette` builds the full palette from the two colours: primary becomes `primary` / `signal`, secondary becomes `primary2`, the background scale is a dark neutral tinted with @@ -24,16 +21,24 @@ square. It opens `ColorPickerDialog`: a wheel (hue and saturation, touch), hue / brightness sliders (they work with a controller) and a hex box, with the old and new colour side by side. OK applies it. +## Custom theme + +`Themes.CUSTOM` stores a separate preference for every configurable palette colour: +background, surfaces, borders, text, accent, button text, signals, success and error. +`SessionPrefs.customThemeColors` restores the saved values, while `Themes.customColors` +is Compose state so changes update the interface immediately. + +The custom palette does not derive its surfaces from the accent. `primary2` intentionally +equals `primary`, keeping components that use the existing two-stop button and launch +effects visually solid. The colour picker reused from Gradient supports the wheel, sliders +and hexadecimal input. + ## Inner Gamer theme `Themes.INNER_GAMER` is an RGB theme: the accent walks round the colour wheel. It sits just above -Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the -theme while it is chosen. +Gradient in the list, and Setup shows a Speed slider (1 to 10, `SessionPrefs.rgbSpeed`) under the theme while it is chosen. -`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text -keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one -`rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it. -Compose applies Android's animator scale to it, and the colour holds still when animations are off -in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the +`Themes.innerGamer(hue)` builds the palette for one hue through `ThemeColors.palette`, so button text keeps the same contrast along the gradient at every hue. `DroidDeckTheme` runs one `rememberInfiniteTransition` while Inner Gamer is chosen, so the system's animation clock drives it. +Compose applies Android's animator scale to it, and the colour holds still when animations are off in the app (`Motion.scale`) or in Android's own settings. The hue is written to `Themes.rgbHue` in 3° steps, which restyles the app only when the colour visibly moves; a slow cycle costs few recompositions. From de73e429ccd26945b285a4d34fe996014c485dad Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 13:41:57 -0500 Subject: [PATCH 58/60] feat(proton): list prerelease builds under Experimental and install from any archive (#2889) * feat(proton): install prerelease builds * fix(proton): harden prerelease archive installs * refactor(proton): drop the superseded test build path * fix(proton): list only current prerelease builds and label the file install * fix(proton): hide prerelease rows that are already installed * fix(proton): keep relative links and modes when unpacking zip and 7z builds * fix(proton): name file installs without the archive suffix * fix(proton): confirm a release is gone before removing its build and tighten archive handling * Show the Experimental section without Developer tools * Share the refresh guard, recheck sessions before removal, skip other architectures The update check guard is shared between menu instances and held until the result is published, so a recreated screen joins the running check and results arrive in order. Automatic removal rechecks for a running session after each release lookup. Experimental assets for other CPU architectures are ignored, and in-tree links may start with the current directory. * Keep an experimental build in place when a session starts during its removal Removal and session start now share one lock. The tree is renamed out of the tools folder under that lock only while no session is running, and deleted afterwards, so a session that starts first keeps its build. --- .../droiddeck/launcher/FrontEndActivity.kt | 7 +- .../java/com/droiddeck/launcher/ProtonMenu.kt | 47 ++- .../droiddeck/launcher/core/Downloader.java | 6 + .../launcher/session/ExperimentalProtons.kt | 236 +++++++++++++-- .../launcher/session/ProtonExtras.kt | 86 +++--- .../launcher/session/SessionService.kt | 10 +- .../launcher/session/SessionState.kt | 2 + .../droiddeck/launcher/ui/ComponentsPage.kt | 32 +- app/src/main/res/values-ar/strings.xml | 10 +- app/src/main/res/values-b+es+419/strings.xml | 10 +- app/src/main/res/values-bg/strings.xml | 10 +- app/src/main/res/values-cs/strings.xml | 10 +- app/src/main/res/values-da/strings.xml | 10 +- app/src/main/res/values-de/strings.xml | 10 +- app/src/main/res/values-el/strings.xml | 10 +- app/src/main/res/values-es/strings.xml | 10 +- app/src/main/res/values-fi/strings.xml | 10 +- app/src/main/res/values-fr/strings.xml | 10 +- app/src/main/res/values-hi/strings.xml | 10 +- app/src/main/res/values-hu/strings.xml | 10 +- app/src/main/res/values-in/strings.xml | 10 +- app/src/main/res/values-it/strings.xml | 10 +- app/src/main/res/values-ja/strings.xml | 10 +- app/src/main/res/values-ko/strings.xml | 10 +- app/src/main/res/values-ms/strings.xml | 10 +- app/src/main/res/values-nb/strings.xml | 10 +- app/src/main/res/values-nl/strings.xml | 10 +- app/src/main/res/values-pl/strings.xml | 10 +- app/src/main/res/values-pt-rPT/strings.xml | 10 +- app/src/main/res/values-pt/strings.xml | 10 +- app/src/main/res/values-ro/strings.xml | 10 +- app/src/main/res/values-ru/strings.xml | 10 +- app/src/main/res/values-sv/strings.xml | 10 +- app/src/main/res/values-th/strings.xml | 10 +- app/src/main/res/values-tr/strings.xml | 10 +- app/src/main/res/values-uk/strings.xml | 10 +- app/src/main/res/values-vi/strings.xml | 10 +- app/src/main/res/values-zh-rCN/strings.xml | 10 +- app/src/main/res/values-zh-rHK/strings.xml | 10 +- app/src/main/res/values-zh-rTW/strings.xml | 10 +- app/src/main/res/values/strings.xml | 8 +- .../droiddeck/launcher/CompatLaunchTest.kt | 2 +- .../droiddeck/launcher/ProtonMenuAutoTest.kt | 88 +++++- .../session/ExperimentalProtonsTest.kt | 280 ++++++++++++++++++ .../launcher/session/ProtonExtrasTest.kt | 165 +++++------ 45 files changed, 897 insertions(+), 392 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 629986abf2..c15996d8fe 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -99,6 +99,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet this, ui, idle = { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null }, onInstalled = { if (!OfflineMode.enabled(this)) components.checkComponentUpdates(force = false) }, + onRemoved = { components.refreshComponents() }, ) private var installed by mutableStateOf(null) @@ -2433,17 +2434,18 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet protons = com.droiddeck.launcher.ui.ProtonsState( rows = protons.protonRows, busyId = protons.protonBusyId, stage = protons.protonStage, percent = protons.protonPercent, runtimeReady = ready && !busy, sessionRunning = SessionState.running, experimental = protons.experimentalDirs, + experimentalReleases = protons.experimentalReleases, ), protonActions = com.droiddeck.launcher.ui.ProtonsActions( onInstall = { id -> protons.installProton(id) }, - onInstallTest = { id -> protons.installProton(id, test = true) }, onCancel = { id -> ProtonExtras.tools.firstOrNull { it.id == id }?.let { ProtonExtras.unqueue(this, it) }; protons.refreshProtons() }, onRemove = { id, dir -> protons.removeProton(id, dir) }, onRemoveOlder = { id -> protons.removeProton(id, older = true) }, onExperimentalFile = { - pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, ZIP_EXT, getString(R.string.xproton_pick), + pickExperimentalProton.launch(InAppFilePicker.buildIntent(this, EXPERIMENTAL_PROTON_EXT, getString(R.string.xproton_install_file), android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS).path)) }, + onExperimentalRelease = { release -> protons.installExperimentalRelease(release) }, onRemoveExperimental = { dir -> protons.removeExperimental(dir) }, ), protonOptions = { @@ -3413,6 +3415,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private const val KEY_SWITCH_DEADLINE = "switch_deadline" private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED) private val ZIP_EXT = listOf("zip") + private val EXPERIMENTAL_PROTON_EXT = listOf("zip", "7z", "tar", "gz", "xz", "zst", "bz2", "tgz", "txz", "tbz2", "tzst") private val WCP_EXT = listOf("wcp") } } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index c076df2209..aaaa2cf34f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -20,6 +20,7 @@ internal class ProtonMenu( private val activity: android.app.Activity, private val ui: Handler, private val onInstalled: () -> Unit = {}, + private val onRemoved: () -> Unit = {}, private val idle: () -> Boolean = { true }, ) { private object Operation { @@ -29,6 +30,9 @@ internal class ProtonMenu( val percent = mutableIntStateOf(-1) val problem = mutableStateOf(null) val experimental = mutableStateOf>(emptyList()) + val experimentalReleases = mutableStateOf>(emptyList()) + var fetchedReleases = emptyList() + val checking = java.util.concurrent.atomic.AtomicBoolean(false) } var protonRows by Operation.rows var protonBusyId by Operation.busyId @@ -36,14 +40,16 @@ internal class ProtonMenu( var protonPercent by Operation.percent var protonProblem by Operation.problem var experimentalDirs by Operation.experimental + var experimentalReleases by Operation.experimentalReleases companion object { const val EXPERIMENTAL = "experimental" } - private val checking = java.util.concurrent.atomic.AtomicBoolean(false) - @VisibleForTesting internal var installer: (ProtonExtras.Tool, Boolean, (String, Int) -> Unit) -> String? = - { tool, test, progress -> ProtonExtras.install(activity, tool, test, progress) } + @VisibleForTesting internal var latestCheck: (Boolean) -> Boolean = { force -> ProtonExtras.checkLatest(activity, force) } + @VisibleForTesting internal var experimentalRefresh: () -> List? = { ExperimentalProtons.refresh(activity) } + @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = + { tool, progress -> ProtonExtras.install(activity, tool, progress) } - fun installProton(id: String, automatic: Boolean = false, test: Boolean = false) { + fun installProton(id: String, automatic: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) @@ -53,7 +59,7 @@ internal class ProtonMenu( protonPercent = -1 Thread({ val problem = runCatching { - installer(tool, test) { label, value -> + installer(tool) { label, value -> ui.post { protonStage = label; protonPercent = value } } }.getOrElse { it.message ?: it.javaClass.simpleName } @@ -114,6 +120,10 @@ internal class ProtonMenu( }, "install-proton-experimental").start() } + fun installExperimentalRelease(release: ExperimentalProtons.Release) { + installExperimental { progress -> ExperimentalProtons.installRelease(activity, release, progress) } + } + fun removeExperimental(dir: String) { if (protonBusyId != null || SessionState.running) return protonBusyId = EXPERIMENTAL @@ -131,22 +141,37 @@ internal class ProtonMenu( }, "remove-proton-experimental").start() } + private fun refreshExperimental() { + val installed = ExperimentalProtons.installed(activity) + experimentalDirs = installed.map { it.dir } + experimentalReleases = ExperimentalProtons.available(Operation.fetchedReleases, installed) + } + fun refreshProtons() { - experimentalDirs = ExperimentalProtons.installed(activity).map { it.dir } + refreshExperimental() protonRows = ProtonExtras.tools.map { val all = ProtonExtras.installedAll(activity, it) - ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it), ProtonExtras.testBuild(activity, it)) + ProtonRow(it.id, it.name, all.lastOrNull(), ProtonExtras.queued(activity, it), all, ProtonExtras.update(activity, it)) } } fun checkUpdates(force: Boolean = false) { - if (!checking.compareAndSet(false, true)) return + if (!Operation.checking.compareAndSet(false, true)) return Thread({ - val asked = try { ProtonExtras.checkLatest(activity, force) } catch (_: Throwable) { false } finally { checking.set(false) } - ui.post { - if (asked) refreshProtons() + val asked = runCatching { latestCheck(force) }.getOrDefault(false) + val experimental = runCatching { experimentalRefresh() }.getOrNull() + val published = ui.post { + try { + val before = experimentalDirs + Operation.fetchedReleases = experimental ?: emptyList() + if (asked) refreshProtons() else refreshExperimental() + if (!experimentalDirs.containsAll(before)) onRemoved() + } finally { + Operation.checking.set(false) + } ensureAutoUpdates() } + if (!published) Operation.checking.set(false) }, "proton-updates").start() } diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 7d5427a8cb..7990e57073 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -122,6 +122,12 @@ public final class Downloader { return null; } + public static Boolean gone(String url) { + Fetch fetch = fetch(url); + if (fetch.body != null) return Boolean.FALSE; + return fetch.fatal ? Boolean.TRUE : null; + } + public static String downloadDirect(String url) { LAST_FAILURE.remove(); return fetch(url).body; diff --git a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt index cc2831bc8c..c02858e449 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ExperimentalProtons.kt @@ -3,16 +3,23 @@ package com.droiddeck.launcher.session import android.content.Context import android.os.StatFs import android.util.Log +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.Hashes import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.io.FileOutputStream +import java.io.InputStream import java.nio.file.Files +import java.nio.file.attribute.PosixFilePermission import java.security.DigestOutputStream import java.security.MessageDigest import java.util.zip.ZipFile +import org.apache.commons.compress.archivers.sevenz.SevenZFile +import org.apache.commons.compress.archivers.zip.ZipFile as CommonsZipFile import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.deleteRecursively +import org.json.JSONArray import org.json.JSONObject object ExperimentalProtons { @@ -22,12 +29,17 @@ object ExperimentalProtons { private const val STAGING = ".droiddeck-experimental" private const val BACKUPS = ".droiddeck-experimental-old" private const val INCOMING = ".droiddeck-experimental-new" + private const val REMOVED = ".droiddeck-experimental-gone" private const val GUEST_TOOLS = "/root/.local/share/Steam/compatibilitytools.d" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 private const val USER_SETTINGS = "user_settings.py" - private val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val TARBALL = Regex("(?i)\\.tar(\\.(gz|xz|zst|bz2))?$") + internal val FOREIGN_ARCH = Regex("(?i)(^|[^a-z0-9])(x86|x64|amd64|i[3-6]86)([^a-z0-9]|$)") + private val DOWNLOAD_PREFIX = "droiddeck-" - data class Installed(val dir: String, val label: String, val source: String) + data class Installed(val dir: String, val label: String, val source: String, val releaseTag: String? = null) + data class Release(val tag: String, val asset: String, val url: String, val sha512: String?, val size: Long, val name: String = tag) + enum class ArchiveType { ZIP, SEVEN_Z, TAR, UNKNOWN } private fun toolsDir(context: Context) = File(LinuxRuntime.rootDir(context), GUEST_TOOLS.removePrefix("/")) @@ -36,7 +48,7 @@ object ExperimentalProtons { ?.filter { it.isDirectory && File(it, MARKER).isFile } ?.map { dir -> val info = runCatching { JSONObject(File(dir, MARKER).readText()) }.getOrDefault(JSONObject()) - Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source")) + Installed(dir.name, info.optString("label").ifEmpty { dir.name }, info.optString("source"), info.optString("releaseTag").ifEmpty { null }) } ?.sortedBy { it.dir } ?: emptyList() @@ -45,9 +57,15 @@ object ExperimentalProtons { val tools = toolsDir(context) val target = File(tools, dir) if (!File(target, MARKER).isFile) return false - val gone = deleteTree(target) && deleteTree(File(File(tools, BACKUPS), dir)) && deleteTree(File(File(tools, INCOMING), dir)) - if (gone) ComponentsManager.forgetProton(context, dir) - return gone + val doomed = File(File(tools, REMOVED).apply { mkdirs() }, dir) + if (!deleteTree(doomed)) return false + val detached = synchronized(SessionState.startLock) { !SessionState.running && target.renameTo(doomed) } + if (!detached) return false + ComponentsManager.forgetProton(context, dir) + deleteTree(doomed) + deleteTree(File(File(tools, BACKUPS), dir)) + deleteTree(File(File(tools, INCOMING), dir)) + return true } internal fun dirName(tree: String, label: String?): String { @@ -56,6 +74,49 @@ object ExperimentalProtons { return PREFIX + base + (tag?.let { "-$it" } ?: "") } + fun refresh(context: Context): List? { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val fetched = ProtonExtras.releasesForRemoval(tool) ?: return null + val assets = ProtonExtras.assets(tool, fetched.releases, prerelease = true) + val rows = assets.map { Release(it.tag, it.name, it.url, it.sha512, it.size, it.releaseName) }.distinctBy { it.tag } + if (!SessionState.running) { + reconcile(context, fetched) + if (fetched.complete) removeStaleDownloads(context, fetched.releases.tags()) + } + return rows + } + + private fun JSONArray.tags(): Set = (0 until length()).mapNotNull { optJSONObject(it)?.optString("tag_name")?.takeIf(String::isNotEmpty) }.toSet() + + internal fun removeStaleDownloads(context: Context, availableTags: Set) { + val downloads = File(context.filesDir, "proton-downloads") + downloads.listFiles()?.filter { file -> + file.isFile && file.name.startsWith(DOWNLOAD_PREFIX) && availableTags.none { tag -> file.name.startsWith("$DOWNLOAD_PREFIX${ComponentsManager.safeName(tag)}-") } + }?.forEach { it.delete() } + } + + internal fun available(releases: List, installed: List): List = + releases.filter { release -> installed.none { it.releaseTag == release.tag } } + + internal fun shouldRemove(installedReleaseTag: String?, fetched: ProtonExtras.ReleaseFetch, gone: (String) -> Boolean): Boolean { + val tag = installedReleaseTag ?: return false + val release = (0 until fetched.releases.length()).asSequence() + .mapNotNull { fetched.releases.optJSONObject(it) } + .firstOrNull { it.optString("tag_name") == tag } + return if (release != null) !release.optBoolean("prerelease", false) else fetched.complete && gone(tag) + } + + internal fun reconcile( + context: Context, + fetched: ProtonExtras.ReleaseFetch, + gone: (String) -> Boolean = { tag -> ProtonExtras.releaseGone(ProtonExtras.tools.first { it.id == ProtonExtras.OWN }, tag) }, + ) { + for (build in installed(context)) { + if (SessionState.running) return + if (shouldRemove(build.releaseTag, fetched, gone)) remove(context, build.dir) + } + } + internal fun compatVdf(name: String): String = """"compatibilitytools" { "compat_tools" @@ -71,21 +132,55 @@ object ExperimentalProtons { } """ - fun installFromFile(context: Context, zip: File, onProgress: (String, Int) -> Unit): String? { + fun installFromFile(context: Context, file: File, onProgress: (String, Int) -> Unit): String? { preflight(context)?.let { return it } - if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + zip.length()) { + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + file.length()) { return context.getString(R.string.xproton_no_space) } - return install(context, zip, zip.name.substringBeforeLast('.'), zip.name, onProgress) + return install(context, file, fileLabel(file.name), file.name, null, onProgress, false) } + internal fun fileLabel(name: String): String = + if (TARBALL.containsMatchIn(name)) name.replace(TARBALL, "") else name.substringBeforeLast('.') + + fun installRelease(context: Context, release: Release, onProgress: (String, Int) -> Unit): String? { + preflight(context)?.let { return it } + val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } + val archive = File(downloads, "droiddeck-${ComponentsManager.safeName(release.tag)}-${release.asset}") + if (release.size > 0 && archive.length() > release.size) archive.delete() + val missing = (release.size - archive.length()).coerceAtLeast(0L) + val copyBytes = if (sameFileStore(archive, toolsDir(context))) 0L else release.size + if (StatFs(LinuxRuntime.rootDir(context).path).availableBytes < NEED_BYTES + missing + copyBytes) return context.getString(R.string.xproton_no_space) + val title = context.getString(R.string.pextra_downloading, "Proton", release.tag) + onProgress(title, 0) + if (!Downloader.downloadFile(release.url, archive, true) { fraction -> + onProgress(title, if (fraction < 0) -1 else (fraction * 100f).toInt().coerceIn(0, 100)) + }) return context.getString(R.string.pextra_download_failed) + if (release.size > 0 && archive.length() != release.size) return context.getString(R.string.pextra_incomplete) + if (release.sha512 != null) { + val expected = Downloader.downloadDirect(release.sha512)?.let(::checksumIn) + ?: return context.getString(R.string.pextra_checksum_unreadable) + if (!expected.equals(Hashes.sha512(archive), true)) { + archive.delete() + return context.getString(R.string.pextra_checksum_mismatch) + } + } + return try { install(context, archive, release.tag, release.tag, release.tag, onProgress, true) } + finally { archive.delete() } + } + + private fun sameFileStore(file: File, directory: File): Boolean = runCatching { + directory.mkdirs() + Files.getFileStore((file.takeIf(File::exists) ?: file.parentFile).toPath()) == Files.getFileStore(directory.toPath()) + }.getOrDefault(false) + private fun preflight(context: Context): String? = when { SessionState.running -> context.getString(R.string.pextra_stop_session) !LinuxRuntime.isInstalled(context) -> context.getString(R.string.user_apps_runtime_required) else -> null } - private fun install(context: Context, zip: File, label: String, source: String, onProgress: (String, Int) -> Unit): String? { + private fun install(context: Context, archive: File, label: String, source: String, releaseTag: String?, onProgress: (String, Int) -> Unit, downloaded: Boolean): String? { val tools = toolsDir(context).apply { mkdirs() } val staging = File(tools, STAGING) val forget = { name: String -> ComponentsManager.forgetProton(context, name) } @@ -95,23 +190,40 @@ object ExperimentalProtons { try { LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, LinuxRuntime.rootDir(context)) - onProgress(context.getString(R.string.xproton_unzipping), -1) - val tarball = runCatching { extractTarball(zip, staging) } - .getOrElse { return it.message ?: context.getString(R.string.xproton_bad_zip) } - ?: return context.getString(R.string.xproton_bad_zip) + onProgress(context.getString(R.string.xproton_unpacking), -1) + val unpacked = File(staging, "unpacked").apply { mkdirs() } + val type = archiveType(archive) if (SessionState.running) return context.getString(R.string.pextra_session_started) onProgress(context.getString(R.string.xproton_unpacking), -1) - val unpacked = File(staging, "unpacked").apply { mkdirs() } - val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) - tarball.delete() - if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + when (type) { + ArchiveType.ZIP -> { + val tarball = extractTarball(archive, staging) + if (tarball == null) { + extractDirect(archive, unpacked, ArchiveType.ZIP) + } else { + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${tarball.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + tarball.delete() + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + } + ArchiveType.SEVEN_Z -> extractDirect(archive, unpacked, ArchiveType.SEVEN_Z) + ArchiveType.TAR -> { + val stagedArchive = File(staging, archive.name) + if (!archive.canonicalFile.equals(stagedArchive.canonicalFile) && !(downloaded && archive.renameTo(stagedArchive))) { + archive.copyTo(stagedArchive, overwrite = true) + } + val status = runGuest(context, listOf("tar", "-xf", "$GUEST_TOOLS/$STAGING/${stagedArchive.name}", "-C", "$GUEST_TOOLS/$STAGING/unpacked")) + if (status != 0) return context.getString(R.string.xproton_untar_failed, status) + } + ArchiveType.UNKNOWN -> return context.getString(R.string.xproton_archive_invalid) + } val tree = buildTree(unpacked) ?: return context.getString(R.string.xproton_no_tree) val name = dirName(tree.name, label) ownFile(tree, "compatibilitytool.vdf").writeText(compatVdf(name)) ownFile(tree, MARKER).writeText( - JSONObject().put("label", name).put("source", source).put("at", System.currentTimeMillis() / 1000).toString(), + JSONObject().put("label", name).put("source", source).putOpt("releaseTag", releaseTag).put("at", System.currentTimeMillis() / 1000).toString(), ) val final = File(tools, name) val settings = File(final, USER_SETTINGS) @@ -125,7 +237,7 @@ object ExperimentalProtons { return null } catch (e: Exception) { Log.e(TAG, "install $source", e) - return e.message ?: context.getString(R.string.xproton_bad_zip) + return if (e is UnsafeArchiveException) context.getString(R.string.xproton_archive_unsafe) else context.getString(R.string.xproton_archive_invalid) } finally { deleteTree(staging) } @@ -171,10 +283,22 @@ object ExperimentalProtons { } internal fun restoreInterrupted(tools: File, forget: (String) -> Boolean) { + deleteTree(File(tools, REMOVED)) File(tools, INCOMING).listFiles()?.forEach { finishPlacing(tools, it.name, forget) } File(tools, BACKUPS).listFiles()?.forEach { if (File(tools, it.name).exists()) deleteTree(it) else it.renameTo(File(tools, it.name)) } } + internal fun archiveType(file: File): ArchiveType { + val head = runCatching { file.inputStream().use { ByteArray(300).also { b -> it.read(b) } } }.getOrNull() ?: return ArchiveType.UNKNOWN + fun at(i: Int, vararg bytes: Int) = bytes.indices.all { head.getOrNull(i + it) == bytes[it].toByte() } + return when { + at(0, 0x50, 0x4B) -> ArchiveType.ZIP + at(0, 0x37, 0x7A, 0xBC, 0xAF, 0x27, 0x1C) -> ArchiveType.SEVEN_Z + at(0, 0x1F, 0x8B) || at(0, 0x42, 0x5A, 0x68) || at(0, 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00) || at(0, 0x28, 0xB5, 0x2F, 0xFD) || at(257, 0x75, 0x73, 0x74, 0x61, 0x72) -> ArchiveType.TAR + else -> ArchiveType.UNKNOWN + } + } + private fun extractTarball(zip: File, into: File): File? = ZipFile(zip).use { z -> val entries = z.entries().toList().filter { !it.isDirectory } val entry = entries.filter { TARBALL.containsMatchIn(it.name) }.maxByOrNull { it.size } ?: return null @@ -194,6 +318,78 @@ object ExperimentalProtons { out } + internal class UnsafeArchiveException : Exception() + + internal fun extractDirect(archive: File, into: File, type: ArchiveType) { + val root = into.toPath().toAbsolutePath().normalize() + fun target(name: String): File { + val clean = name.replace('\\', '/') + val parts = clean.split('/') + if (clean.startsWith('/') || parts.any { it == ".." }) throw UnsafeArchiveException() + val path = root.resolve(clean).normalize() + if (!path.startsWith(root)) throw UnsafeArchiveException() + var parent = path.parent + while (parent != null && parent.startsWith(root) && parent != root) { + if (Files.isSymbolicLink(parent)) throw UnsafeArchiveException() + parent = parent.parent + } + return path.toFile() + } + fun applyMode(file: File, mode: Int) { + val permissions = mutableSetOf() + if (mode and 0x100 != 0) permissions += PosixFilePermission.OWNER_READ + if (mode and 0x80 != 0) permissions += PosixFilePermission.OWNER_WRITE + if (mode and 0x40 != 0) permissions += PosixFilePermission.OWNER_EXECUTE + if (mode and 0x20 != 0) permissions += PosixFilePermission.GROUP_READ + if (mode and 0x10 != 0) permissions += PosixFilePermission.GROUP_WRITE + if (mode and 0x08 != 0) permissions += PosixFilePermission.GROUP_EXECUTE + if (mode and 0x04 != 0) permissions += PosixFilePermission.OTHERS_READ + if (mode and 0x02 != 0) permissions += PosixFilePermission.OTHERS_WRITE + if (mode and 0x01 != 0) permissions += PosixFilePermission.OTHERS_EXECUTE + if (permissions.isNotEmpty()) Files.setPosixFilePermissions(file.toPath(), permissions) + } + val directoryModes = mutableListOf>() + fun place(name: String, mode: Int, directory: Boolean, content: () -> InputStream) { + val file = target(name) + when { + mode and 0xF000 == 0xA000 -> { + val link = content().use { it.readBytes().decodeToString() } + val parent = file.parentFile ?: throw UnsafeArchiveException() + val climbsLater = link.split('/').filter { it != "." }.dropWhile { it == ".." }.any { it == ".." } + if (link.startsWith('/') || climbsLater || !parent.toPath().resolve(link).normalize().startsWith(root)) throw UnsafeArchiveException() + parent.mkdirs() + Files.deleteIfExists(file.toPath()) + Files.createSymbolicLink(file.toPath(), java.nio.file.Paths.get(link)) + } + directory -> { + file.mkdirs() + directoryModes += file to mode + } + else -> { + if (Files.isSymbolicLink(file.toPath())) throw UnsafeArchiveException() + file.parentFile?.mkdirs() + content().use { input -> file.outputStream().use { output -> input.copyTo(output, 1 shl 16) } } + applyMode(file, mode) + } + } + } + when (type) { + ArchiveType.ZIP -> CommonsZipFile.builder().setFile(archive).get().use { zip -> + for (entry in zip.entries) place(entry.name, entry.unixMode, entry.isDirectory) { zip.getInputStream(entry) } + } + ArchiveType.SEVEN_Z -> Files.newByteChannel(archive.toPath()).use { channel -> + SevenZFile.builder().setSeekableByteChannel(channel).get().use { seven -> + for (entry in seven.entries) { + val unix = entry.hasWindowsAttributes && entry.windowsAttributes and 0x8000 != 0 + place(entry.name, if (unix) entry.windowsAttributes ushr 16 else 0, entry.isDirectory) { seven.getInputStream(entry) } + } + } + } + else -> error("Unsupported direct archive") + } + directoryModes.sortedByDescending { it.first.path.length }.forEach { (directory, mode) -> applyMode(directory, mode) } + } + internal fun checksumIn(text: String): String? = Regex("(?i)\\b[0-9a-f]{128}\\b").find(text)?.value internal fun checksumEntry(entries: List, tarball: String): String? { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index c277b7b279..0d0e20c41d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -16,8 +16,10 @@ import org.json.JSONObject object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 - private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15&page=%d" + private const val RELEASE_PAGE_SIZE = 15 + private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=$RELEASE_PAGE_SIZE&page=%d" private const val RELEASE_PAGES = 5 + private const val RELEASE_TAG = "https://api.github.com/repos/%s/releases/tags/%s" const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false @@ -28,7 +30,8 @@ object ProtonExtras { class Tool(val id: String, val name: String, val prefix: String, val repo: String, val assetPattern: Regex) internal data class Asset(val tag: String, val name: String, val url: String, val sha512: String?, val size: Long, - val sha256: String? = null) + val sha256: String? = null, val releaseName: String = tag) + internal data class ReleaseFetch(val releases: JSONArray, val complete: Boolean) const val OWN = "droiddeck" @@ -106,12 +109,6 @@ object ProtonExtras { fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } - fun testBuild(context: Context, tool: Tool): String? = - testFor(installedTags(context, tool), readJson(latestFile(context)).optJSONObject(tool.id)?.optString("test")?.ifEmpty { null }) - - internal fun testFor(installed: List, test: String?): String? = - test?.takeIf { it !in installed && (installed.isEmpty() || updateFor(installed, it) != null) } - private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 private const val USER_SETTINGS = "user_settings.py" @@ -135,20 +132,18 @@ object ProtonExtras { } } - internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, test: Boolean, now: Long): Boolean { - if (test) return false + internal fun recordLatest(latest: JSONObject, tool: Tool, tag: String, now: Long): Boolean { val entry = latest.optJSONObject(tool.id) val known = entry?.optString("tag") if (!known.isNullOrEmpty() && compareVersions(tag, known) < 0) return false - val ahead = entry?.optString("test")?.takeIf { it.isNotEmpty() && compareVersions(it, tag) > 0 } - latest.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", ahead)) + latest.put(tool.id, JSONObject().put("tag", tag).put("at", now)) return true } - private fun record(context: Context, tool: Tool, dir: String?, tag: String, test: Boolean) { + private fun record(context: Context, tool: Tool, dir: String?, tag: String) { runCatching { val latest = readJson(latestFile(context)) - if (recordLatest(latest, tool, tag, test, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) + if (recordLatest(latest, tool, tag, System.currentTimeMillis())) latestFile(context).writeText(latest.toString()) if (dir != null) { val releases = readJson(releasesFile(context)) val present = toolsDir(context).list()?.toSet() ?: emptySet() @@ -221,17 +216,17 @@ object ProtonExtras { } @Synchronized - fun install(context: Context, tool: Tool, test: Boolean = false, onProgress: (String, Int) -> Unit): String? { + fun install(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (installInProgress) return context.getString(R.string.pextra_busy) installInProgress = true - return try { installNow(context, tool, test, onProgress) } finally { installInProgress = false } + return try { installNow(context, tool, onProgress) } finally { installInProgress = false } } - private fun installNow(context: Context, tool: Tool, test: Boolean, onProgress: (String, Int) -> Unit): String? { + private fun installNow(context: Context, tool: Tool, onProgress: (String, Int) -> Unit): String? { if (SessionState.running) return context.getString(R.string.pextra_stop_session) if (!LinuxRuntime.isInstalled(context)) return context.getString(R.string.user_apps_runtime_required) - val asset = releases(tool)?.let { pickAsset(tool, it, test && tool.id == OWN) } ?: return context.getString(R.string.pextra_no_release, tool.name) + val asset = releases(tool)?.let { pickAsset(tool, it) } ?: return context.getString(R.string.pextra_no_release, tool.name) val downloads = File(context.filesDir, "proton-downloads").apply { mkdirs() } val archive = File(downloads, "${tool.id}-${asset.name}") if (asset.size > 0 && archive.length() > asset.size) archive.delete() @@ -312,7 +307,7 @@ object ProtonExtras { else { archive.delete() unqueue(context, tool) - record(context, tool, placed, asset.tag, test) + record(context, tool, placed, asset.tag) if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) @@ -349,7 +344,7 @@ object ProtonExtras { } } - private fun releases(tool: Tool): JSONArray? = releases(tool) { page -> + internal fun releases(tool: Tool): JSONArray? = releases(tool) { page -> Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> try { JSONArray(body) @@ -361,51 +356,70 @@ object ProtonExtras { } internal fun releases(tool: Tool, fetch: (Int) -> JSONArray?): JSONArray? { + return releasesResult(tool, fetch, stopAtStable = true)?.releases + } + + internal fun releasesForRemoval(tool: Tool, fetch: (Int) -> JSONArray? = { page -> + Downloader.downloadString(RELEASES.format(Locale.ROOT, tool.repo, page))?.let { body -> + runCatching { JSONArray(body) }.getOrNull() + } + }): ReleaseFetch? = releasesResult(tool, fetch, stopAtStable = false) + + internal fun releaseGone(tool: Tool, tag: String): Boolean = + Downloader.gone(RELEASE_TAG.format(Locale.ROOT, tool.repo, java.net.URLEncoder.encode(tag, "UTF-8").replace("+", "%20"))) == true + + private fun releasesResult(tool: Tool, fetch: (Int) -> JSONArray?, stopAtStable: Boolean): ReleaseFetch? { val all = fetch(1) ?: return null var page = 1 var last = all.length() - while (last > 0 && page < RELEASE_PAGES && pickAsset(tool, all) == null) { + var complete = last < RELEASE_PAGE_SIZE + while (!complete && page < RELEASE_PAGES && (!stopAtStable || pickAsset(tool, all) == null)) { val next = fetch(++page) ?: return null for (i in 0 until next.length()) all.put(next.opt(i)) last = next.length() + complete = last < RELEASE_PAGE_SIZE } - return all + return ReleaseFetch(all, complete) } - internal fun pickAsset(tool: Tool, array: JSONArray, test: Boolean = false): Asset? { + internal fun assets(tool: Tool, array: JSONArray, prerelease: Boolean): List { + val releases = (0 until array.length()).mapNotNull { array.optJSONObject(it) }.filter { !it.optBoolean("draft", false) } + val stableAt = releases.filter { !it.optBoolean("prerelease", false) }.maxOfOrNull { it.optString("published_at") }.orEmpty() + return releases + .filter { it.optBoolean("prerelease", false) == prerelease && (!prerelease || it.optString("published_at") > stableAt) } + .mapNotNull { assetOf(tool, it, experimental = prerelease) } + } + + internal fun pickAsset(tool: Tool, array: JSONArray): Asset? { val candidates = (0 until array.length()).asSequence() .mapNotNull { array.optJSONObject(it) } - .filter { !it.optBoolean("draft", false) && it.optBoolean("prerelease", false) == test } - if (!test) return candidates.firstNotNullOfOrNull { assetOf(tool, it) } - val stable = pickAsset(tool, array)?.tag ?: return null - return candidates - .filter { it.optString("tag_name").startsWith(tool.prefix) && updateFor(listOf(stable), it.optString("tag_name")) != null } - .mapNotNull { assetOf(tool, it, requireChecksum = true) } - .maxWithOrNull { a, b -> compareVersions(a.tag, b.tag) } + .filter { !it.optBoolean("draft", false) && !it.optBoolean("prerelease", false) } + return candidates.firstNotNullOfOrNull { assetOf(tool, it) } } internal fun updateLatest(cache: JSONObject, tool: Tool, array: JSONArray?, now: Long) { if (array == null) return - val test = if (tool.id == OWN) pickAsset(tool, array, test = true)?.tag else null val tag = pickAsset(tool, array)?.tag if (tag == null) { - cache.optJSONObject(tool.id)?.remove("test") return } - cache.put(tool.id, JSONObject().put("tag", tag).put("at", now).putOpt("test", test)) + cache.put(tool.id, JSONObject().put("tag", tag).put("at", now)) } - private fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false): Asset? = try { + internal fun assetOf(tool: Tool, release: JSONObject, requireChecksum: Boolean = false, experimental: Boolean = false): Asset? = try { val assets = release.optJSONArray("assets") val entries = assets?.let { list -> (0 until list.length()).mapNotNull { list.optJSONObject(it) } }.orEmpty() - entries.sortedBy { it.optString("name") }.filter { tool.assetPattern.containsMatchIn(it.optString("name")) }.mapNotNull { archive -> + entries.sortedBy { it.optString("name") }.filter { + val name = it.optString("name") + if (experimental && tool.id == OWN) name.startsWith(release.optString("tag_name")) && ExperimentalProtons.TARBALL.containsMatchIn(name) && !ExperimentalProtons.FOREIGN_ARCH.containsMatchIn(name) else tool.assetPattern.containsMatchIn(name) + }.mapNotNull { archive -> val name = archive.optString("name") val stem = name.substringBefore(".tar") val checksum = entries.firstOrNull { it.optString("name").startsWith(stem) && it.optString("name").contains("sha512", ignoreCase = true) }?.optString("browser_download_url")?.takeIf { it.startsWith("http") } archive.optString("browser_download_url").takeIf { it.startsWith("http") }?.let { url -> - Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest"))) + Asset(release.optString("tag_name"), name, url, checksum, archive.optLong("size", 0L), Hashes.githubSha256(archive.optString("digest")), release.optString("name").ifEmpty { release.optString("tag_name") }) } }.let { found -> if (requireChecksum) found.firstOrNull { it.sha256 != null || it.sha512 != null } else found.firstOrNull() } } catch (e: Exception) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index aaf77c3f5f..e15fac1c64 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -417,10 +417,12 @@ class SessionService : Service() { SessionPrefs.screenEffectsProfileId(SessionState.mode, resolvedGameId, SessionState.program), ) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) - val gen = synchronized(stopLock) { - SessionState.steamClientArch = null - SessionState.running = true - ++sessionGen + val gen = synchronized(SessionState.startLock) { + synchronized(stopLock) { + SessionState.steamClientArch = null + SessionState.running = true + ++sessionGen + } } if (SessionState.stopRequested) { stopSession(0) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 5f17212e52..6124947151 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -43,6 +43,8 @@ object SessionState { @Volatile var stopRequested = false + val startLock = Any() + @Volatile var running = false @Volatile diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 13d300c5f6..908f229e3a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -84,6 +84,7 @@ import com.droiddeck.launcher.R import com.droiddeck.launcher.session.ComponentUpdater import com.droiddeck.launcher.session.ComponentUpdates import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ComponentsManager.CatalogItem import com.droiddeck.launcher.session.ComponentsManager.Snapshot import kotlinx.coroutines.delay @@ -597,11 +598,9 @@ fun ComponentsPage( if (rows.isEmpty()) EmptyLine(stringResource(R.string.comp_nothing_new)) for (row in rows) { val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning - val test = row.test != null && (nightlyPicked[row.id] == true || row.installed != null && row.update == null) GetLine( row.name, when { - test -> row.test!! row.update != null -> stringResource(R.string.proton_update_available, row.update) row.queued -> stringResource(R.string.proton_queued) else -> stringResource(R.string.proton_not_installed) @@ -610,11 +609,8 @@ fun ComponentsPage( stage = if (protons.busyId == row.id) protons.stage else null, enabled = idle, onCancel = if (row.queued && protons.busyId == null && !protons.sessionRunning) ({ protonActions.onCancel(row.id) }) else null, - action = if (!test && row.update != null) stringResource(R.string.common_update) else null, - channel = if (row.test != null) ({ - ChannelToggle(test, enabled = idle && (row.installed == null || row.update != null), other = R.string.comp_channel_test) { nightlyPicked[row.id] = !test } - }) else null, - ) { if (test) protonActions.onInstallTest(row.id) else protonActions.onInstall(row.id) } + action = if (row.update != null) stringResource(R.string.common_update) else null, + ) { protonActions.onInstall(row.id) } } } else -> { @@ -742,11 +738,9 @@ fun ComponentsPage( } } } - if (l == PROTON_TAB && DeveloperTools.on) { + if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) ExperimentalProtonGroup(protons, protonActions) - } - if (l == PROTON_TAB) { Spacer(Modifier.height(12.dp)) Note(stringResource(R.string.comp_about_text)) } @@ -1645,8 +1639,15 @@ private fun ExperimentalProtonGroup(protons: ProtonsState, actions: ProtonsActio val idle = protons.busyId == null && protons.runtimeReady && !protons.sessionRunning RowGroup(stringResource(R.string.xproton_title)) { if (busy) GetLine(stringResource(R.string.xproton_title), "", progress = protons.percent, enabled = false, stage = protons.stage) {} - else Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { - SmallButton(stringResource(R.string.xproton_pick_zip), enabled = idle, onClick = actions.onExperimentalFile) + else { + protons.experimentalReleases.forEach { release -> + GetLine(release.name, release.tag, progress = null, enabled = idle, action = stringResource(R.string.proton_install_now)) { + actions.onExperimentalRelease(release) + } + } + Row(horizontalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.padding(start = 14.dp, top = 4.dp, bottom = 8.dp)) { + SmallButton(stringResource(R.string.xproton_install_file), enabled = idle, onClick = actions.onExperimentalFile) + } } } } @@ -1659,23 +1660,24 @@ class ProtonsState( val runtimeReady: Boolean = true, val sessionRunning: Boolean = false, val experimental: List = emptyList(), + val experimentalReleases: List = emptyList(), ) class ProtonsActions( val onInstall: (String) -> Unit = {}, - val onInstallTest: (String) -> Unit = {}, val onCancel: (String) -> Unit = {}, val onRemove: (String, String) -> Unit = { _, _ -> }, val onRemoveOlder: (String) -> Unit = {}, val onExperimentalFile: () -> Unit = {}, + val onExperimentalRelease: (ExperimentalProtons.Release) -> Unit = {}, val onRemoveExperimental: (String) -> Unit = {}, ) class ProtonRow( val id: String, val name: String, val installed: String?, val queued: Boolean, - val installedAll: List = listOfNotNull(installed), val update: String? = null, val test: String? = null, + val installedAll: List = listOfNotNull(installed), val update: String? = null, ) { - val available: Boolean get() = installed == null || update != null || test != null + val available: Boolean get() = installed == null || update != null } @Composable diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index dc432165d9..52c5f64a1e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -585,7 +585,6 @@ في الإصدارات الليلية · %1$d مستقر ليلي - تجريبي حدّث لعرض الحزم في إصدارات Nightlies وDroidDeck. لا جديد منذ آخر فحص. استيراد ملف ‎.wcp @@ -2406,12 +2405,11 @@ بدأت جلسة خلال التنزيل، أوقفها قبل تثبيت أدوات التوافق جارٍ تثبيت %1$s إصدارات تجريبية - اختر ملف .zip لإصدار Proton - تثبيت من ملف .zip + تثبيت من ملف + يحتوي الأرشيف على رابط أو مسار غير آمن + أرشيف غير مدعوم أو غير صالح لا توجد مساحة كافية لإصدار Proton هذا - جارٍ فك الضغط جارٍ تفريغ Proton (بضع دقائق) - ملف .zip لا يحتوي على أرشيف tar لـ Proton فشل التفريغ (tar %1$d) الأرشيف لا يحتوي على إصدار Proton تعذّر وضع إصدار Proton @@ -4276,4 +4274,4 @@ الإبرازات نجاح خطأ - \ No newline at end of file + diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index e6b952e051..6bb03b842b 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2398,12 +2397,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 68e8f04c51..cc99224c93 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -577,7 +577,6 @@ В Nightlies · %1$d Стабилна Нощна - Тестова Обновете, за да видите пакетите в Nightlies и DroidDeck. Нищо ново от последната проверка. Импортиране на .wcp @@ -2302,12 +2301,11 @@ По време на изтеглянето започна сесия - спри я, преди да инсталираш инструменти за съвместимост Инсталиране на %1$s Експериментални версии - Изберете .zip с версия на Proton - Инсталиране от .zip + Инсталиране от файл + Архивът съдържа опасна връзка или път + Неподдържан или невалиден архив Няма достатъчно свободно място за тази версия на Proton - Разархивиране Разопаковане на Proton (няколко минути) - В .zip няма архив tar на Proton Разопаковането не успя (tar %1$d) Архивът не съдържа версия на Proton Версията на Proton не можа да бъде поставена @@ -4116,4 +4114,4 @@ Акценти Успех Грешка - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9adcee02c7..15df9624b9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -581,7 +581,6 @@ Na Nightlies · %1$d Stabilní Noční - Testovací Obnovte pro zobrazení balíčků na Nightlies a DroidDeck. Od poslední kontroly nic nového. Importovat .wcp @@ -2354,12 +2353,11 @@ Během stahování se spustila relace; před instalací nástrojů kompatibility ji zastavte Instalování %1$s Experimentální sestavení - Vyberte .zip se sestavením Proton - Instalovat ze souboru .zip + Instalovat ze souboru + Archiv obsahuje nebezpečný odkaz nebo cestu + Nepodporovaný nebo neplatný archiv Pro toto sestavení Proton není dost volného místa - Rozbalování Rozbalování Proton (několik minut) - Soubor .zip neobsahuje archiv tar s Proton Rozbalení se nezdařilo (tar %1$d) Archiv neobsahuje sestavení Proton Sestavení Proton se nepodařilo umístit @@ -4196,4 +4194,4 @@ Zvýraznění Úspěch Chyba - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e46157c608..4a5dac730f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Opdater for at se pakker på Nightlies og DroidDeck. Intet nyt siden sidste kontrol. Importer .wcp @@ -2302,12 +2301,11 @@ En session startede under downloadet; stop den før du installerer kompatibilitetsværktøjer Installerer %1$s Eksperimentelle builds - Vælg en Proton-build som .zip - Installer fra .zip + Installer fra fil + Arkivet indeholder et usikkert link eller en sti + Ikke-understøttet eller ugyldigt arkiv Der er ikke nok ledig plads til denne Proton-build - Udpakker zip Udpakker Proton (nogle få minutter) - Filen .zip indeholder ingen Proton-tarball Udpakning mislykkedes (tar %1$d) Arkivet indeholder ingen Proton-build Kunne ikke placere Proton-builden @@ -4116,4 +4114,4 @@ Fremhævninger Succes Fejl - \ No newline at end of file + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index c3d3db896f..068f519c59 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -577,7 +577,6 @@ In den Nightlies · %1$d Stabil Nightly - Test Aktualisiere, um die Pakete in den Nightlies und bei DroidDeck aufzulisten. Nichts Neues seit der letzten Prüfung. .wcp importieren @@ -2294,12 +2293,11 @@ Während des Downloads wurde eine Sitzung gestartet; beende sie, bevor du Kompatibilitätstools installierst %1$s wird installiert Experimentelle Builds - Proton-Build als .zip auswählen - Aus .zip installieren + Aus Datei installieren + Das Archiv enthält einen unsicheren Link oder Pfad + Nicht unterstütztes oder ungültiges Archiv Nicht genug freier Speicher für diesen Proton-Build - Wird entpackt Proton wird entpackt (einige Minuten) - Die .zip enthält kein Proton-Tarball Entpacken fehlgeschlagen (tar %1$d) Das Archiv enthält keinen Proton-Build Der Proton-Build konnte nicht abgelegt werden @@ -4116,4 +4114,4 @@ Hervorhebungen Erfolg Fehler - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1c4e366e1c..f4873ceb7c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -577,7 +577,6 @@ Στα Nightlies · %1$d Σταθερή Νυχτερινή - Δοκιμαστική Ανανεώστε για να εμφανιστούν τα πακέτα στα Nightlies και στο DroidDeck. Τίποτα νέο από τον τελευταίο έλεγχο. Εισαγωγή .wcp @@ -2302,12 +2301,11 @@ Μια συνεδρία ξεκίνησε κατά τη λήψη· διακόψτε την πριν εγκαταστήσετε εργαλεία συμβατότητας Εγκατάσταση %1$s Πειραματικές εκδόσεις - Επιλέξτε ένα .zip έκδοσης Proton - Εγκατάσταση από .zip + Εγκατάσταση από αρχείο + Το αρχείο περιέχει μη ασφαλή σύνδεσμο ή διαδρομή + Μη υποστηριζόμενο ή μη έγκυρο αρχείο Δεν υπάρχει αρκετός ελεύθερος χώρος για αυτήν την έκδοση Proton - Αποσυμπίεση Αποσυσκευασία του Proton (λίγα λεπτά) - Το .zip δεν περιέχει αρχείο tar του Proton Η αποσυσκευασία απέτυχε (tar %1$d) Το αρχείο δεν περιέχει έκδοση Proton Δεν ήταν δυνατή η τοποθέτηση της έκδοσης Proton @@ -4116,4 +4114,4 @@ Επισημάνσεις Επιτυχία Σφάλμα - \ No newline at end of file + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bd4fddf71d..e39fae7b8a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -579,7 +579,6 @@ En las Nightlies · %1$d Estable Nocturna - Prueba Actualiza para listar los paquetes de Nightlies y DroidDeck. Nada nuevo desde la última comprobación. Importar .wcp @@ -2328,12 +2327,11 @@ Se inició una sesión durante la descarga; detenla antes de instalar herramientas de compatibilidad Instalando %1$s Versiones experimentales - Elige un .zip de una versión de Proton - Instalar desde .zip + Instalar desde archivo + El archivo contiene un enlace o una ruta no segura + Archivo no compatible o no válido No hay espacio libre suficiente para esta versión de Proton - Descomprimiendo Desempaquetando Proton (unos minutos) - El .zip no contiene ningún tarball de Proton Error al desempaquetar (tar %1$d) El archivo no contiene ninguna versión de Proton No se pudo colocar la versión de Proton @@ -4156,4 +4154,4 @@ Destacados Éxito Error - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 5bb3bd1af5..e9dacd8e0f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -577,7 +577,6 @@ Nightliesissä · %1$d Vakaa Yöversio - Testi Päivitä nähdäksesi Nightliesin ja DroidDeckin paketit. Ei mitään uutta viimeisimmän tarkistuksen jälkeen. Tuo .wcp @@ -2302,12 +2301,11 @@ Istunto käynnistyi latauksen aikana; pysäytä se ennen yhteensopivuustyökalujen asentamista Asennetaan %1$s Kokeelliset versiot - Valitse Proton-version .zip - Asenna .zip-tiedostosta + Asenna tiedostosta + Arkisto sisältää vaarallisen linkin tai polun + Arkistoa ei tueta tai se on virheellinen Tälle Proton-versiolle ei ole tarpeeksi vapaata tilaa - Puretaan zip Puretaan Protonia (muutama minuutti) - Tiedostossa .zip ei ole Proton-tar-pakettia Purku epäonnistui (tar %1$d) Arkisto ei sisällä Proton-versiota Proton-versiota ei voitu sijoittaa @@ -4116,4 +4114,4 @@ Korostukset Onnistuminen Virhe - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1177bfc170..e76d3e6dab 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -579,7 +579,6 @@ Dans Nightlies · %1$d Stable Nightly - Test Actualiser pour lister les paquets dans Nightlies et DroidDeck. Aucun nouvel élément depuis la dernière vérification. Importer .wcp @@ -2327,12 +2326,11 @@ Une session a démarré pendant le téléchargement ; arrêtez-la avant d\'installer des outils de compatibilité Installation de %1$s Versions expérimentales - Choisir un .zip de version Proton - Installer depuis un .zip + Installer depuis un fichier + L’archive contient un lien ou chemin dangereux + Archive non prise en charge ou invalide Espace libre insuffisant pour cette version de Proton - Décompression Extraction de Proton (quelques minutes) - Le .zip ne contient aucune archive tar de Proton Échec de l\'extraction (tar %1$d) L\'archive ne contient aucune version de Proton Impossible de placer la version de Proton @@ -4155,4 +4153,4 @@ Mises en évidence Succès Erreur - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c92d69ca9f..2f5d3957fc 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -577,7 +577,6 @@ Nightlies पर · %1$d स्थिर नाइटली - परीक्षण Nightlies और DroidDeck के पैकेज सूचीबद्ध करने के लिए रीफ़्रेश करें। पिछली जांच के बाद कुछ नया नहीं है। .wcp इंपोर्ट करें @@ -2302,12 +2301,11 @@ डाउनलोड के दौरान एक सेशन शुरू हुआ; कम्पैटिबिलिटी टूल इंस्टॉल करने से पहले इसे बंद करें %1$s इंस्टॉल हो रहा है प्रायोगिक बिल्ड - Proton बिल्ड की .zip चुनें - .zip से इंस्टॉल करें + फ़ाइल से इंस्टॉल करें + आर्काइव में असुरक्षित लिंक या पथ है + असमर्थित या अमान्य आर्काइव इस Proton बिल्ड के लिए पर्याप्त खाली जगह नहीं है - अनज़िप हो रहा है Proton अनपैक हो रहा है (कुछ मिनट) - .zip में Proton का कोई tar आर्काइव नहीं है अनपैक करना विफल रहा (tar %1$d) आर्काइव में कोई Proton बिल्ड नहीं है Proton बिल्ड को रखा नहीं जा सका @@ -4116,4 +4114,4 @@ हाइलाइट सफलता त्रुटि - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 301db987d2..50d616a3ca 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -577,7 +577,6 @@ A Nightliesen · %1$d Stabil Nightly - Teszt Frissítsen a Nightlies és a DroidDeck csomagjainak listázásához. Nincs semmi új az utolsó ellenőrzés óta. .wcp importálása @@ -2302,12 +2301,11 @@ Egy munkamenet elindult a letöltés közben; állítsa le a kompatibilitási eszközök telepítése előtt %1$s telepítése Kísérleti buildek - Válassz egy Proton-build .zip fájlt - Telepítés .zip fájlból + Telepítés fájlból + Az archívum nem biztonságos hivatkozást vagy útvonalat tartalmaz + Nem támogatott vagy érvénytelen archívum Nincs elég szabad hely ehhez a Proton-buildhez - Kicsomagolás A Proton kibontása (néhány perc) - A .zip nem tartalmaz Proton tar-csomagot A kibontás nem sikerült (tar %1$d) Az archívum nem tartalmaz Proton-buildet Nem sikerült elhelyezni a Proton-buildet @@ -4116,4 +4114,4 @@ Kiemelések Siker Hiba - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 29598f3980..1191dc3ac7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -575,7 +575,6 @@ Di Nightlies · %1$d Stabil Nightly - Uji Segarkan untuk melihat daftar paket di Nightlies dan DroidDeck. Tidak ada yang baru sejak pemeriksaan terakhir. Impor .wcp @@ -2277,12 +2276,11 @@ Sesi dimulai saat pengunduhan berlangsung; hentikan sesi tersebut sebelum menginstal alat kompatibilitas Menginstal %1$s Build eksperimental - Pilih .zip build Proton - Instal dari .zip + Instal dari file + Arsip berisi tautan atau jalur yang tidak aman + Arsip tidak didukung atau tidak valid Ruang kosong tidak cukup untuk build Proton ini - Mengekstrak zip Membuka paket Proton (beberapa menit) - .zip tidak berisi tarball Proton Gagal membuka paket (tar %1$d) Arsip tidak berisi build Proton Tidak dapat menempatkan build Proton @@ -4086,4 +4084,4 @@ Sorotan Berhasil Kesalahan - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7b4d3f2870..66fcd52a17 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -579,7 +579,6 @@ Nelle Nightlies · %1$d Stabile Nightly - Test Aggiorna per elencare i pacchetti nelle Nightlies e in DroidDeck. Niente di nuovo dall\'ultimo controllo. Importa .wcp @@ -2319,12 +2318,11 @@ È stata avviata una sessione durante il download; interrompila prima di installare strumenti di compatibilità Installazione di %1$s Build sperimentali - Scegli uno .zip di una build di Proton - Installa da .zip + Installa da file + L\'archivio contiene un collegamento o percorso non sicuro + Archivio non supportato o non valido Spazio libero insufficiente per questa build di Proton - Decompressione Estrazione di Proton (qualche minuto) - Lo .zip non contiene alcun tarball di Proton Estrazione non riuscita (tar %1$d) L\'archivio non contiene alcuna build di Proton Impossibile posizionare la build di Proton @@ -4155,4 +4153,4 @@ Evidenziazioni Successo Errore - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index e5cdba2950..a274e0c638 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -575,7 +575,6 @@ Nightlies内 · %1$d 安定版 ナイトリー - テスト 更新してNightliesとDroidDeckのパッケージを一覧表示します。 前回の確認以降、新しいものはありません。 .wcpをインポート @@ -2277,12 +2276,11 @@ ダウンロード中にセッションが開始されました。停止してから互換性ツールをインストールしてください %1$sをインストール中 試験版ビルド - Protonビルドの.zipを選択 - .zipからインストール + ファイルからインストール + アーカイブに安全でないリンクまたはパスが含まれています + 未対応または無効なアーカイブ このProtonビルド用の空き容量が足りません - 解凍中 Protonを展開中(数分かかります) - .zipにProtonのtarballが含まれていません 展開に失敗しました(tar %1$d) アーカイブにProtonビルドが含まれていません Protonビルドを配置できませんでした @@ -4086,4 +4084,4 @@ 強調表示 成功 エラー - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 536d332105..c3bd68537b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -575,7 +575,6 @@ Nightlies 내 · %1$d 안정판 나이틀리 - 테스트 새로 고쳐 Nightlies 및 DroidDeck의 패키지를 나열합니다. 마지막 확인 이후 새로운 내용이 없습니다. .wcp 가져오기 @@ -2277,12 +2276,11 @@ 다운로드 중에 세션이 시작되었습니다. 호환성 도구를 설치하기 전에 세션을 중지하세요 %1$s 설치 중 실험용 빌드 - Proton 빌드 .zip 선택 - .zip에서 설치 + 파일에서 설치 + 압축 파일에 안전하지 않은 링크 또는 경로가 포함되어 있습니다 + 지원되지 않거나 잘못된 압축 파일 이 Proton 빌드를 설치할 여유 공간이 부족합니다 - 압축 해제 중 Proton 풀는 중 (몇 분 소요) - .zip에 Proton tar 파일이 없습니다 압축 풀기 실패 (tar %1$d) 아카이브에 Proton 빌드가 없습니다 Proton 빌드를 배치할 수 없습니다 @@ -4086,4 +4084,4 @@ 강조 표시 성공 오류 - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bcc31c2f02..134f1702c0 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -575,7 +575,6 @@ Pada Nightlies · %1$d Stabil Nightly - Ujian Segarkan semula untuk menyenaraikan pakej pada Nightlies dan DroidDeck. Tiada apa-apa yang baharu sejak semakan terakhir. Import .wcp @@ -2277,12 +2276,11 @@ Sesi dimulakan semasa muat turun; hentikan dahulu sebelum memasang alat keserasian Memasang %1$s Binaan eksperimen - Pilih .zip binaan Proton - Pasang daripada .zip + Pasang daripada fail + Arkib mengandungi pautan atau laluan tidak selamat + Arkib tidak disokong atau tidak sah Ruang kosong tidak mencukupi untuk binaan Proton ini - Menyahzip Membuka pakej Proton (beberapa minit) - .zip tidak mengandungi tarball Proton Gagal membuka pakej (tar %1$d) Arkib tidak mengandungi binaan Proton Tidak dapat meletakkan binaan Proton @@ -4086,4 +4084,4 @@ Sorotan Berjaya Ralat - \ No newline at end of file + diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2c1878427c..de0bac7fc6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -577,7 +577,6 @@ På Nightlies · %1$d Stabil Nightly - Test Oppdater for å liste pakker på Nightlies og DroidDeck. Ingenting nytt siden siste sjekk. Importer .wcp @@ -2302,12 +2301,11 @@ En sesjon startet under nedlastingen; avslutt den før du installerer kompatibilitetsverktøy Installerer %1$s Eksperimentelle bygg - Velg en Proton-bygg som .zip - Installer fra .zip + Installer fra fil + Arkivet inneholder en utrygg lenke eller bane + Arkivet støttes ikke eller er ugyldig Ikke nok ledig plass til dette Proton-bygget - Pakker ut zip Pakker ut Proton (noen få minutter) - .zip-filen inneholder ingen Proton-tarball Utpakking mislyktes (tar %1$d) Arkivet inneholder ingen Proton-bygg Kunne ikke plassere Proton-bygget @@ -4116,4 +4114,4 @@ Uthevinger Suksess Feil - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8134e019ed..16b5a74ec8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -577,7 +577,6 @@ In de Nightlies · %1$d Stabiel Nightly - Test Vernieuw om de pakketten in de Nightlies en bij DroidDeck te tonen. Niets nieuws sinds de laatste controle. .wcp importeren @@ -2302,12 +2301,11 @@ Er is een sessie gestart tijdens het downloaden; stop die voordat je compatibiliteitstools installeert %1$s installeren Experimentele builds - Kies een Proton-build als .zip - Installeren vanuit .zip + Installeren vanuit bestand + Archief bevat een onveilige link of pad + Niet-ondersteund of ongeldig archief Niet genoeg vrije ruimte voor deze Proton-build - Uitpakken van zip Proton uitpakken (enkele minuten) - De .zip bevat geen Proton-tarball Uitpakken mislukt (tar %1$d) Het archief bevat geen Proton-build Kan de Proton-build niet plaatsen @@ -4116,4 +4114,4 @@ Accenten Geslaagd Fout - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6bae94dd48..8b624db10e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -581,7 +581,6 @@ W wersjach nightly · %1$d Stabilna Nightly - Testowa Odśwież, aby wyświetlić pakiety w Nightlies i DroidDeck. Nic nowego od ostatniego sprawdzenia. Importuj .wcp @@ -2354,12 +2353,11 @@ Podczas pobierania uruchomiono sesję; zatrzymaj ją przed instalacją narzędzi zgodności Instalowanie %1$s Kompilacje eksperymentalne - Wybierz plik .zip z kompilacją Proton - Zainstaluj z pliku .zip + Instaluj z pliku + Archiwum zawiera niebezpieczne łącze lub ścieżkę + Nieobsługiwane lub nieprawidłowe archiwum Za mało wolnego miejsca na tę kompilację Proton - Rozpakowywanie Rozpakowywanie Proton (kilka minut) - Plik .zip nie zawiera archiwum tar z Proton Rozpakowywanie nie powiodło się (tar %1$d) Archiwum nie zawiera kompilacji Proton Nie udało się umieścić kompilacji Proton @@ -4196,4 +4194,4 @@ Wyróżnienia Sukces Błąd - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index bda1ae5614..732df24c4c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada de novo desde a última verificação. Importar .wcp @@ -2333,12 +2332,11 @@ Foi iniciada uma sessão durante a transferência; pare-a antes de instalar ferramentas de compatibilidade A instalar %1$s Versões experimentais - Escolha um .zip de versão do Proton - Instalar a partir de .zip + Instalar a partir de ficheiro + O arquivo contém uma ligação ou caminho inseguro + Arquivo não suportado ou inválido Não há espaço livre suficiente para esta versão do Proton - A descompactar A desempacotar o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhuma versão do Proton Não foi possível colocar a versão do Proton @@ -4155,4 +4153,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index e49853cb6a..f0814f45b2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -579,7 +579,6 @@ Nas Nightlies · %1$d Estável Nightly - Teste Atualize para listar os pacotes nas Nightlies e no DroidDeck. Nada novo desde a última verificação. Importar .wcp @@ -2341,12 +2340,11 @@ Uma sessão foi iniciada durante o download; pare-a antes de instalar ferramentas de compatibilidade Instalando %1$s Builds experimentais - Escolha um .zip de build do Proton - Instalar a partir de .zip + Instalar do arquivo + O arquivo contém um link ou caminho inseguro + Arquivo sem suporte ou inválido Não há espaço livre suficiente para este build do Proton - Descompactando Desempacotando o Proton (alguns minutos) - O .zip não contém nenhum tarball do Proton Falha ao desempacotar (tar %1$d) O arquivo não contém nenhum build do Proton Não foi possível colocar o build do Proton @@ -4163,4 +4161,4 @@ Inteiro Ajustar Suavização de serrilhado - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 940364de71..c228979545 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -579,7 +579,6 @@ Pe versiunile nightly · %1$d Stabilă Nightly - Test Reîmprospătează pentru a lista pachetele din Nightlies și DroidDeck. Nimic nou de la ultima verificare. Importă .wcp @@ -2328,12 +2327,11 @@ O sesiune a pornit în timpul descărcării; oprește-o înainte de a instala instrumente de compatibilitate Se instalează %1$s Versiuni experimentale - Alege un .zip cu o versiune Proton - Instalează din .zip + Instalează din fișier + Arhiva conține o legătură sau o cale nesigură + Arhivă neacceptată sau nevalidă Nu există suficient spațiu liber pentru această versiune Proton - Se dezarhivează Se despachetează Proton (câteva minute) - Fișierul .zip nu conține nicio arhivă tar Proton Despachetarea a eșuat (tar %1$d) Arhiva nu conține nicio versiune Proton Versiunea Proton nu a putut fi plasată @@ -4156,4 +4154,4 @@ Evidențieri Succes Eroare - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2673ee7ccd..58a3c4e745 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -581,7 +581,6 @@ В Nightlies · %1$d Стабильная Ночная - Тестовая Обновите, чтобы увидеть пакеты в Nightlies и DroidDeck. С момента последней проверки нового нет. Импорт .wcp @@ -2354,12 +2353,11 @@ Во время загрузки запустилась сессия; остановите ее перед установкой инструментов совместимости Установка %1$s Экспериментальные сборки - Выберите .zip со сборкой Proton - Установить из .zip + Установить из файла + Архив содержит небезопасную ссылку или путь + Неподдерживаемый или недействительный архив Недостаточно свободного места для этой сборки Proton - Распаковка архива Распаковка Proton (несколько минут) - В .zip нет архива tar с Proton Не удалось распаковать (tar %1$d) В архиве нет сборки Proton Не удалось разместить сборку Proton @@ -4196,4 +4194,4 @@ Выделения Успех Ошибка - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8e169e62a2..73c1f9dbe0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -577,7 +577,6 @@ I nattbyggena · %1$d Stabil Nattbygge - Test Uppdatera för att lista paket i Nightlies och DroidDeck. Inget nytt sedan senaste kontrollen. Importera .wcp @@ -2302,12 +2301,11 @@ En session startade under nedladdningen. Stoppa den innan du installerar kompatibilitetsverktyg Installerar %1$s Experimentella byggen - Välj en Proton-version som .zip - Installera från .zip + Installera från fil + Arkivet innehåller en osäker länk eller sökväg + Arkivet stöds inte eller är ogiltigt Inte tillräckligt med ledigt utrymme för den här Proton-versionen - Packar upp zip Packar upp Proton (några minuter) - .zip-filen innehåller ingen Proton-tarball Uppackningen misslyckades (tar %1$d) Arkivet innehåller ingen Proton-version Det gick inte att placera Proton-versionen @@ -4116,4 +4114,4 @@ Markeringar Lyckades Fel - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 243108da7f..43c49d86fa 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -575,7 +575,6 @@ ใน Nightlies · %1$d เสถียร Nightly - ทดสอบ รีเฟรชเพื่อแสดงรายการแพ็กเกจใน Nightlies และ DroidDeck ไม่มีอะไรใหม่ตั้งแต่การตรวจสอบครั้งล่าสุด นำเข้า .wcp @@ -2277,12 +2276,11 @@ มีเซสชันเริ่มขึ้นระหว่างการดาวน์โหลด หยุดเซสชันก่อนติดตั้งเครื่องมือความเข้ากันได้ กำลังติดตั้ง %1$s บิลด์ทดลอง - เลือกไฟล์ .zip ของบิลด์ Proton - ติดตั้งจากไฟล์ .zip + ติดตั้งจากไฟล์ + ไฟล์เก็บถาวรมีลิงก์หรือเส้นทางที่ไม่ปลอดภัย + ไฟล์เก็บถาวรไม่รองรับหรือไม่ถูกต้อง พื้นที่ว่างไม่เพียงพอสำหรับบิลด์ Proton นี้ - กำลังแตกไฟล์ zip กำลังแตกไฟล์ Proton (ใช้เวลาไม่กี่นาที) - ไฟล์ .zip ไม่มี tarball ของ Proton แตกไฟล์ไม่สำเร็จ (tar %1$d) ไฟล์เก็บถาวรไม่มีบิลด์ Proton ไม่สามารถวางบิลด์ Proton ได้ @@ -4086,4 +4084,4 @@ จุดเน้น สำเร็จ ข้อผิดพลาด - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 25944dc95e..7fd0d204d3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -577,7 +577,6 @@ Nightlies içinde · %1$d Kararlı Nightly - Test Nightlies ve DroidDeck paketlerini listelemek için yenileyin. Son kontrolden beri yeni bir şey yok. .wcp içe aktar @@ -2294,12 +2293,11 @@ İndirme sırasında bir oturum başladı; uyumluluk araçlarını yüklemeden önce durdurun %1$s yükleniyor Deneysel sürümler - Bir Proton sürümü .zip dosyası seçin - Şuradan yükle: .zip + Dosyadan yükle + Arşiv güvenli olmayan bir bağlantı veya yol içeriyor + Desteklenmeyen veya geçersiz arşiv Bu Proton sürümü için yeterli boş alan yok - Zip açılıyor Proton paketten çıkarılıyor (birkaç dakika) - .zip dosyasında Proton tar arşivi yok Paketten çıkarma başarısız oldu (tar %1$d) Arşivde Proton sürümü yok Proton sürümü yerleştirilemedi @@ -4116,4 +4114,4 @@ Vurgular Başarılı Hata - \ No newline at end of file + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 55bd3196c9..be20c1fb05 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -581,7 +581,6 @@ У нічних збірках · %1$d Стабільна Нічна - Тестова Оновіть, щоб побачити пакети з Nightlies і DroidDeck. Нічого нового з часу останньої перевірки. Імпортувати .wcp @@ -2354,12 +2353,11 @@ Під час завантаження розпочався сеанс; зупиніть його, перш ніж встановлювати інструменти сумісності Встановлення %1$s Експериментальні збірки - Виберіть .zip зі збіркою Proton - Встановити з .zip + Встановити з файлу + Архів містить небезпечне посилання або шлях + Непідтримуваний або недійсний архів Недостатньо вільного місця для цієї збірки Proton - Розпакування архіву Розпакування Proton (кілька хвилин) - У .zip немає архіву tar із Proton Не вдалося розпакувати (tar %1$d) В архіві немає збірки Proton Не вдалося розмістити збірку Proton @@ -4196,4 +4194,4 @@ Виділення Успіх Помилка - \ No newline at end of file + diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 347822317f..33796ad9c4 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -575,7 +575,6 @@ Trên Nightlies · %1$d Ổn định Nightly - Thử nghiệm Làm mới để liệt kê các gói trên Nightlies và DroidDeck. Không có gì mới từ lần kiểm tra trước. Nhập tệp .wcp @@ -2277,12 +2276,11 @@ Một phiên đã bắt đầu trong khi tải; hãy dừng nó trước khi cài công cụ tương thích Đang cài %1$s Bản dựng thử nghiệm - Chọn tệp .zip bản dựng Proton - Cài đặt từ .zip + Cài đặt từ tệp + Tệp lưu trữ chứa liên kết hoặc đường dẫn không an toàn + Tệp lưu trữ không được hỗ trợ hoặc không hợp lệ Không đủ dung lượng trống cho bản dựng Proton này - Đang giải nén zip Đang giải nén Proton (vài phút) - Tệp .zip không chứa tarball Proton Giải nén thất bại (tar %1$d) Tệp lưu trữ không chứa bản dựng Proton Không thể đặt bản dựng Proton @@ -4086,4 +4084,4 @@ Điểm nhấn Thành công Lỗi - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2ece3be681..667f1cb9c1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -575,7 +575,6 @@ 在 Nightlies 上 · %1$d 稳定版 每夜版 - 测试 刷新以列出 Nightlies 和 DroidDeck 上的软件包。 自上次检查以来没有新内容。 导入 .wcp @@ -2354,12 +2353,11 @@ 下载期间有会话启动;请先停止它,再安装兼容性工具 正在安装 %1$s 实验版本 - 选择 Proton 版本 .zip - 从 .zip 安装 + 从文件安装 + 压缩包包含不安全的链接或路径 + 不支持或无效的压缩包 可用空间不足,无法安装此 Proton 版本 - 正在解压 正在解包 Proton(需要几分钟) - .zip 中不含 Proton tar 包 解包失败(tar %1$d) 压缩包中不含 Proton 版本 无法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 高亮 成功 错误 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8ba6d09f98..2ec673e61b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -575,7 +575,6 @@ Nightlies · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 及 DroidDeck 中的軟件包。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有會話啟動;請先停止該會話,再安裝兼容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 重點標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dfb1bc732d..d6d0037309 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -575,7 +575,6 @@ Nightlies 中 · %1$d 穩定版 每夜版 - 測試 重新整理以列出 Nightlies 和 DroidDeck 中的套件。 自上次檢查以來沒有新內容。 匯入 .wcp @@ -2276,12 +2275,11 @@ 下載期間有工作階段啟動;請先停止它,再安裝相容性工具 正在安裝 %1$s 實驗版本 - 選擇 Proton 版本 .zip - 從 .zip 安裝 + 從檔案安裝 + 壓縮檔包含不安全的連結或路徑 + 不支援或無效的壓縮檔 可用空間不足,無法安裝此 Proton 版本 - 正在解壓縮 正在解包 Proton(需要幾分鐘) - .zip 中不含 Proton tar 包 解包失敗(tar %1$d) 壓縮檔中不含 Proton 版本 無法放置 Proton 版本 @@ -4086,4 +4084,4 @@ 醒目標示 成功 錯誤 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05a387b644..965ab2322e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -605,7 +605,6 @@ On the Nightlies · %1$d Stable Nightly - Test Refresh to list packages on the Nightlies and DroidDeck releases. Nothing new since the last check. Import .wcp @@ -2544,12 +2543,11 @@ A session started during the download; stop it before installing compatibility tools Installing %1$s Experimental builds - Pick a Proton build .zip - Install from .zip + Install from file + Archive contains an unsafe link or path + Unsupported or invalid archive Not enough free space for this Proton build - Unzipping Unpacking Proton (a few minutes) - The .zip holds no Proton tarball Unpacking failed (tar %1$d) The archive holds no Proton build Could not place the Proton build diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt index 8e48d3c353..e19b1d6347 100644 --- a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -202,7 +202,7 @@ class CompatLaunchTest { val entered = CountDownLatch(1) val finish = CountDownLatch(1) protons.protonBusyId = null - protons.installer = { _, _, progress -> + protons.installer = { _, progress -> progress("Verifying download", 64) entered.countDown() check(finish.await(5, TimeUnit.SECONDS)) diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt index 270b9de489..2e06a6d8fe 100644 --- a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -7,6 +7,7 @@ import android.os.Looper import androidx.compose.ui.geometry.Rect import com.droiddeck.launcher.frontend.AutoComponents import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.ExperimentalProtons import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.session.SessionState import com.droiddeck.launcher.session.SessionPhase @@ -25,7 +26,9 @@ import org.robolectric.Shadows.shadowOf import org.robolectric.annotation.Config import org.robolectric.util.ReflectionHelpers import java.io.File +import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) @@ -60,7 +63,7 @@ class ProtonMenuAutoTest { menu.protonProblem = null menu.protonStage = null menu.protonPercent = -1 - menu.installer = { tool, _, progress -> + menu.installer = { tool, progress -> progress("Installing ${tool.name}", 50) install("${tool.prefix}-11-12") null @@ -88,6 +91,67 @@ class ProtonMenuAutoTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + private fun prerelease(tag: String) = ExperimentalProtons.Release(tag, "$tag.tar.xz", "https://github.com/o/r/releases/download/$tag/$tag.tar.xz", null, 1L) + + private fun recreatedMenu(refreshes: AtomicInteger, tag: String) = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle }.apply { + installer = menu.installer + latestCheck = { false } + experimentalRefresh = { + refreshes.incrementAndGet() + listOf(prerelease(tag)) + } + } + + @Test + fun aRecreatedMenuJoinsTheRunningRefresh() { + idle = false + val started = CountDownLatch(1) + val gate = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.latestCheck = { false } + menu.experimentalRefresh = { + started.countDown() + gate.await(5, TimeUnit.SECONDS) + listOf(prerelease("first")) + } + menu.checkUpdates() + assertTrue(started.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "second") + recreated.checkUpdates() + gate.countDown() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("first") } + assertEquals(0, refreshes.get()) + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("second") } + assertEquals(1, refreshes.get()) + } + + @Test + fun aFinishedRefreshIsPublishedBeforeTheNextOneStarts() { + idle = false + val finished = CountDownLatch(1) + val refreshes = AtomicInteger() + menu.experimentalReleases = emptyList() + menu.latestCheck = { false } + menu.experimentalRefresh = { + finished.countDown() + listOf(prerelease("older")) + } + menu.checkUpdates() + assertTrue(finished.await(5, TimeUnit.SECONDS)) + val recreated = recreatedMenu(refreshes, "newer") + repeat(20) { + recreated.checkUpdates() + Thread.sleep(10) + } + assertEquals(0, refreshes.get()) + assertTrue(recreated.experimentalReleases.isEmpty()) + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("older") } + recreated.checkUpdates() + waitUntil { recreated.experimentalReleases.map { it.tag } == listOf("newer") } + assertEquals(1, refreshes.get()) + } + private fun waitUntil(done: () -> Boolean) { val deadline = System.nanoTime() + 5_000_000_000L while (System.nanoTime() < deadline) { @@ -116,7 +180,7 @@ class ProtonMenuAutoTest { @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } SessionState.running = true menu.ensureAutoUpdates() SessionState.running = false @@ -139,11 +203,11 @@ class ProtonMenuAutoTest { @Test fun aFinishedInstallStartsTheComponentCheckAndAFailedOneDoesNot() { var checks = 0 val watched = ProtonMenu(activity, Handler(Looper.getMainLooper()), onInstalled = { checks++ }) { idle } - watched.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + watched.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } watched.installProton("droiddeck") waitUntil { watched.protonBusyId == null && checks == 1 } assertEquals(1, checks) - watched.installer = { _, _, _ -> "failed" } + watched.installer = { _, _ -> "failed" } watched.installProton("ge") waitUntil { watched.protonBusyId == null } assertEquals(1, checks) @@ -152,7 +216,7 @@ class ProtonMenuAutoTest { @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { val ge = install("GE-Proton11-11") install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> + menu.installer = { tool, _ -> attempts.add(tool.id) if (tool.id == "ge") throw IllegalStateException("download failed") install("${tool.prefix}-11-12") @@ -171,7 +235,7 @@ class ProtonMenuAutoTest { @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { install("DroidDeck-Proton-11-12") - menu.installer = { tool, _, _ -> attempts.add(tool.id); null } + menu.installer = { tool, _ -> attempts.add(tool.id); null } menu.ensureAutoUpdates() assertTrue(attempts.isEmpty()) install("GE-Proton11-11") @@ -183,12 +247,12 @@ class ProtonMenuAutoTest { @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { install("DroidDeck-Proton-11-11.1") - menu.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } menu.ensureAutoUpdates() waitUntil { menu.protonBusyId == null } val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) - next.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + next.installer = { tool, _ -> attempts.add(tool.id); "failed" } next.ensureAutoUpdates() assertNull(next.protonBusyId) assertEquals(listOf("droiddeck"), attempts) @@ -208,7 +272,7 @@ class ProtonMenuAutoTest { } @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { - menu.installer = { tool, test, _ -> attempts.add(if (test) "test" else tool.id); install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } ProtonExtras.setDeclined(activity, true) menu.ensureAutoUpdates() assertNull(menu.protonBusyId) @@ -222,11 +286,11 @@ class ProtonMenuAutoTest { menu.removeProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { _, _, _ -> "failed" } + menu.installer = { _, _ -> "failed" } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertTrue(ProtonExtras.declined(activity)) - menu.installer = { tool, _, _ -> install("${tool.prefix}-11-12"); null } + menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } menu.installProton("droiddeck") waitUntil { menu.protonBusyId == null } assertFalse(ProtonExtras.declined(activity)) @@ -236,7 +300,7 @@ class ProtonMenuAutoTest { install("DroidDeck-Proton-11-11.1") val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() val protons = ReflectionHelpers.getField(launcher, "protons") - protons.installer = { tool, _, _ -> attempts.add(tool.id); "failed" } + protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } Motion.refresh(launcher) LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") launcher.startActivity(Intent(launcher, SessionActivity::class.java)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt index 1972a06310..cbb1c52c3f 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ExperimentalProtonsTest.kt @@ -1,7 +1,17 @@ package com.droiddeck.launcher.session import java.io.File +import java.io.RandomAccessFile import java.nio.file.Files +import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry +import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry +import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream +import android.app.Activity +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Before +import org.robolectric.Robolectric import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull @@ -17,6 +27,75 @@ import org.robolectric.annotation.Config @Config(sdk = [28], manifest = Config.NONE) class ExperimentalProtonsTest { @get:Rule val temp = TemporaryFolder() + private lateinit var activity: Activity + + @Before + fun setup() { + activity = Robolectric.buildActivity(Activity::class.java).setup().get() + } + + @Test + fun fileLabelsDropTheWholeArchiveSuffix() { + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar.xz")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tar")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.7z")) + assertEquals("Build-12.8-r34", ExperimentalProtons.fileLabel("Build-12.8-r34.tgz")) + assertEquals("Experimental-Build", ExperimentalProtons.dirName("Build", ExperimentalProtons.fileLabel("Build.tar.gz"))) + } + + @Test + fun installedReleasesLeaveTheAvailableRows() { + val rows = listOf("r34", "r35").map { ExperimentalProtons.Release(it, "$it.tar.xz", "https://example.invalid/$it", null, 1L) } + val installed = listOf( + ExperimentalProtons.Installed("Experimental-r34", "r34", "release", "r34"), + ExperimentalProtons.Installed("Experimental-file", "file", "file"), + ) + assertEquals(listOf("r35"), ExperimentalProtons.available(rows, installed).map { it.tag }) + assertEquals(listOf("r34", "r35"), ExperimentalProtons.available(rows, emptyList()).map { it.tag }) + } + + @Test + fun releaseRowsOnlyUsePublishedPrereleaseTarAssets() { + val tool = ProtonExtras.tools.first { it.id == ProtonExtras.OWN } + val releases = JSONArray(""" + [{"tag_name":"stable","prerelease":false,"published_at":"2026-11-10T00:00:00Z","assets":[{"name":"stable-aarch64.tar.gz","browser_download_url":"https://example/stable"}]}, + {"tag_name":"pre","prerelease":true,"published_at":"2026-11-12T00:00:00Z","assets":[{"name":"pre-aarch64.tar.xz","browser_download_url":"https://example/pre"}]}, + {"tag_name":"superseded","prerelease":true,"published_at":"2026-10-25T00:00:00Z","assets":[{"name":"superseded-aarch64.tar.gz","browser_download_url":"https://example/superseded"}]}, + {"tag_name":"sources","prerelease":true,"published_at":"2026-11-13T00:00:00Z","assets":[{"name":"wine-gecko-x86.tar.xz","browser_download_url":"https://example/sources"}]}, + {"tag_name":"draft","draft":true,"prerelease":true,"published_at":"2026-11-14T00:00:00Z","assets":[{"name":"draft-aarch64.tar.gz","browser_download_url":"https://example/draft"}]}, + {"tag_name":"no-tar","prerelease":true,"published_at":"2026-11-15T00:00:00Z","assets":[{"name":"no-tar.sha512sum","browser_download_url":"https://example/sum"}]}] + """.trimIndent()) + assertEquals(listOf("pre"), ProtonExtras.assets(tool, releases, true).map { it.tag }) + } + + @Test + fun markerRoundTripKeepsReleaseTag() { + val dir = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d/Experimental-pre").apply { mkdirs() } + File(dir, ".droiddeck-experimental.json").writeText(JSONObject().put("label", "Experimental-pre").put("source", "pre").put("releaseTag", "pre").toString()) + assertEquals("pre", ExperimentalProtons.installed(activity).single().releaseTag) + } + + @Test + fun missingReleaseTagsAreAutoRemovedButFileBuildsAreNot() { + val complete = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "kept").put("prerelease", true)), true) + val partial = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", true)), false) + val stable = ProtonExtras.ReleaseFetch(JSONArray().put(JSONObject().put("tag_name", "gone").put("prerelease", false)), false) + assertTrue(ExperimentalProtons.shouldRemove("gone", complete) { true }) + assertFalse(ExperimentalProtons.shouldRemove("gone", complete) { false }) + assertFalse(ExperimentalProtons.shouldRemove("gone", partial) { true }) + assertTrue(ExperimentalProtons.shouldRemove("gone", stable) { false }) + assertFalse(ExperimentalProtons.shouldRemove(null, complete) { true }) + } + + @Test + fun archiveTypeUsesMagicBytes() { + val zip = temp.newFile("wrong-name.bin").apply { writeBytes(byteArrayOf(0x50, 0x4B, 0x03, 0x04)) } + val seven = temp.newFile("seven.data").apply { writeBytes(byteArrayOf(0x37, 0x7A, 0xBC.toByte(), 0xAF.toByte(), 0x27, 0x1C)) } + val tar = temp.newFile("tar.data").apply { RandomAccessFile(this, "rw").use { it.seek(257); it.write("ustar".toByteArray()) } } + assertEquals(ExperimentalProtons.ArchiveType.ZIP, ExperimentalProtons.archiveType(zip)) + assertEquals(ExperimentalProtons.ArchiveType.SEVEN_Z, ExperimentalProtons.archiveType(seven)) + assertEquals(ExperimentalProtons.ArchiveType.TAR, ExperimentalProtons.archiveType(tar)) + } @Test fun namesNeverCollideWithReleasedBuilds() { @@ -74,6 +153,207 @@ class ExperimentalProtonsTest { assertTrue(File(kept, "file").isFile) } + @Test + fun directZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/proton").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("proton".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/lib/up").apply { unixMode = 0xA1FF }) + zip.write("../../proton".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("direct") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertTrue(Files.isSymbolicLink(File(unpacked, "build/link").toPath())) + assertEquals("proton", Files.readSymbolicLink(File(unpacked, "build/link").toPath()).toString()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/files/lib/up").readText()) + } + + @Test + fun directArchivesFillReadOnlyDirectoriesBeforeLockingThem() { + val archive = temp.newFile("locked.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/files/").apply { unixMode = 0x416D }) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/files/data").apply { unixMode = 0x81A4 }) + zip.write("data".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("locked") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + val directory = File(unpacked, "build/files") + assertEquals("data", File(directory, "data").readText()) + assertFalse(directory.canWrite()) + directory.setWritable(true) + } + + @Test + fun directSevenZipKeepsExecutableModeAndInTreeLinks() { + val archive = temp.newFile("tree.7z") + SevenZOutputFile(archive).use { seven -> + fun add(name: String, mode: Int, text: String) { + val entry = SevenZArchiveEntry().apply { + this.name = name + hasWindowsAttributes = true + windowsAttributes = (mode shl 16) or 0x8000 + } + seven.putArchiveEntry(entry) + seven.write(text.toByteArray()) + seven.closeArchiveEntry() + } + add("build/proton", 0x81ED, "binary") + add("build/files/lib/up", 0xA1FF, "../../proton") + add("build/plain", 0x81A4, "data") + } + val unpacked = temp.newFolder("seven") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.SEVEN_Z) + assertTrue(File(unpacked, "build/proton").canExecute()) + assertFalse(File(unpacked, "build/plain").canExecute()) + assertEquals("../../proton", Files.readSymbolicLink(File(unpacked, "build/files/lib/up").toPath()).toString()) + } + + @Test + fun directArchivesAllowCurrentDirectoryBeforeAClimb() { + val archive = temp.newFile("dot.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/lib/wine").apply { unixMode = 0x81ED }) + zip.write("binary".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/bin/wine").apply { unixMode = 0xA1FF }) + zip.write("./../lib/wine".toByteArray()) + zip.closeArchiveEntry() + } + val unpacked = temp.newFolder("dot") + ExperimentalProtons.extractDirect(archive, unpacked, ExperimentalProtons.ArchiveType.ZIP) + assertEquals("./../lib/wine", Files.readSymbolicLink(File(unpacked, "build/bin/wine").toPath()).toString()) + assertEquals("binary", File(unpacked, "build/bin/wine").readText()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterACurrentDirectoryAndAName() { + for (link in listOf("./top/../outside", "./../a/./../..", "top/./../outside")) { + val archive = temp.newFile() + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write(link.toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder(), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(link, result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + } + + @Test + fun reconcileKeepsBuildsWhenASessionStartsDuringTheLookup() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dirs = listOf("Experimental-gone-a", "Experimental-gone-b").map { name -> + File(tools, name).apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).put("releaseTag", name).toString()) + } + } + val complete = ProtonExtras.ReleaseFetch(JSONArray(), true) + var lookups = 0 + try { + ExperimentalProtons.reconcile(activity, complete) { + lookups++ + SessionState.running = true + true + } + } finally { + SessionState.running = false + } + assertEquals(1, lookups) + assertTrue(dirs.all { it.isDirectory }) + ExperimentalProtons.reconcile(activity, complete) { true } + assertTrue(dirs.none { it.exists() }) + } + + @Test + fun removeWaitsForAStartingSessionAndThenKeepsTheBuild() { + val tools = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(activity), "root/.local/share/Steam/compatibilitytools.d") + val dir = File(tools, "Experimental-starting").apply { + mkdirs() + File(this, ".droiddeck-experimental.json").writeText(JSONObject().put("label", name).put("source", name).toString()) + File(this, "proton").writeText("build") + } + var removed: Boolean? = null + val removal = Thread { removed = ExperimentalProtons.remove(activity, dir.name) } + try { + synchronized(SessionState.startLock) { + removal.start() + val deadline = System.nanoTime() + 10_000_000_000L + while (removal.state != Thread.State.BLOCKED && System.nanoTime() < deadline) Thread.sleep(5) + assertEquals(Thread.State.BLOCKED, removal.state) + assertTrue(File(dir, "proton").isFile) + SessionState.running = true + } + removal.join(10_000) + assertEquals(false, removed) + assertTrue(File(dir, "proton").isFile) + } finally { + SessionState.running = false + removal.join(10_000) + } + assertTrue(ExperimentalProtons.remove(activity, dir.name)) + assertTrue(!dir.exists()) + assertTrue(File(tools, ".droiddeck-experimental-gone").list().isNullOrEmpty()) + } + + @Test + fun directArchivesRejectLinksThatClimbAfterAName() { + val archive = temp.newFile("climb.zip") + ZipArchiveOutputStream(archive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/top").apply { unixMode = 0xA1FF }) + zip.write("../../..".toByteArray()) + zip.closeArchiveEntry() + zip.putArchiveEntry(ZipArchiveEntry("build/a/b/out").apply { unixMode = 0xA1FF }) + zip.write("top/../outside".toByteArray()) + zip.closeArchiveEntry() + } + val result = runCatching { ExperimentalProtons.extractDirect(archive, temp.newFolder("climb-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(result.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun directZipRejectsEscapingLinksAndEntries() { + val linkArchive = temp.newFile("link.zip") + ZipArchiveOutputStream(linkArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("build/link").apply { unixMode = 0xA1FF }) + zip.write("../../outside".toByteArray()) + zip.closeArchiveEntry() + } + val entryArchive = temp.newFile("entry.zip") + ZipArchiveOutputStream(entryArchive).use { zip -> + zip.putArchiveEntry(ZipArchiveEntry("../outside")) + zip.write("x".toByteArray()) + zip.closeArchiveEntry() + } + val linkResult = runCatching { ExperimentalProtons.extractDirect(linkArchive, temp.newFolder("link-out"), ExperimentalProtons.ArchiveType.ZIP) } + val entryResult = runCatching { ExperimentalProtons.extractDirect(entryArchive, temp.newFolder("entry-out"), ExperimentalProtons.ArchiveType.ZIP) } + assertTrue(linkResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + assertTrue(entryResult.exceptionOrNull() is ExperimentalProtons.UnsafeArchiveException) + } + + @Test + fun staleDownloadCleanupOnlyDeletesItsOwnUnlistedFiles() { + val downloads = File(activity.filesDir, "proton-downloads").apply { mkdirs() } + val stale = File(downloads, "droiddeck-gone-archive.tar.xz").apply { writeText("partial") } + val kept = File(downloads, "droiddeck-kept-archive.tar.xz").apply { writeText("partial") } + val other = File(downloads, "other-archive.tar.xz").apply { writeText("partial") } + ExperimentalProtons.removeStaleDownloads(activity, setOf("kept")) + assertFalse(stale.exists()) + assertTrue(kept.exists()) + assertTrue(other.exists()) + } + @Test fun checksumFileWithoutADigestIsRejected() { assertNull(ExperimentalProtons.checksumIn("not a checksum\n")) diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 15e0280a76..105205a849 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -30,7 +30,7 @@ class ProtonExtrasTest { .apply { if (digest != null) put("digest", digest) } private fun release(tag: String, vararg assets: JSONObject, prerelease: Boolean = false, draft: Boolean = false) = JSONObject() - .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft) + .put("tag_name", tag).put("prerelease", prerelease).put("draft", draft).put("published_at", "2026-11-12T00:00:00Z") .put("assets", JSONArray().apply { assets.forEach { put(it) } }) private fun droiddeckRelease(ver: String, prerelease: Boolean = false) = release( @@ -48,6 +48,34 @@ class ProtonExtrasTest { File(this, "proton").apply { writeText(""); setExecutable(true) } } + @Test + fun experimentalRowsUseTheReleaseNameAndTagDetail() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), prerelease = true) + .put("name", "DroidDeck Bionic 12.8 r34") + val selectedAsset = ProtonExtras.assetOf(tool("droiddeck"), current, experimental = true)!! + val selected = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), true).single() + assertEquals("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz", selectedAsset.name) + assertEquals("DroidDeck Bionic 12.8 r34", selected.releaseName) + assertEquals("DroidDeck-Bionic-12.8-r34", selected.tag) + } + + @Test + fun experimentalAssetsIgnoreChecksumSidecars() { + val sidecarOnly = release("DroidDeck-Bionic-12.8-r36", asset("DroidDeck-Bionic-12.8-r36-aarch64.tar.xz.sha512sum")) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), sidecarOnly, experimental = true)) + } + + @Test + fun experimentalAssetsSkipOtherArchitectures() { + val foreign = release("DroidDeck-Bionic-12.8-r37", asset("DroidDeck-Bionic-12.8-r37-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r37-amd64.tar.gz"), prerelease = true) + val mixed = release("DroidDeck-Bionic-12.8-r38", asset("DroidDeck-Bionic-12.8-r38-x86_64.tar.xz"), asset("DroidDeck-Bionic-12.8-r38.tar.xz"), prerelease = true) + val named = release("DroidDeck-Bionic-12.8-r39", asset("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r39-x86_64.tar.xz"), prerelease = true) + assertEquals(null, ProtonExtras.assetOf(tool("droiddeck"), foreign, experimental = true)) + assertEquals("DroidDeck-Bionic-12.8-r38.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), mixed, experimental = true)!!.name) + assertEquals("DroidDeck-Bionic-12.8-r39-aarch64.tar.xz", ProtonExtras.assetOf(tool("droiddeck"), named, experimental = true)!!.name) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(foreign), true).isEmpty()) + } + @Test fun theThreeSourcesInOrder() { assertEquals(listOf("ge", "cachyos", "droiddeck"), ProtonExtras.tools.map { it.id }) @@ -72,6 +100,14 @@ class ProtonExtrasTest { assertNull(picked.sha256) } + @Test + fun ownExperimentalReleaseUsesItsCurrentBionicTarballShape() { + val current = release("DroidDeck-Bionic-12.8-r34", asset("DroidDeck-Bionic-12.8-r34-aarch64.tar.xz"), asset("DroidDeck-Bionic-12.8-r34-aarch64.sha512sum"), prerelease = true) + val rows = ProtonExtras.assets(tool("droiddeck"), JSONArray().put(current), prerelease = true) + assertEquals(listOf("DroidDeck-Bionic-12.8-r34"), rows.map { it.tag }) + assertTrue(ProtonExtras.assets(tool("droiddeck"), JSONArray().put(release("DroidDeck-Bionic-12.8-r35", asset("DroidDeck-Bionic-12.8-r35-aarch64.sha512sum"), prerelease = true)), true).isEmpty()) + } + @Test fun githubsDigestIsKeptBesideTheSha512File() { val sum = "ab".repeat(32) @@ -83,20 +119,6 @@ class ProtonExtrasTest { assertTrue(picked.sha512!!.endsWith("GE-Proton11-7-aarch64.sha512sum")) } - @Test - fun aTestBuildChoosesACompatibleArchiveWithVerification() { - val release = release( - "DroidDeck-Proton-11-12.9", - asset("DroidDeck-Proton-11-12.9-aarch64.tar.gz"), - asset("DroidDeck-Proton-11-12.9-aarch64.tar.xz", "sha256:" + "ab".repeat(32)), - prerelease = true, - ) - val releases = JSONArray().put(release).put(droiddeckRelease("11-12.8")) - val picked = ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!! - assertEquals("DroidDeck-Proton-11-12.9-aarch64.tar.xz", picked.name) - assertEquals("ab".repeat(32), picked.sha256) - } - @Test fun prereleasesDraftsAndReleasesWithoutAnArm64BuildAreSkipped() { val releases = JSONArray() @@ -274,64 +296,11 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) } - @Test - fun theNewestPrereleaseAheadOfTheLatestReleaseIsTheTestBuild() { - val releases = JSONArray() - .put(release("DroidDeck-Bionic-12.8-r25", asset("DroidDeck-Bionic-12.8-r25-aarch64.tar.xz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) - } - - @Test - fun aPrereleaseOlderThanTheLatestReleaseIsNotOffered() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.9")) - .put(droiddeckRelease("11-12.8", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray().put(droiddeckRelease("11-12.8")), test = true)) - } - - @Test - fun aTestBuildIsOfferedOnlyWhenNotInstalledAndNewer() { - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), "DroidDeck-Proton-11-12.9")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.9"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-13.0"), "DroidDeck-Proton-11-12.9")) - assertNull(ProtonExtras.testFor(listOf("DroidDeck-Proton-11-12.8"), null)) - } - - @Test - fun theHighestEligibleTestBuildWinsWhateverTheListOrder() { - val releases = JSONArray() - .put(droiddeckRelease("11-12.7", prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8.5", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - - @Test - fun noTestBuildWithoutAStableBaseline() { - val releases = JSONArray().put(droiddeckRelease("11-12.9", prerelease = true)) - assertNull(ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)) - } - - @Test - fun aTestBuildWithNoChecksumIsNotOffered() { - val releases = JSONArray() - .put(release("DroidDeck-Proton-11-12.10", asset("DroidDeck-Proton-11-12.10-aarch64.tar.gz"), prerelease = true)) - .put(droiddeckRelease("11-12.9", prerelease = true)) - .put(droiddeckRelease("11-12.8")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.pickAsset(tool("droiddeck"), releases, test = true)!!.tag) - } - @Test fun laterPagesAreReadOnlyUntilAStableBaselineIsFound() { val tool = tool("droiddeck") val pages = mapOf( - 1 to JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)), + 1 to JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } }, 2 to JSONArray().put(droiddeckRelease("11-12.8")), 3 to JSONArray().put(droiddeckRelease("11-12.7")), ) @@ -339,7 +308,6 @@ class ProtonExtrasTest { val all = ProtonExtras.releases(tool) { asked += it; pages[it] ?: JSONArray() }!! assertEquals(listOf(1, 2), asked) assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool, all)!!.tag) - assertEquals("DroidDeck-Proton-11-12.10", ProtonExtras.pickAsset(tool, all, test = true)!!.tag) asked.clear() ProtonExtras.releases(tool) { asked += it; pages.getValue(2) } @@ -353,35 +321,20 @@ class ProtonExtrasTest { asked.clear() assertNull(ProtonExtras.releases(tool) { page -> asked += page - if (page == 1) JSONArray().put(droiddeckRelease("11-12.10", prerelease = true)) else null + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null }) assertEquals(listOf(1, 2), asked) } @Test - fun anIncompleteLookupKeepsTheCachedTestBuildAndACompletedLookupClearsIt() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - ProtonExtras.updateLatest(cache, tool, null, 1L) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - ProtonExtras.updateLatest(cache, tool, JSONArray().put(droiddeckRelease("11-12.8")), 1L) - assertFalse(cache.getJSONObject(tool.id).has("test")) - } - - @Test - fun aTestInstallLeavesTheStableEntryAndAStableInstallKeepsTheTestOffer() { - val tool = tool("droiddeck") - val cache = JSONObject().put(tool.id, JSONObject().put("tag", "DroidDeck-Proton-11-12.8").put("test", "DroidDeck-Proton-11-12.9")) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.9", true, 2L)) - assertEquals("DroidDeck-Proton-11-12.8", cache.getJSONObject(tool.id).getString("tag")) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals("DroidDeck-Proton-11-12.9", ProtonExtras.testFor(emptyList(), cache.getJSONObject(tool.id).getString("test"))) - assertFalse(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.7", false, 2L)) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-12.8", false, 2L)) - assertEquals("DroidDeck-Proton-11-12.9", cache.getJSONObject(tool.id).getString("test")) - assertEquals(2L, cache.getJSONObject(tool.id).getLong("at")) - assertTrue(ProtonExtras.recordLatest(cache, tool, "DroidDeck-Proton-11-13.0", false, 3L)) - assertFalse(cache.getJSONObject(tool.id).has("test")) + fun anOldTestButtonInstallRemainsAUsableInstalledBuild() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + val installed = installTool(tools, "DroidDeck-Proton 11-12.9") + val releases = File(context.filesDir, "proton-extras.json") + releases.writeText(JSONObject().put(installed.name, "DroidDeck-Proton-11-12.9").toString()) + assertEquals(listOf(installed.name), ProtonExtras.installedAll(context, tool("droiddeck"))) + assertEquals(listOf("DroidDeck-Proton-11-12.9"), ProtonExtras.installedTags(context, tool("droiddeck"))) } @Test @@ -390,4 +343,28 @@ class ProtonExtrasTest { assertEquals("DroidDeck-Proton-11-12.8", ProtonExtras.pickAsset(tool("droiddeck"), releases)!!.tag) assertNull(ProtonExtras.pickAsset(tool("droiddeck"), JSONArray("[null]"))) } + + @Test + fun failedOrPartialReleaseFetchDoesNotPretendMissingBuildsAreGone() { + val tool = tool("droiddeck") + assertNull(ProtonExtras.releasesForRemoval(tool) { null }) + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool) { page -> + asked += page + if (page == 1) JSONArray().apply { repeat(15) { put(droiddeckRelease("11-12.${10 - it}", prerelease = true)) } } else null + } + assertNull(result) + assertEquals(listOf(1, 2), asked) + } + + @Test + fun aShortReleasePageCompletesTheRemovalLookup() { + val asked = mutableListOf() + val result = ProtonExtras.releasesForRemoval(tool("droiddeck")) { page -> + asked += page + JSONArray().put(droiddeckRelease("11-12.8", prerelease = true)) + } + assertTrue(result!!.complete) + assertEquals(listOf(1), asked) + } } From cc93ab51c5a7a1090148b4cb24546bb8496e2917 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Thu, 19 Nov 2026 14:31:32 -0500 Subject: [PATCH 59/60] Log the GPU ceiling and mid-session clock hold changes (#2893) * Log the GPU ceiling, steps and mid-session clock hold changes The clock log now records the GPU frequency steps and floor once in its header, probes each limit file as readable or refused, and adds the allowed GPU maximum to every sample in the CPU cur/max(of top) style, so a vendor or thermal cap on the GPU ceiling shows up and changes during a session are visible. Samples are unchanged when no limit file is readable. The limit reading is shared with the device info GPU clock range. Turning the GPU clock hold on or off during a session now logs the same line the session start logs. * Ignore a zero GPU ceiling and log hold changes in order A ceiling file that reads zero is no longer printed as a limit and is listed as refused, matching how the step list is read. The hold state line is logged under the same lock as the state change, so overlapping toggles cannot log out of order. * Find a GPU ceiling that turns readable later and probe step tables as tables A ceiling file that read zero at session start is looked for again on each sample until one is found, and the log notes where it came from. Step and floor sources are probed with the same parser that reads them, so a table with a leading zero is listed as readable. --- .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../launcher/gpu/ClockLogComponent.kt | 58 +++++++++++----- .../com/droiddeck/launcher/gpu/DeviceInfo.kt | 18 ++--- .../com/droiddeck/launcher/gpu/GpuLimits.kt | 41 ++++++++++++ .../droiddeck/launcher/session/GpuClockPin.kt | 7 +- .../launcher/gpu/ClockLogComponentTest.kt | 66 +++++++++++++++++++ .../launcher/session/GpuClockPinTest.kt | 34 ++++++++++ 7 files changed, 192 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 3249d0b3c7..618452d028 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1471,7 +1471,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionPrefs.setGpuClockPin(this@SessionActivity, on) gpuClockPin = on Thread { - GpuClockPin.sync(applicationContext) + synchronized(GpuClockPin) { GpuClockPin.sync(applicationContext)?.let { Log.i(TAG, it) } } runOnUiThread { gpuClockPin = gpuClockHeld() } }.start() }, diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt index 6f6827ad0a..9368bddcfe 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/ClockLogComponent.kt @@ -37,22 +37,22 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { ?.sortedBy { it.name.removePrefix("policy").toIntOrNull() ?: 0 } ?: emptyList() val gpuCandidates = gpuSources() val gpu = gpuCandidates.firstOrNull { !it.startsWith("/proc/") && firstNumber(it) != null } + val stepSources = GpuLimits.stepSources() + val maxSources = GpuLimits.maxSources() + val minSources = GpuLimits.minSources() + val steps = GpuLimits.first(stepSources) + var ceiling = ceilingSource(maxSources) val power = app().getSystemService(Context.POWER_SERVICE) as? PowerManager val time = SimpleDateFormat("HH:mm:ss", Locale.US) try { FileWriter(logFile, true).use { w -> w.write("== clocks: ${Build.MANUFACTURER} ${Build.MODEL} (${Build.HARDWARE}), every ${PERIOD_MS / 1000}s\n") w.write("cpu policies: ${policies.joinToString { p -> p.name + " " + (File(p, "related_cpus").readTextOrNull()?.trim() ?: "?") }}\n") - for (source in gpuCandidates) { - val f = File(source) - val state = when { - !f.exists() -> continue - firstNumber(source) != null -> "readable" - else -> "refused" - } - w.write("gpu source $source: $state\n") - } + probeLines("gpu source", gpuCandidates).forEach { w.write(it + "\n") } w.write("gpu clock from: ${gpu ?: "nothing readable"}\n") + (probeLines("gpu limit", stepSources, ::firstStep) + probeLines("gpu limit", maxSources, ::limit) + + probeLines("gpu limit", minSources, ::firstStep)).distinct().forEach { w.write(it + "\n") } + limitLines(steps, ceiling, GpuLimits.first(minSources)).forEach { w.write(it + "\n") } w.flush() while (running && logFile.length() < MAX_BYTES) { val line = StringBuilder(time.format(Date())) @@ -63,7 +63,8 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { line.append(" ${p.name.removePrefix("policy").let { "p$it" }} ${mhz(cur)}/${mhz(max)}") if (hw != null && max != null && max < hw) line.append("(of ${mhz(hw)})") } - gpu?.let { line.append(" | gpu ${mhz(firstNumber(it))} MHz") } + if (ceiling == null) ceiling = ceilingSource(maxSources)?.also { w.write("gpu ceiling from: $it\n") } + line.append(gpuField(gpu, ceiling, steps?.mhz?.last())) if (power != null && Build.VERSION.SDK_INT >= 29) { line.append(" | thermal ${power.currentThermalStatus}") if (Build.VERSION.SDK_INT >= 30) { @@ -109,16 +110,41 @@ class ClockLogComponent(private val logFile: File) : SessionPart() { return list.distinct() } + internal fun probeLines(label: String, sources: List, read: (String) -> Long? = ::firstNumber): List = sources.mapNotNull { source -> + when { + !File(source).exists() -> null + read(source) != null -> "$label $source: readable" + else -> "$label $source: refused" + } + } + + internal fun limitLines(steps: GpuLimits.Found?, ceiling: String?, floor: GpuLimits.Found?): List = listOf( + "gpu steps: " + (steps?.let { "${it.mhz.joinToString(" ")} MHz from ${it.path}" } ?: "nothing readable"), + "gpu ceiling from: " + (ceiling ?: "nothing readable"), + "gpu floor: " + (floor?.let { "${it.mhz.first()} MHz from ${it.path}" } ?: "nothing readable"), + ) + + internal fun gpuField(clock: String?, ceiling: String?, top: Long?): String { + if (clock == null && ceiling == null) return "" + val field = StringBuilder(" | gpu ").append(mhz(clock?.let(::firstNumber))) + ceiling?.let(::limit)?.let { max -> + field.append('/').append(mhz(max)) + if (top != null && GpuLimits.mhz(max) < top) field.append("(of $top)") + } + return field.append(" MHz").toString() + } + private fun File.readTextOrNull(): String? = runCatching { readText() }.getOrNull() private fun firstNumber(path: String): Long? = runCatching { Regex("\\d+").find(File(path).readText())?.value?.toLong() }.getOrNull() - private fun mhz(raw: Long?): String = when { - raw == null -> "?" - raw > 10_000_000 -> (raw / 1_000_000).toString() - raw > 10_000 -> (raw / 1_000).toString() - else -> raw.toString() - } + internal fun limit(path: String): Long? = firstNumber(path)?.takeIf { it > 0 } + + internal fun firstStep(path: String): Long? = GpuLimits.read(path).firstOrNull() + + internal fun ceilingSource(sources: List): String? = sources.firstOrNull { limit(it) != null } + + private fun mhz(raw: Long?): String = raw?.let { GpuLimits.mhz(it).toString() } ?: "?" } } diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt index bf44d7eec8..45a396b652 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/DeviceInfo.kt @@ -87,20 +87,10 @@ object DeviceInfo { private fun ghz(khz: Long) = String.format(Locale.US, "%.2f GHz", khz / 1e6) private fun gpuRange(): String? { - fun mhz(hz: Long) = "${hz / 1_000_000} MHz" - val kgsl = read("/sys/class/kgsl/kgsl-3d0/gpu_available_frequencies") - ?.split(Regex("\\s+"))?.mapNotNull { it.toLongOrNull() }?.filter { it > 0 }.orEmpty() - if (kgsl.isNotEmpty()) return "${mhz(kgsl.min())}–${mhz(kgsl.max())} (${kgsl.size} steps)" - read("/sys/class/kgsl/kgsl-3d0/max_gpuclk")?.toLongOrNull()?.let { return "up to ${mhz(it)}" } - val node = File("/sys/class/devfreq").listFiles()?.firstOrNull { f -> - val n = f.name.lowercase() - (n.contains("gpu") || n.contains("mali") || n.contains("kgsl-3d")) && listOf("bus", "bw", "memlat").none { n.contains(it) } - } ?: return null - val steps = read("${node.path}/available_frequencies")?.split(Regex("\\s+"))?.mapNotNull { it.toLongOrNull() }?.filter { it > 0 }.orEmpty() - if (steps.isNotEmpty()) return "${mhz(steps.min())}–${mhz(steps.max())} (${steps.size} steps)" - val min = read("${node.path}/min_freq")?.toLongOrNull() - val max = read("${node.path}/max_freq")?.toLongOrNull() ?: return null - return (if (min != null) "${mhz(min)}–" else "up to ") + mhz(max) + GpuLimits.first(GpuLimits.stepSources())?.mhz?.let { return "${it.first()} MHz–${it.last()} MHz (${it.size} steps)" } + val max = GpuLimits.first(GpuLimits.maxSources())?.mhz?.last() ?: return null + val min = GpuLimits.first(GpuLimits.minSources())?.mhz?.first() + return (if (min != null) "$min MHz–" else "up to ") + "$max MHz" } private fun memory(context: Context) = Section("Memory", buildList> { diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt b/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt new file mode 100644 index 0000000000..67eaa23741 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/gpu/GpuLimits.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.gpu + +import java.io.File + +object GpuLimits { + class Found(val path: String, val mhz: List) + + private const val KGSL = "/sys/class/kgsl/kgsl-3d0" + private const val QCOM_GPU = "/sys/kernel/gpu" + + fun stepSources(): List = listOf( + "$KGSL/gpu_available_frequencies", "$KGSL/freq_table_mhz", "$KGSL/devfreq/available_frequencies", "$QCOM_GPU/gpu_freq_table", + ) + devfreq("available_frequencies") + + fun maxSources(): List = listOf( + "$KGSL/max_gpuclk", "$KGSL/max_clock_mhz", "$KGSL/devfreq/max_freq", "$QCOM_GPU/gpu_max_clock", + ) + devfreq("max_freq") + + fun minSources(): List = listOf( + "$KGSL/min_clock_mhz", "$KGSL/devfreq/min_freq", "$QCOM_GPU/gpu_min_clock", + ) + devfreq("min_freq") + + fun first(sources: List): Found? = + sources.firstNotNullOfOrNull { path -> read(path).takeIf { it.isNotEmpty() }?.let { Found(path, it) } } + + fun read(path: String): List = runCatching { + Regex("\\d+").findAll(File(path).readText()).map { mhz(it.value.toLong()) }.filter { it > 0 }.distinct().sorted().toList() + }.getOrDefault(emptyList()) + + fun mhz(raw: Long): Long = when { + raw > 10_000_000 -> raw / 1_000_000 + raw > 10_000 -> raw / 1_000 + else -> raw + } + + private fun devfreq(file: String): List = + File("/sys/class/devfreq").listFiles()?.filter { f -> + val n = f.name.lowercase() + (n.contains("gpu") || n.contains("mali") || n.contains("kgsl-3d")) && listOf("bus", "bw", "memlat").none { n.contains(it) } + }?.sortedBy { it.name }?.map { "${it.path}/$file" }.orEmpty() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt index e136df2604..e02b3e7bfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GpuClockPin.kt @@ -46,9 +46,10 @@ object GpuClockPin { } @Synchronized - fun sync(context: Context) { - if (!live) return - if (SessionPrefs.gpuClockPin(context)) hold(context) else if (pinned) clear(context) + fun sync(context: Context): String? { + if (!live) return null + if (!SessionPrefs.gpuClockPin(context) && pinned) clear(context) + return hold(context) } @Synchronized diff --git a/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt index 1dc1d6b6af..fed4553bf3 100644 --- a/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/gpu/ClockLogComponentTest.kt @@ -3,6 +3,8 @@ package com.droiddeck.launcher.gpu import android.content.Intent import android.os.BatteryManager import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Rule import org.junit.Test @@ -40,4 +42,68 @@ class ClockLogComponentTest { clocks = ClockLogComponent(log).also { it.attach(context); it.stop(); it.start() } assertTrue(log.readText(), log.length() == 0L) } + @Test fun gpuStepsAndCeilingAreParsedAndPrinted() { + val table = tmp.newFile("gpu_available_frequencies").apply { writeText("443000000 350000000 285000000 160000000\n") } + val ceiling = tmp.newFile("max_gpuclk").apply { writeText("285000000\n") } + val floor = tmp.newFile("min_clock_mhz").apply { writeText("160\n") } + val clock = tmp.newFile("gpu_clock").apply { writeText("230\n") } + val steps = GpuLimits.first(listOf(tmp.root.path + "/missing", table.path))!! + assertEquals(listOf(160L, 285L, 350L, 443L), steps.mhz) + assertEquals( + listOf( + "gpu steps: 160 285 350 443 MHz from ${table.path}", + "gpu ceiling from: ${ceiling.path}", + "gpu floor: 160 MHz from ${floor.path}", + ), + ClockLogComponent.limitLines(steps, ceiling.path, GpuLimits.first(listOf(floor.path))), + ) + assertEquals(" | gpu 230/285(of 443) MHz", ClockLogComponent.gpuField(clock.path, ceiling.path, steps.mhz.last())) + ceiling.writeText("443000000\n") + assertEquals(" | gpu 230/443 MHz", ClockLogComponent.gpuField(clock.path, ceiling.path, steps.mhz.last())) + } + + @Test fun aZeroCeilingIsNotALimit() { + val clock = tmp.newFile("gpu_clock").apply { writeText("0\n") } + val zero = tmp.newFile("max_gpuclk").apply { writeText("0\n") } + assertEquals(" | gpu 0 MHz", ClockLogComponent.gpuField(clock.path, zero.path, 443)) + assertEquals(listOf("gpu limit ${zero.path}: refused"), ClockLogComponent.probeLines("gpu limit", listOf(zero.path), ClockLogComponent::limit)) + assertEquals(listOf("gpu source ${clock.path}: readable"), ClockLogComponent.probeLines("gpu source", listOf(clock.path))) + assertNull(ClockLogComponent.ceilingSource(listOf(zero.path))) + zero.writeText("285000000\n") + assertEquals(zero.path, ClockLogComponent.ceilingSource(listOf(zero.path))) + assertEquals(" | gpu 0/285(of 443) MHz", ClockLogComponent.gpuField(clock.path, zero.path, 443)) + } + + @Test fun aStepTableWithALeadingZeroIsReadable() { + val steps = tmp.newFile("freq_table_mhz").apply { writeText("0 160000000 285000000\n") } + assertEquals(listOf(160L, 285L), GpuLimits.first(listOf(steps.path))?.mhz) + assertEquals(listOf("gpu limit ${steps.path}: readable"), ClockLogComponent.probeLines("gpu limit", listOf(steps.path), ClockLogComponent::firstStep)) + } + + @Test fun unreadableOrMissingLimitsLeaveTheSampleUnchanged() { + val clock = tmp.newFile("clock_mhz").apply { writeText("230\n") } + val refused = tmp.newFolder("max_clock_mhz") + val missing = tmp.root.path + "/gpu_max_clock" + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, null, null)) + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, missing, 443)) + assertEquals(" | gpu 230 MHz", ClockLogComponent.gpuField(clock.path, refused.path, 443)) + assertEquals("", ClockLogComponent.gpuField(null, null, null)) + assertNull(GpuLimits.first(listOf(missing, refused.path))) + assertEquals(listOf("gpu limit ${refused.path}: refused"), ClockLogComponent.probeLines("gpu limit", listOf(missing, refused.path))) + assertEquals( + listOf("gpu steps: nothing readable", "gpu ceiling from: nothing readable", "gpu floor: nothing readable"), + ClockLogComponent.limitLines(null, null, null), + ) + } + + @Test fun aCeilingChangeMidSessionShowsInTheNextSample() { + val clock = tmp.newFile("cur_freq").apply { writeText("443000000\n") } + val ceiling = tmp.newFile("max_freq").apply { writeText("443000000\n") } + val first = ClockLogComponent.gpuField(clock.path, ceiling.path, 443) + ceiling.writeText("285000000\n") + clock.writeText("285000000\n") + val second = ClockLogComponent.gpuField(clock.path, ceiling.path, 443) + assertEquals(" | gpu 443/443 MHz", first) + assertEquals(" | gpu 285/285(of 443) MHz", second) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt new file mode 100644 index 0000000000..3311df0501 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GpuClockPinTest.kt @@ -0,0 +1,34 @@ +package com.droiddeck.launcher.session + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class GpuClockPinTest { + private val context = RuntimeEnvironment.getApplication() + + @After fun stop() { GpuClockPin.stop(context) } + + @Test fun aToggleOutsideASessionSaysNothing() { + SessionPrefs.setGpuClockPin(context, true) + assertNull(GpuClockPin.sync(context)) + } + + @Test fun aToggleMidSessionReportsTheHoldWithTheStartWording() { + SessionPrefs.setGpuClockPin(context, false) + val started = GpuClockPin.start(context) + assertEquals("gpu clock: governed", started) + SessionPrefs.setGpuClockPin(context, true) + val held = GpuClockPin.sync(context) + assertEquals("gpu clock: no /dev/kgsl-3d0, left governed", held) + SessionPrefs.setGpuClockPin(context, false) + assertEquals(started, GpuClockPin.sync(context)) + } +} From 13a6e0606a7c7f74836e35443937de342fe223bb Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 19 Nov 2026 14:57:11 -0500 Subject: [PATCH 60/60] feat(library): fold not-installed games under one row, link stores' owned games, and fix card sizes and streaming progress (#2894) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(library): fold not-installed games under one row, link a store's owned games, and make card sizes step The Library shows installed games first and folds every owned-but-not-installed game under a "Not installed · N" row that a tap or the A button opens and closes; it replaces the installed/all-owned choice that sat in the Filter menu, which now only appears for Xbox's access filters. Controller focus stops on the row between the two sections and stays on it across a toggle. A store's profile card turns its " · N games" line into the link to those games in the Library, replacing the separate text button. Card sizes pick a column count from the pane width, one column per step, so every Larger/Smaller step changes the grid; before, several steps landed on the same count and only stretched the cards. GOG streams download and install together, and each byte update and each install update used to flip the entry's stage and reset the install count. The install count now survives those swaps and the detail page shows both: "Downloading 9% · Installing 25%", with the download as the fill and the install as a thin bar. The store accounts button uses an accounts icon instead of a second "+", and the Library tab uses a game controller instead of the video library icon. * fix(library): a store with nothing installed folds to its Not installed row instead of an empty-state button With no installed games to show, collapsing used to swap the grid for "No installed games match these filters" and a Browse owned games button. It now leaves only the Not installed row, which reopens the list the same way, by tap or by A. * feat(library): count every owned game in the header and nudge the Not installed arrow The "N games" next to the Library title counts the games folded under Not installed too, so a store with nothing installed reads "316 games" instead of "0 games". The row's arrow hops twice every few seconds toward the way it opens, and at once when the row takes controller focus; it stays still when animations are off. * feat(rail): draw the Library tab as game cases on a shelf Material's video library icon read as a photo or video gallery. * feat(library): the header counts the whole library, whichever store or filter is picked * fix(downloads): keep a streaming install's two bars until the download reaches 100% A download at 99.95% counted as finished, so the install bar disappeared and the fill swapped between download and install progress for the last stretch. * fix(downloads): decide a streaming download is finished from its byte counts A float fraction rounds 99,999,999 of 100,000,000 bytes up to 1. * feat(downloads): show a streaming install as one bar, downloaded behind installed Two bars that moved almost together, under a label with both percentages, read as a glitch. The chip now shows "Installing 61%" with a light fill for what has downloaded and a solid fill for what has installed, like a video's buffer. * feat(downloads): the game page shows one steady bar that only fills up The detail page's chip shows "Installing 62%" from one overall value: the download fills the first 90% and the install the rest, also when they stream together. The fill never steps back across stage changes, keeps one animation key per download, and the chip keeps a minimum width with tabular digits so it does not resize as the number grows. The Downloads tab keeps its per-stage detail. * feat(downloads): a full-size progress button on the game page that opens Downloads The progress chip was a 24 dp pill beside 48 dp buttons. It is now a button the size of Pause and Cancel, filled as the job advances, with a › that opens the Downloads tab and sends the fly-in ball to the rail's Downloads item, by touch or A. The Library card's percent and the bottom-screen download row use the same steady value, so every place shows one bar that only grows. The overall value keeps the install part when the last bytes arrive while the stage still reads Download. --- .../stores/download/DownloadModels.kt | 20 ++ .../launcher/stores/download/DownloadQueue.kt | 9 +- .../launcher/ui/BottomDownloadsPage.kt | 2 +- .../com/droiddeck/launcher/ui/FrontEndRail.kt | 3 +- .../droiddeck/launcher/ui/FrontEndWidgets.kt | 10 +- .../com/droiddeck/launcher/ui/GameDetail.kt | 50 ++++- .../droiddeck/launcher/ui/GameShelfIcon.kt | 17 ++ .../droiddeck/launcher/ui/LibraryAccounts.kt | 6 +- .../com/droiddeck/launcher/ui/LibraryPage.kt | 192 +++++++++++++++--- .../com/droiddeck/launcher/ui/StoresPage.kt | 54 ++++- .../stores/download/DownloadEntryTest.kt | 41 ++++ .../launcher/ui/LibraryColumnsTest.kt | 13 ++ .../launcher/ui/LibraryVisibilityTest.kt | 63 +++--- 13 files changed, 398 insertions(+), 82 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt index 57f07742cf..115e0b1132 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadModels.kt @@ -46,6 +46,26 @@ data class DownloadEntry( stageItemsTotal > 0 -> (stageItems.toFloat() / stageItemsTotal).coerceIn(0f, 1f) else -> -1f } + val downloadFraction: Float get() = if (bytesTotal > 0L) (bytesDone.toDouble() / bytesTotal).toFloat().coerceIn(0f, 1f) else -1f + val installFraction: Float get() = when { + stage != DownloadStage.DOWNLOAD && stage != DownloadStage.INSTALL -> -1f + stageTotal > 0L -> (stageDone.toDouble() / stageTotal).toFloat().coerceIn(0f, 1f) + stageItemsTotal > 0 -> (stageItems.toFloat() / stageItemsTotal).coerceIn(0f, 1f) + else -> -1f + } + val streaming: Boolean get() = state == DownloadState.RUNNING && bytesTotal > 0L && bytesDone < bytesTotal && installFraction >= 0f && + (stage == DownloadStage.INSTALL || (stage == DownloadStage.DOWNLOAD && passed(DownloadStage.INSTALL))) + /** Whole job as one bar: downloading fills the first 90%, installing the rest, also when they run together. */ + val overallFraction: Float get() { + if (state == DownloadState.INSTALLED || stage == DownloadStage.DONE) return 1f + val downloaded = when { + bytesTotal > 0L -> downloadFraction + passed(DownloadStage.DOWNLOAD) -> 1f + else -> 0f + } + val installed = if (stage == DownloadStage.INSTALL || (stage == DownloadStage.DOWNLOAD && passed(DownloadStage.INSTALL))) installFraction.coerceAtLeast(0f) else 0f + return (0.9f * downloaded + 0.1f * installed).coerceIn(0f, 1f) + } val fraction: Float get() = stageFraction.coerceAtLeast(0f) val percent: Int get() = (fraction * 100).toInt() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt index 917b2c0ba1..4ceb4278bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/DownloadQueue.kt @@ -45,13 +45,18 @@ object DownloadQueue { val e = item.entry if (e.stage == stage) return item.speedAt = 0L; item.speedBytes = 0L; item.speedEwma = 0.0 - item.entry = e.copy( - stage = stage, stagesPassed = e.stagesPassed or (1 shl e.stage.ordinal), speedBps = 0, etaSeconds = -1, + val passed = e.stagesPassed or (1 shl e.stage.ordinal) + // Streaming installers (GOG) alternate between DOWNLOAD and INSTALL; the install count lives on across the swaps. + val streaming = e.stage in STREAMED && stage in STREAMED && (passed and (1 shl DownloadStage.INSTALL.ordinal)) != 0 + item.entry = if (streaming) e.copy(stage = stage, stagesPassed = passed, speedBps = 0, etaSeconds = -1) + else e.copy( + stage = stage, stagesPassed = passed, speedBps = 0, etaSeconds = -1, stageDone = 0, stageTotal = 0, stageItems = 0, stageItemsTotal = 0, ) } private const val SPEED_WINDOW_MS = 3000.0 + private val STREAMED = setOf(DownloadStage.DOWNLOAD, DownloadStage.INSTALL) private fun stageCount(key: String, done: Long, total: Long, files: Int, filesTotal: Int, bytes: Boolean) { synchronized(lock) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt index 7ad576f956..7c33334a26 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt @@ -100,7 +100,7 @@ fun BottomDownloadsPage() { formatSpeed(e.speedBps), ).filter { it.isNotEmpty() }.joinToString(" · ") } - BottomDownloadRow(e.name, e.store.label, detail, e.stageFraction.takeIf { it >= 0f }) + BottomDownloadRow(e.name, e.store.label, detail, steadyProgress(e)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index c35f3d10df..a60c4ee5ae 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -60,7 +60,6 @@ import androidx.compose.material.icons.outlined.SportsEsports import androidx.compose.material.icons.outlined.Storefront import androidx.compose.material.icons.outlined.SystemUpdate import androidx.compose.material.icons.outlined.Tune -import androidx.compose.material.icons.outlined.VideoLibrary import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -196,7 +195,7 @@ internal fun SideRail( internal fun railLabelIcon(key: String): Pair = when (key) { "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports - "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "games" -> R.string.rail_games to GameShelfIcon "soundtracks" -> R.string.rail_music to SoundtrackIcon "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall "downloads" -> R.string.stores_tab_downloads to Icons.Outlined.Download diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index 6d360d7357..6bc4fd2149 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding @@ -113,8 +114,8 @@ internal fun Actions(content: @Composable () -> Unit) = FlowRow( ) { content() } @Composable -internal fun ActionChip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) = - Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok, fraction, key) } +internal fun ActionChip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null, minWidth: androidx.compose.ui.unit.Dp = 0.dp) = + Box(contentAlignment = Alignment.Center, modifier = Modifier.heightIn(min = 44.dp)) { Chip(t, ok, fraction, key, minWidth) } internal val Shape16 = RoundedCornerShape(16.dp) @@ -141,15 +142,16 @@ internal fun BackLink(label: String, compact: Boolean = false, onClick: () -> Un } @Composable -internal fun Chip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null) { +internal fun Chip(t: String, ok: Boolean, fraction: Float? = null, key: Any? = null, minWidth: androidx.compose.ui.unit.Dp = 0.dp) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val shape = RoundedCornerShape(99.dp) val ink = if (ok) pal.good else colors.onSurfaceVariant - Box(Modifier.clip(shape).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, shape)) { + Box(Modifier.widthIn(min = minWidth).clip(shape).background(colors.surfaceVariant).border(1.dp, if (ok) pal.good.copy(alpha = 0.3f) else pal.line, shape), contentAlignment = Alignment.CenterStart) { if (fraction != null) ChipFill(fraction, key, pal.signal.copy(alpha = 0.3f)) Text( t, fontSize = 12.sp, color = ink, maxLines = 1, overflow = TextOverflow.Ellipsis, + style = androidx.compose.ui.text.TextStyle(fontFeatureSettings = "tnum"), modifier = Modifier.padding(horizontal = 9.dp, vertical = 4.dp), ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index 9697fc289d..3b93f06527 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import android.widget.Toast import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.LocalIndication @@ -482,7 +484,7 @@ internal fun GameActions( if (installed != null && id != null) { LaunchedEffect(id) { BattleNetInstall.checkUpdate(ctx, installed) } if (download != null) { - ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) + SteadyDownloadChip(download) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(download.key) } else SecondaryButton(stringResource(R.string.stores_dl_resume)) { DownloadQueue.resume(ctx, download.key) } } else if (BattleNetInstall.updates[id] == true) { @@ -497,7 +499,7 @@ internal fun GameActions( } } download != null -> { - ActionChip(downloadLabel(download), ok = false, fraction = download.stageFraction.takeIf { it >= 0f }, key = download.stage) + SteadyDownloadChip(download) if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { DownloadQueue.pause(download.key) } else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { DownloadQueue.resume(ctx, download.key) } ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { DownloadQueue.cancel(ctx, download.key) } @@ -1146,3 +1148,47 @@ internal object FolderSizes { }, "folder-size").start() } } + +@Composable +private fun SteadyDownloadChip(download: com.droiddeck.launcher.stores.download.DownloadEntry) { + val progress = steadyProgress(download) + val label = steadyLabel(download, progress) + val show = LocalShowSection.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = if (LocalPillButtons.current) androidx.compose.foundation.shape.CircleShape else Shape12 + val src = remember { androidx.compose.foundation.interaction.MutableInteractionSource() } + val hot = rememberHot(src) + val pressed by src.collectIsPressedAsState() + val scale by androidx.compose.animation.core.animateFloatAsState(if (pressed) 0.955f else if (hot) 1.02f else 1f, Motion.sp(0.5f, androidx.compose.animation.core.Spring.StiffnessMedium), label = "dlScale") + val placed = remember { arrayOfNulls(1) } + val description = stringResource(R.string.stores_tab_downloads) + val open = { + placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { StoresMotion.fly(it) } + show("downloads") + } + Box( + contentAlignment = Alignment.CenterStart, + modifier = Modifier.paneItem("detail-download").testTag("detail-download") + .onGloballyPositioned { placed[0] = it } + .widthIn(min = 200.dp).heightIn(min = 48.dp) + .graphicsLayer { scaleX = scale; scaleY = scale }.clip(shape) + .background(Color.White.copy(alpha = 0.04f)) + .glideBorder(hot, shape, pal.signal, pal.line2) + .hoverable(src) + .clickable(interactionSource = src, indication = androidx.compose.foundation.LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button, onClickLabel = description, onClick = open) + .controllerConfirm(onClick = open), + ) { + ChipFill(progress, download.key, pal.signal.copy(alpha = 0.42f)) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.widthIn(min = 200.dp).padding(start = 16.dp, end = 10.dp), + ) { + Text( + label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp, color = colors.onBackground, maxLines = 1, + style = androidx.compose.ui.text.TextStyle(fontFeatureSettings = "tnum"), modifier = Modifier.padding(end = 8.dp), + ) + Icon(androidx.compose.material.icons.Icons.AutoMirrored.Filled.KeyboardArrowRight, description, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt new file mode 100644 index 0000000000..74b92c9be8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameShelfIcon.kt @@ -0,0 +1,17 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +internal val GameShelfIcon: ImageVector = ImageVector.Builder("GameShelf", 24.dp, 24.dp, 24f, 24f).apply { + for (d in listOf( + "M3,4H7V20H3ZM4.4,5.4V18.6H5.6V5.4Z", + "M8.5,4H12.5V20H8.5ZM9.9,5.4V18.6H11.1V5.4Z", + "M14.2,5.1L18.1,4.2L21.4,19.8L17.5,20.7ZM15.9,6.2L18.6,18.9L19.8,18.6L17.1,5.9Z", + "M2,21H22V22.5H2Z", + )) addPath(addPathNodes(d), fill = SolidColor(Color.Black), pathFillType = PathFillType.EvenOdd) +}.build() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt index 2b10c7902e..c79337e850 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryAccounts.kt @@ -19,7 +19,7 @@ import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.ManageAccounts import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -66,7 +66,7 @@ internal fun StoreAccountsButton() { placed[0]?.takeIf { it.isAttached }?.boundsInRoot()?.let { at -> Steps.ask(StepAsk( anchor = at, side = StepSide.Left, accent = pal.signal, items = storesWithSignIn().size + 1, pillCorner = 20.dp, maxWidth = 380.dp, - handle = { Icon(Icons.Filled.Add, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, + handle = { Icon(Icons.Filled.ManageAccounts, null, tint = pal.signal, modifier = Modifier.size(20.dp)) }, ) { StoreAccountsStep(onSignIn = { store, row -> Steps.fold() @@ -92,7 +92,7 @@ internal fun StoreAccountsButton() { .hoverable(src) .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = label, onClick = open) .controllerConfirm(onClick = open), - ) { Icon(Icons.Filled.Add, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } + ) { Icon(Icons.Filled.ManageAccounts, label, tint = if (hot) colors.onBackground else colors.onSurfaceVariant, modifier = Modifier.size(20.dp)) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 272f42840c..b1fd672a68 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -41,6 +41,8 @@ import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ExpandLess +import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.BookmarkBorder import androidx.compose.material.icons.filled.FilterAlt @@ -177,8 +179,9 @@ internal fun librarySources( } internal object LibraryDisplay { + const val DEFAULT_LEVEL = 2 val scales = listOf(0.75f, 0.875f, 1f, 1.2f, 1.45f) - var level by mutableIntStateOf(2) + var level by mutableIntStateOf(DEFAULT_LEVEL) private set var title by mutableStateOf(true) private set @@ -215,6 +218,68 @@ internal object LibraryDisplay { } } +private enum class ToggleAt { NONE, TOP, SPLIT, BOTTOM } + +private const val NOT_INSTALLED_ROW = "library-not-installed" + +@Composable +private fun NotInstalledRow(count: Int, expanded: Boolean, keys: Modifier, onFocus: (Boolean) -> Unit, onToggle: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(12.dp) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 2.dp).then(keys).paneItem(NOT_INSTALLED_ROW).onFocusChanged { onFocus(it.isFocused) }.testTag(NOT_INSTALLED_ROW) + .heightIn(min = 44.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onToggle) + .controllerConfirm(onClick = onToggle) + .padding(horizontal = 4.dp, vertical = 8.dp), + ) { + Text( + stringResource(R.string.stores_section_not_installed).uppercase() + " · " + count, + fontSize = 12.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.2.sp, color = if (hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1, + ) + Box(Modifier.weight(1f).height(1.dp).background(pal.line)) + val hop = remember { androidx.compose.animation.core.Animatable(0f) } + LaunchedEffect(expanded, hot, Motion.scale) { + hop.snapTo(0f) + if (Motion.scale == 0f) return@LaunchedEffect + val toward = if (expanded) -3.5f else 3.5f + kotlinx.coroutines.delay(if (hot) 0L else 1_200L) + while (true) { + repeat(2) { + hop.animateTo(toward, androidx.compose.animation.core.tween(150, easing = androidx.compose.animation.core.FastOutSlowInEasing)) + hop.animateTo(0f, androidx.compose.animation.core.spring(dampingRatio = 0.45f, stiffness = androidx.compose.animation.core.Spring.StiffnessMedium)) + } + kotlinx.coroutines.delay(3_500L) + } + } + Icon( + if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore, stringResource(if (expanded) R.string.library_filter_installed else R.string.library_browse_owned), + tint = if (hot) colors.onBackground else colors.onSurfaceVariant, + modifier = Modifier.size(22.dp).graphicsLayer { translationY = hop.value.dp.toPx() }, + ) + } +} + +internal fun libraryColumns(width: Int, base: Int, gap: Int, level: Int): Int = + (((width + gap) / (base + gap)).coerceAtLeast(1) + LibraryDisplay.DEFAULT_LEVEL - level).coerceAtLeast(1) + +private class LevelCells(private val base: androidx.compose.ui.unit.Dp, private val level: Int) : GridCells { + override fun androidx.compose.ui.unit.Density.calculateCrossAxisCellSizes(availableSize: Int, spacing: Int): List { + val count = libraryColumns(availableSize, base.roundToPx(), spacing, level) + val usable = (availableSize - spacing * (count - 1)).coerceAtLeast(0) + return List(count) { usable / count + if (it < usable % count) 1 else 0 } + } + + override fun equals(other: Any?): Boolean = other is LevelCells && other.base == base && other.level == level + override fun hashCode(): Int = 31 * base.hashCode() + level +} + internal object LibraryView { var source by mutableStateOf(LIBRARY_ALL) var query by mutableStateOf("") @@ -305,6 +370,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) + val libraryTotal = if (soundMode) 0 else all.count { inLibrarySource(LIBRARY_ALL, it, favorites, concealed) } val matching = pool.filter { inLibrarySource(source, it, favorites, concealed) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } @@ -433,7 +499,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val detailScroll = rememberScrollState() var cycled by remember { mutableIntStateOf(0) } var gridFocused by remember { mutableStateOf(false) } - LaunchedEffect(source, sort, listUninstalled) { grid.scrollToItem(0) } + LaunchedEffect(source, sort) { grid.scrollToItem(0) } LaunchedEffect(cycled) { if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect focusWithinFrames({ gridFocused }) { @@ -449,7 +515,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, grid = { LibraryGrid( - s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, + s, a, grid, visible, split, if (soundMode) visible.size else libraryTotal, sources, source, sizesPending, syncing, showUninstalled = listUninstalled.takeIf { !s.shortcutPicker },onShowUninstalled = setShowUninstalled, hiddenUninstalled = hiddenUninstalled, onSource = { LibraryView.source = it }, @@ -517,12 +583,43 @@ private fun LibraryGrid( ) { val listMode = s.storesView == "list" val capsules = s.storesView == "capsules" - val tileWidth = (if (capsules) CapsuleWidth else if (listMode) CardWidth else LibraryCardWidth) * LibraryDisplay.scales[LibraryDisplay.level] + val baseWidth = if (capsules) CapsuleWidth else LibraryCardWidth + val level = LibraryDisplay.level val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() val density = androidx.compose.ui.platform.LocalDensity.current var columns by remember { mutableIntStateOf(1) } val headerItems = 2 + (if (sizesPending) 1 else 0) + syncing.size + val expanded = showUninstalled == true + val notInstalled = if (expanded) visible.count { !it.installed } else hiddenUninstalled + val toggleAt = when { + showUninstalled == null || soundMode || notInstalled == 0 || (expanded && visible.isEmpty()) -> ToggleAt.NONE + !expanded -> ToggleAt.BOTTOM + split > 0 -> ToggleAt.SPLIT + else -> ToggleAt.TOP + } + val itemIndex: (Int) -> Int = { i -> + headerItems + i + when { + split > 0 -> if (i < split) 1 else 2 + toggleAt == ToggleAt.TOP -> 1 + else -> 0 + } + } + val toggleIndex = when (toggleAt) { + ToggleAt.TOP -> headerItems + ToggleAt.SPLIT -> headerItems + split + 1 + else -> headerItems + visible.size + } + val gapPx = with(density) { 10.dp.toPx() } + val moveFocus: (String, Int, Int, Int) -> Unit = { target, targetIndex, currentIndex, direction -> + val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } + if (focus != null && (!shown || (focus.attached[target] ?: 0) == 0 || + runCatching { focus.items.getValue(target).requestFocus() }.isFailure)) scope.launch { + launch { grid.revealRow(currentIndex, targetIndex, direction, gapPx) } + focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default } + } + } + val rowStart: (Int) -> Int? = { i -> if (i < 0) null else if (listMode) i else i - i % columns.coerceAtLeast(1) } val tile: @Composable (LibraryEntry) -> Unit = { e -> val first = e.key == visible.firstOrNull()?.key val navigation = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> @@ -534,21 +631,21 @@ private fun LibraryGrid( } val index = visible.indexOfFirst { it.key == e.key } val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) + val toToggle = index >= 0 && when (toggleAt) { + ToggleAt.BOTTOM -> next == null && direction > 0 + ToggleAt.TOP -> next == null && direction < 0 + ToggleAt.SPLIT -> next != null && (index < split) != (next < split) + ToggleAt.NONE -> false + } when { direction == 0 || index < 0 -> false + toToggle -> { + if (key.action == KeyEvent.ACTION_DOWN) moveFocus(NOT_INSTALLED_ROW, toggleIndex, itemIndex(index), direction) + true + } next == null -> direction > 0 && trackHits.isEmpty() else -> { - if (key.action == KeyEvent.ACTION_DOWN) { - val target = "card:${visible[next].key}" - val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2 - val currentIndex = headerItems + index + if (split == 0) 0 else if (index < split) 1 else 2 - val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } - if (!shown || (focus.attached[target] ?: 0) == 0 || - runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch { - launch { grid.revealRow(currentIndex, targetIndex, direction, with(density) { 10.dp.toPx() }) } - focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default } - } - } + if (key.action == KeyEvent.ACTION_DOWN) moveFocus("card:${visible[next].key}", itemIndex(next), itemIndex(index), direction) true } } @@ -557,12 +654,51 @@ private fun LibraryGrid( val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) } + var rowFocused by remember { mutableStateOf(false) } + val toggleRow: @Composable () -> Unit = { + val keys = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> + val key = event.nativeKeyEvent + val direction = when (key.keyCode) { + KeyEvent.KEYCODE_DPAD_DOWN -> 1 + KeyEvent.KEYCODE_DPAD_UP -> -1 + else -> 0 + } + val target = when { + direction > 0 && toggleAt == ToggleAt.TOP -> 0 + direction > 0 && toggleAt == ToggleAt.SPLIT -> split + direction < 0 && toggleAt == ToggleAt.SPLIT -> rowStart(split - 1) + direction < 0 && toggleAt == ToggleAt.BOTTOM -> rowStart(visible.lastIndex) + else -> null + } + when { + direction == 0 -> false + target == null -> direction > 0 && toggleAt == ToggleAt.BOTTOM && trackHits.isEmpty() + else -> { + if (key.action == KeyEvent.ACTION_DOWN) moveFocus("card:${visible[target].key}", itemIndex(target), toggleIndex, direction) + true + } + } + } + NotInstalledRow(notInstalled, expanded, keys, onFocus = { rowFocused = it }) { + rowFocused = false + val landing = if (expanded) headerItems + split else headerItems + visible.size + 1 + onShowUninstalled(!expanded) + if (focus != null && focus.last == NOT_INSTALLED_ROW) scope.launch { + androidx.compose.runtime.withFrameNanos { } + if (grid.layoutInfo.visibleItemsInfo.none { it.key == NOT_INSTALLED_ROW }) grid.scrollToItem((landing - 1).coerceAtLeast(0)) + repeat(30) { + androidx.compose.runtime.withFrameNanos { } + if (rowFocused) return@launch + runCatching { focus.items[NOT_INSTALLED_ROW]?.requestFocus() } + } + } + } + } LazyVerticalGrid( - columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, + columns = if (listMode) GridCells.Fixed(1) else remember(baseWidth, level) { LevelCells(baseWidth, level) }, state = grid, modifier = Modifier.fillMaxSize().onFocusChanged { onFocus(it.hasFocus) }.focusGroup().bumpers(onPrevious = { onCycle(-1) }, onNext = { onCycle(1) }).onSizeChanged { val gap = with(density) { 10.dp.roundToPx() } - val minimum = with(density) { (if (listMode) CardWidth * 2 else tileWidth).roundToPx() } - columns = ((it.width + gap) / (minimum + gap)).coerceAtLeast(1) + columns = if (listMode) 1 else libraryColumns(it.width, with(density) { baseWidth.roundToPx() }, gap, level) }, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), @@ -587,17 +723,17 @@ private fun LibraryGrid( } } val empty = emptyText - if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { - Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { - Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) - SecondaryButton(stringResource(R.string.library_browse_owned), modifier = Modifier.testTag("library-browse-owned")) { onShowUninstalled(true) } - } + if (split == 0) { + if (toggleAt == ToggleAt.TOP) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } + if (visible.isNotEmpty() || toggleAt == ToggleAt.NONE) libraryGrid(visible, empty, tile) + if (toggleAt == ToggleAt.BOTTOM) item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { toggleRow() } } - else if (split == 0) libraryGrid(visible, empty, tile) else { item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } libraryGrid(visible.take(split), empty, tile) - item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } + item(key = NOT_INSTALLED_ROW, span = { GridItemSpan(maxLineSpan) }) { + if (toggleAt == ToggleAt.SPLIT) toggleRow() else SectionLabel(stringResource(R.string.stores_section_not_installed)) + } libraryGrid(visible.drop(split), empty, tile) } if (trackHits.isNotEmpty()) { @@ -683,7 +819,7 @@ private fun LibraryHeader( ) { if (soundMode) HeaderIconButton(stringResource(R.string.soundtracks_saved), Icons.Filled.BookmarkBorder, "collections", onClick = onCollections) DisplayButton() - if (!soundMode && (showUninstalled != null || xbox)) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (!soundMode && xbox) LibraryFilterButton(null, onShowUninstalled, xbox) if (collections != null) CollectionsButton(collections) SortButton(s, a) ViewButton(s, a) @@ -792,7 +928,7 @@ internal fun libraryTileWidth() = LibraryCardWidth * LibraryDisplay.scales[Libra @Composable private fun LibraryArt(e: LibraryEntry, wide: Any?, tall: Any?, download: DownloadEntry?, hot: Boolean, capsule: Boolean, showSource: Boolean) { val chip = when { - download != null -> "${download.percent}%" + download != null -> "${(steadyProgress(download) * 100).toInt()}%" e.item != null && StoresState.isUnfinished(e.item) -> stringResource(R.string.stores_resume) e.installed && libraryUpdateAvailable(e) -> stringResource(R.string.common_update) else -> null @@ -835,7 +971,7 @@ internal fun ArtCard( ) badge?.invoke(this) if (chip != null) Box(Modifier.align(Alignment.TopEnd).padding(6.dp)) { - StateChip(chip, ChipTone.BUSY, small = true, fraction = download?.stageFraction?.takeIf { it >= 0f }, key = download?.stage) + StateChip(chip, ChipTone.BUSY, small = true, fraction = download?.let { steadyProgress(it) }, key = download?.key) } val showName = LibraryDisplay.title || hot val showDetail = LibraryDisplay.size || hot diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 440541dda4..2a8e8e67a8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -92,6 +92,7 @@ import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.foundation.basicMarquee import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.outlined.Download @@ -927,16 +928,13 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } Column(Modifier.weight(1f)) { Text(name.ifEmpty { store.label }, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text( - if (loaded) store.shortLabel + " · " + androidx.compose.ui.res.pluralStringResource(R.plurals.mode_added_count, owned, owned) else store.label, - fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - } - Actions { - SmallTextButton(stringResource(R.string.stores_owned_in_library), key = "owned-in-library") { + if (loaded) OwnedLink(store.shortLabel + " · " + androidx.compose.ui.res.pluralStringResource(R.plurals.mode_added_count, owned, owned)) { LibraryView.showOwned(ctx, store) show("games") } + else Text(store.label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Actions { SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } if (store == Store.XBOX) SmallTextButton(stringResource(R.string.stores_xbox_cloud_settings), key = "xbox-cloud-settings") { ctx.startActivity(android.content.Intent(ctx, com.droiddeck.launcher.stores.xbox.XboxCloudSettingsActivity::class.java)) @@ -949,6 +947,28 @@ private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndS } } +@Composable +private fun OwnedLink(label: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(8.dp) + val description = stringResource(R.string.stores_owned_in_library) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(2.dp), + modifier = Modifier.paneItem("owned-in-library").testTag("owned-in-library").clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, Color.Transparent) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClickLabel = description, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(start = 2.dp, end = 4.dp, top = 2.dp, bottom = 2.dp), + ) { + Text(label, fontSize = 12.sp, color = if (hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + Icon(Icons.AutoMirrored.Filled.KeyboardArrowRight, description, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } +} + @Composable private fun BattleNetLauncherRow(s: FrontEndState, a: FrontEndActions) { val ctx = LocalContext.current @@ -1385,7 +1405,25 @@ internal fun ProgressBarThin(fraction: Float, paused: Boolean = false, verify: B internal fun downloadLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry): String = when (d.state) { DownloadState.PAUSED -> stringResource(R.string.stores_dl_paused) DownloadState.QUEUED -> stringResource(R.string.stores_dl_queued) - else -> if (d.stageFraction >= 0f) stringResource(R.string.stores_dl_active_percent, activeStageLabel(d), d.percent) else activeStageLabel(d) + else -> when { + d.streaming -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_stage_installing), (d.installFraction * 100).toInt()) + d.stageFraction >= 0f -> stringResource(R.string.stores_dl_active_percent, activeStageLabel(d), d.percent) + else -> activeStageLabel(d) + } +} + +@Composable +internal fun steadyProgress(d: com.droiddeck.launcher.stores.download.DownloadEntry): Float { + val best = androidx.compose.runtime.remember(d.key) { floatArrayOf(0f) } + best[0] = maxOf(best[0], d.overallFraction) + return best[0] +} + +@Composable +internal fun steadyLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry, progress: Float): String = when (d.state) { + DownloadState.QUEUED -> stringResource(R.string.stores_dl_queued) + DownloadState.PAUSED -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_dl_paused), (progress * 100).toInt()) + else -> stringResource(R.string.stores_dl_active_percent, stringResource(R.string.stores_stage_installing), (progress * 100).toInt()) } @Composable diff --git a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt index 46b38647c9..914089a2ca 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/download/DownloadEntryTest.kt @@ -24,4 +24,45 @@ class DownloadEntryTest { assertFalse(e.passed(DownloadStage.INSTALL)) assertTrue(e.copy(state = DownloadState.INSTALLED).passed(DownloadStage.INSTALL)) } + + @Test fun streamingInstallKeepsDownloadAndInstallProgressApart() { + val installBit = 1 shl DownloadStage.INSTALL.ordinal + val installing = base.copy(stage = DownloadStage.INSTALL, bytesDone = 10, bytesTotal = 100, stageDone = 25, stageTotal = 100) + assertTrue(installing.streaming) + assertEquals(0.10f, installing.downloadFraction, 0.001f) + assertEquals(0.25f, installing.installFraction, 0.001f) + val backToDownload = installing.copy(stage = DownloadStage.DOWNLOAD, stagesPassed = installBit) + assertTrue(backToDownload.streaming) + assertEquals(0.25f, backToDownload.installFraction, 0.001f) + assertFalse(base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 10, bytesTotal = 100).streaming) + assertTrue(installing.copy(bytesDone = 99_950, bytesTotal = 100_000).streaming) + assertTrue(installing.copy(bytesDone = 99_999_999, bytesTotal = 100_000_000).streaming) + assertFalse(installing.copy(bytesDone = 100).streaming) + assertFalse(installing.copy(state = DownloadState.PAUSED).streaming) + } + + @Test fun overallProgressOnlyGrowsAcrossSequentialAndStreamingStages() { + val installBit = 1 shl DownloadStage.INSTALL.ordinal + val downloadBit = 1 shl DownloadStage.DOWNLOAD.ordinal + val sequential = listOf( + base.copy(stage = DownloadStage.MANIFEST), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 50, bytesTotal = 100), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 100, bytesTotal = 100), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stagesPassed = downloadBit, stageDone = 0, stageTotal = 10), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stagesPassed = downloadBit, stageDone = 10, stageTotal = 10), + base.copy(state = DownloadState.INSTALLED), + ).map { it.overallFraction } + assertEquals(sequential, sequential.sorted()) + assertEquals(1f, sequential.last(), 0f) + val streaming = listOf( + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 10, bytesTotal = 100), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 20, bytesTotal = 100, stageDone = 15, stageTotal = 100), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 40, bytesTotal = 100, stageDone = 15, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 60, bytesTotal = 100, stageDone = 55, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.DOWNLOAD, bytesDone = 100, bytesTotal = 100, stageDone = 60, stageTotal = 100, stagesPassed = installBit), + base.copy(stage = DownloadStage.INSTALL, bytesDone = 100, bytesTotal = 100, stageDone = 80, stageTotal = 100, stagesPassed = installBit or downloadBit), + ).map { it.overallFraction } + assertEquals(streaming, streaming.sorted()) + } } + diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt new file mode 100644 index 0000000000..3d0340e064 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryColumnsTest.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Test + +class LibraryColumnsTest { + @Test fun everySizeStepChangesTheColumnCountUntilOne() { + val phone = (0..4).map { libraryColumns(width = 1080, base = 450, gap = 30, level = it) } + assertEquals(listOf(4, 3, 2, 1, 1), phone) + val tablet = (0..4).map { libraryColumns(width = 2400, base = 450, gap = 30, level = it) } + assertEquals(listOf(7, 6, 5, 4, 3), tablet) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt index f6085e5126..ecefb57d46 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt @@ -76,52 +76,43 @@ class LibraryVisibilityTest { LibraryView.focusFirst = false } - @Test fun uninstalledGamesAreHiddenUntilSelectedInTheFilterAndTheChoiceSurvivesReopeningLibrary() { + @Test fun uninstalledGamesStayFoldedUnderTheirRowAndTheChoiceSurvivesReopeningLibrary() { show() compose.onNodeWithText("Installed Steam game").assertExists() compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - chooseVisibility(true) + compose.onNodeWithText("NOT INSTALLED · 2").assertExists() + compose.onNodeWithText("3 games").assertExists() + toggleNotInstalled(true) + compose.onNodeWithText("3 games").assertExists() compose.onNodeWithText("Uninstalled GOG").assertExists() - assertTrue(SessionPrefs.libraryShowUninstalled(ctx)) compose.runOnIdle { generation++; Snapshot.sendApplyNotifications() } compose.mainClock.advanceTimeBy(2_000) compose.onNodeWithText("Uninstalled GOG").assertExists() - chooseVisibility(false) + toggleNotInstalled(false) compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) } - @Test fun theFilterExpandsBesideSortWithoutChangingTheSelectionOnOpen() { + @Test fun theNotInstalledRowReplacesTheFilterButtonAndSortStillOpens() { show() - val filter = compose.onNodeWithContentDescription("Filter · Installed only") - val sort = compose.onNodeWithContentDescription("Sort") - assertTrue(filter.fetchSemanticsNode().boundsInRoot.right <= sort.fetchSemanticsNode().boundsInRoot.left) - filter.performClick() - compose.mainClock.advanceTimeBy(2_000) - compose.onNodeWithText("Installed only").assertIsDisplayed() - compose.onNodeWithText("All owned games").assertIsDisplayed() - compose.onAllNodesWithText("Filter").assertCountEquals(1) - compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithContentDescription("Filter · Installed only").assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").assertExists() assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) - compose.runOnIdle { Steps.fold(); Snapshot.sendApplyNotifications() } - compose.mainClock.advanceTimeBy(1_000) - sort.performClick() + compose.onNodeWithContentDescription("Sort").performClick() compose.mainClock.advanceTimeBy(2_000) compose.onAllNodesWithText("Sort").assertCountEquals(1) compose.onNodeWithText("Recently played").assertIsDisplayed() } - @Test fun theXboxAccessChoicesShareTheLibraryFilter() { + @Test fun theXboxFilterOnlyOffersTheXboxAccessChoices() { StoreAccounts.write(ctx, Store.XBOX, JSONObject().put("username", "Library test")) StoresState.accounts[Store.XBOX] = "Library test" StoresState.library[Store.XBOX] = listOf(CatalogItem(Store.XBOX, "owned", "Uninstalled Xbox", null, owned = true)) LibraryView.source = Store.XBOX.id try { show() - compose.onNodeWithContentDescription("Filter · Installed only").performClick() + compose.onNodeWithContentDescription("Filter · All").performClick() compose.mainClock.advanceTimeBy(2_000) - compose.onNodeWithText("Installed only").assertIsDisplayed() - compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onNodeWithText("Installed only").assertDoesNotExist() compose.onNodeWithText("Game Pass").assertIsDisplayed().performClick() compose.mainClock.advanceTimeBy(1_000) assertEquals(XboxLibraryFilter.GAME_PASS, XboxLibraryFilter.current) @@ -131,14 +122,19 @@ class LibraryVisibilityTest { } } - @Test fun aSearchWithOnlyUninstalledMatchesOffersToRevealThem() { + @Test fun aSearchWithOnlyUninstalledMatchesShowsTheFoldedRowToRevealThem() { LibraryView.query = "Uninstalled GOG" show() compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() - compose.onNodeWithTag("library-browse-owned").performClick() + compose.onNodeWithText("No installed games match these filters", substring = true).assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").performClick() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithText("Uninstalled GOG").assertExists() assertEquals("Uninstalled GOG", LibraryView.query) + compose.onNodeWithTag("library-not-installed").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithTag("library-not-installed").assertExists() } @Test fun aHiddenStoreRemainsReachableInLibraryInItsConfiguredOrder() { @@ -151,11 +147,19 @@ class LibraryVisibilityTest { assertTrue(steam < epic && epic < gog) compose.onNodeWithTag("library-source-gog").performClick() compose.mainClock.advanceTimeBy(1_000) - compose.onNodeWithTag("library-browse-owned").assertIsDisplayed().performClick() + compose.onNodeWithTag("library-not-installed").assertIsDisplayed().performClick() compose.mainClock.advanceTimeBy(1_000) compose.onNodeWithText("Uninstalled GOG").assertExists() } + @Test fun theHeaderCountsTheWholeLibraryWhicheverStoreIsPicked() { + show() + compose.onNodeWithText("3 games").assertExists() + compose.onNodeWithTag("library-source-gog").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("3 games").assertExists() + } + @Test fun theStoresOwnedGamesLinkRevealsOwnedGamesDespiteTheSavedInstalledOnlyView() { assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) LibraryView.showOwned(ctx, Store.GOG) @@ -188,13 +192,8 @@ class LibraryVisibilityTest { compose.mainClock.advanceTimeBy(2_000) } - private fun chooseVisibility(show: Boolean) { - compose.onNodeWithContentDescription("Filter · " + if (SessionPrefs.libraryShowUninstalled(ctx)) "All owned games" else "Installed only") - .performClick() - compose.mainClock.advanceTimeBy(2_000) - assertTrue(Steps.open) - compose.onNodeWithText(if (show) "All owned games" else "Installed only") - .performClick() + private fun toggleNotInstalled(show: Boolean) { + compose.onNodeWithTag("library-not-installed").performClick() compose.mainClock.advanceTimeBy(1_000) assertEquals(show, SessionPrefs.libraryShowUninstalled(ctx)) }